Skip to content

Commit

Permalink
Finish 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gkellogg committed Feb 10, 2018
2 parents a4e3d02 + 602cf6c commit f48587f
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 24 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
@@ -1,12 +1,17 @@
language: ruby
bundler_args: --without debug
script: "bundle exec rspec spec"
before_install: "gem update --system"
env:
- CI=true
gemfile:
- Gemfile
- Gemfile-pure
rvm:
- 2.2
- 2.3
- 2.4
- 2.5
- jruby-9
- rbx-3
cache: bundler
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Expand Up @@ -5,12 +5,12 @@ gemspec
gem "rdf", github: "ruby-rdf/rdf", branch: "develop"
gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop"
gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop"
gem "nokogiri", '~> 1.6'
gem "nokogumbo", '~> 1.4'
gem "nokogiri", '~> 1.8'
gem "nokogumbo", '~> 1.5'
gem 'equivalent-xml', '~> 0.5'

group :development, :test do
gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
gem 'ebnf', github: "dryruby/ebnf", branch: "develop"
gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop"
gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo", branch: "develop"
gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile-pure
Expand Up @@ -8,7 +8,7 @@ gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop"
gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop"

group :development, :test do
gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
gem 'ebnf', github: "dryruby/ebnf", branch: "develop"
gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop"
gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo", branch: "develop"
gem "rdf-microdata", github: "ruby-rdf/rdf-microdata", branch: "develop"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -398,8 +398,8 @@ The template hash defines four Haml templates:

## Dependencies
* [Ruby](http://ruby-lang.org/) (>= 2.2)
* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.2)
* [Haml](https://rubygems.org/gems/haml) (>= 4.0)
* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0)
* [Haml](https://rubygems.org/gems/haml) (~> 5.0)
* [HTMLEntities](https://rubygems.org/gems/htmlentities) (>= 4.3.1)
* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.7.1)
* Soft dependency on [Nokogumbo](https://github.com/rubys/nokogumbo) (>= 1.4.10)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
2.2.4
3.0.0
2 changes: 1 addition & 1 deletion lib/rdf/rdfa/reader/nokogiri.rb
Expand Up @@ -180,7 +180,7 @@ def initialize_xml(input, options = {})
begin
require 'nokogumbo' unless defined?(::Nokogumbo)
input = input.read if input.respond_to?(:read)
::Nokogiri::HTML5(input.force_encoding(options[:encoding]))
::Nokogiri::HTML5(input.force_encoding(options[:encoding]), max_parse_errors: 1000)
rescue LoadError
::Nokogiri::HTML.parse(input, base_uri.to_s, options[:encoding])
end
Expand Down
26 changes: 10 additions & 16 deletions rdf-rdfa.gemspec
Expand Up @@ -22,34 +22,28 @@ Gem::Specification.new do |gem|
gem.required_ruby_version = '>= 2.2.2'
gem.requirements = []

#gem.add_runtime_dependency 'rdf', '~> 3.0'
gem.add_runtime_dependency 'rdf', '>= 2.2', '< 4.0'
gem.add_runtime_dependency 'rdf', '~> 3.0'
gem.add_runtime_dependency 'haml', '~> 5.0'
#gem.add_runtime_dependency 'rdf-xsd', '~> 3.0'
gem.add_runtime_dependency 'rdf-xsd', '~> 3.0'
#gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.0'
gem.add_runtime_dependency 'rdf-xsd', '>= 2.2', '< 4.0'
gem.add_runtime_dependency 'rdf-aggregate-repo', '>= 2.2', '< 4.0'
gem.add_runtime_dependency 'htmlentities', '~> 4.3'

#gem.add_development_dependency 'json-ld', '~> 3.0'
gem.add_development_dependency 'json-ld', '>= 2.1', '< 4.0'
gem.add_development_dependency 'rspec', '~> 3.5'
gem.add_development_dependency 'rspec', '~> 3.7'
gem.add_development_dependency 'rspec-its', '~> 1.2'
#gem.add_development_dependency 'rdf-spec', '~> 3.0'
gem.add_development_dependency 'rdf-spec', '~> 3.0'
gem.add_development_dependency 'rdf-turtle', '~> 3.0'
gem.add_development_dependency 'rdf-vocab', '~> 3.0'
gem.add_development_dependency 'rdf-isomorphic', '~> 3.0'
#gem.add_development_dependency 'rdf-tabular', '~> 3.0'
#gem.add_development_dependency 'rdf-turtle', '~> 3.0'
#gem.add_development_dependency 'rdf-rdfxml', '~> 3.0'
#gem.add_development_dependency 'rdf-vocab', '~> 3.0'
#gem.add_development_dependency 'rdf-isomorphic', '~> 3.0'
#gem.add_development_dependency 'sparql', '~> 3.0'
gem.add_development_dependency 'rdf-spec', '>= 2.2', '< 4.0'
gem.add_development_dependency 'rdf-tabular', '>= 2.2', '< 4.0'
gem.add_development_dependency 'rdf-turtle', '>= 2.2', '< 4.0'
#gem.add_development_dependency 'rdf-rdfxml', '~> 3.0'
gem.add_development_dependency 'rdf-rdfxml', '>= 2.2', '< 4.0'
gem.add_development_dependency 'rdf-vocab', '>= 2.2', '< 4.0'
gem.add_development_dependency 'rdf-isomorphic', '>= 2.2', '< 4.0'
#gem.add_development_dependency 'sparql', '~> 3.0'
gem.add_development_dependency 'sparql', '>= 2.2', '< 4.0'
gem.add_development_dependency 'yard' , '~> 0.9'
gem.add_development_dependency 'yard' , '~> 0.9.12'

gem.post_install_message = nil
end
Expand Down

0 comments on commit f48587f

Please sign in to comment.