From ae2f90a326b14a52aa6c0d55b0caf9c7515c9b90 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Thu, 21 Dec 2017 14:03:05 -0800 Subject: [PATCH 1/6] Update yard ~> 0.9.12 due to vulnerability. --- rdf-rdfa.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec index 00302f38..a2044ec8 100755 --- a/rdf-rdfa.gemspec +++ b/rdf-rdfa.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |gem| #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-tabular', '~> 3.0' @@ -49,7 +49,7 @@ Gem::Specification.new do |gem| 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', '>= 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 From 306c757da4f0ea6c17a59d1aa6597e22dce2c114 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 27 Dec 2017 15:32:02 -0800 Subject: [PATCH 2/6] Add Gemfile-pure back into build matrix. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9e1f468d..b9a2861b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ bundler_args: --without debug script: "bundle exec rspec spec" env: - CI=true +gemfile: + - Gemfile + - Gemfile-pure rvm: - 2.2 - 2.3 From cf05c591ac66ab27bf0a70923d2c900aaf803a75 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 30 Dec 2017 14:55:27 -0800 Subject: [PATCH 3/6] Update dependencies. --- .travis.yml | 2 ++ Gemfile | 2 +- Gemfile-pure | 2 +- README.md | 4 ++-- rdf-rdfa.gemspec | 22 ++++++++-------------- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9a2861b..85963c0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: ruby bundler_args: --without debug script: "bundle exec rspec spec" +before_install: "gem update --system" env: - CI=true gemfile: @@ -10,6 +11,7 @@ rvm: - 2.2 - 2.3 - 2.4 + - 2.5 - jruby-9 - rbx-3 cache: bundler diff --git a/Gemfile b/Gemfile index 089e2cbc..5ed5ded0 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "nokogumbo", '~> 1.4' 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" diff --git a/Gemfile-pure b/Gemfile-pure index 712f9e33..8d36316b 100644 --- a/Gemfile-pure +++ b/Gemfile-pure @@ -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" diff --git a/README.md b/README.md index 3d2079f4..db5d4db3 100755 --- a/README.md +++ b/README.md @@ -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) diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec index a2044ec8..5d0e3e78 100755 --- a/rdf-rdfa.gemspec +++ b/rdf-rdfa.gemspec @@ -22,12 +22,10 @@ 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' @@ -35,19 +33,15 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'json-ld', '>= 2.1', '< 4.0' 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.12' From 5d827da65edeb8cc01e7728043db50cddc775f78 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 9 Feb 2018 18:16:36 -0800 Subject: [PATCH 4/6] Update nokogumbo dependencies to lock at 1.4.13, as 1.5 is not catching markup errors. --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 5ed5ded0..20b4193f 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,8 @@ 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.4.13' # 1.5 not catching errors gem 'equivalent-xml', '~> 0.5' group :development, :test do From cb1d104f8573dc4a55fef49fbffb1857bc9e6fd5 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 9 Feb 2018 18:29:38 -0800 Subject: [PATCH 5/6] Use `max_parse_errors: 100` option to Nokogumbo, allowing 1.5. --- Gemfile | 2 +- lib/rdf/rdfa/reader/nokogiri.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 20b4193f..ac795dea 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ 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.8' -gem "nokogumbo", '~> 1.4.13' # 1.5 not catching errors +gem "nokogumbo", '~> 1.5' gem 'equivalent-xml', '~> 0.5' group :development, :test do diff --git a/lib/rdf/rdfa/reader/nokogiri.rb b/lib/rdf/rdfa/reader/nokogiri.rb index 2dbf5a81..02211152 100644 --- a/lib/rdf/rdfa/reader/nokogiri.rb +++ b/lib/rdf/rdfa/reader/nokogiri.rb @@ -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 From 602cf6c9b318ed00d810c02ac5817024b8152815 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 10 Feb 2018 11:17:38 -0800 Subject: [PATCH 6/6] Version 3.0.0. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 530cdd91..4a36342f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.4 +3.0.0