From adc665aec13b0588620af77ce049e6e503463d4a Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 8 Jul 2016 17:42:41 -0700 Subject: [PATCH 1/9] Update minimum ruby version to 2.2.2. See https://github.com/ruby-rdf/rdf/issues/307. --- .travis.yml | 12 +++++------- lib/rdf/microdata/reader.rb | 6 +++--- rdf-microdata.gemspec | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15fcec1..60e47f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,12 @@ script: "bundle exec rspec spec" env: - CI=true rvm: - - 2.0 - - 2.1 - - 2.2.4 - - 2.3.0 - - jruby-9.0.4.0 - - rbx-2 + - 2.2.5 + - 2.3.1 + - jruby-9.0.5.0 + - rbx cache: bundler sudo: false matrix: allow_failures: - - rvm: rbx-2 + - rvm: rbx diff --git a/lib/rdf/microdata/reader.rb b/lib/rdf/microdata/reader.rb index c003932..5ba5e09 100644 --- a/lib/rdf/microdata/reader.rb +++ b/lib/rdf/microdata/reader.rb @@ -281,10 +281,10 @@ def parse_whole_document(doc, base) log_info(nil) {"parse_whole_doc: base='#{base}'"} ec = { - :memory => {}, - :current_type => nil, + memory: {}, + current_type: nil, current_vocabulary: nil, - :document_base => base, + document_base: base, } # 1) For each element that is also a top-level item, Generate the triples for that item using the evaluation context. getItems.each do |el| diff --git a/rdf-microdata.gemspec b/rdf-microdata.gemspec index 156d96c..96c630e 100755 --- a/rdf-microdata.gemspec +++ b/rdf-microdata.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |gem| gem.test_files = %w() gem.has_rdoc = false - gem.required_ruby_version = '>= 2.0' + gem.required_ruby_version = '>= 2.2.2' gem.requirements = [] gem.add_runtime_dependency 'rdf', '~> 2.0' gem.add_runtime_dependency 'rdf-xsd', '~> 2.0' From efdae3d181d5dee72504009384020c6e64699cad Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 12 Jul 2016 09:04:02 -0700 Subject: [PATCH 2/9] Address JRuby issue with reader example. --- spec/reader_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/reader_spec.rb b/spec/reader_spec.rb index 52c26a9..03e3393 100644 --- a/spec/reader_spec.rb +++ b/spec/reader_spec.rb @@ -642,6 +642,7 @@ it "catches infinite recursion" do md = %( +
friend1
@@ -651,6 +652,7 @@
+ ) expect {parse(md, validate: true)}.to raise_error(RDF::ReaderError) expect(@logger.to_s).to include("itemref recursion") From e43ef5bf68e6fc6b79c578aef42c5cab70b057a7 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 13 Jul 2016 11:26:09 -0700 Subject: [PATCH 3/9] Allow JRuby failure, due to odd JSON-LD/multi_json loading problem. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60e47f8..715ea9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ env: rvm: - 2.2.5 - 2.3.1 - - jruby-9.0.5.0 + - jruby - rbx cache: bundler sudo: false From a0e0cf73b55709ce8311824c39d20dd15282373c Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 13 Jul 2016 14:26:36 -0700 Subject: [PATCH 4/9] Force jruby-9.1.2.0. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 715ea9c..798df4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ env: rvm: - 2.2.5 - 2.3.1 - - jruby + - jruby-9.1.2.0 - rbx cache: bundler sudo: false From 32fc24448cb36c37b18b23dc4716f300d61c3b6f Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Thu, 28 Jul 2016 11:36:27 -0400 Subject: [PATCH 5/9] Update reference to sxp repo in Gemfile. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5a6700b..612d488 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ group :development do gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop" gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop" gem 'rdf-turtle', github: "ruby-rdf/rdf-turtle", branch: "develop" - gem 'sxp', github: "gkellogg/sxp-ruby", branch: "develop" + gem 'sxp', github: "dryruby/sxp.rb", branch: "develop" end group :debug do From d8805fe80bcc4d846cf6cd0508eefd8dd8e17fae Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 12 Aug 2016 18:11:44 -0700 Subject: [PATCH 6/9] Remove wirble from Gemfile, as dependency-ci objects that it has no license and it's not really neccessary. --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index 612d488..b2999b1 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,6 @@ group :development do end group :debug do - gem "wirble" gem "byebug", platform: :mri end From d087ef2e40bad724c4b95ce4ae40e46db3edf016 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 13 Aug 2016 15:20:39 -0700 Subject: [PATCH 7/9] Change Travis JRuby to default and allow failures. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 798df4c..24a5a31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,11 @@ env: rvm: - 2.2.5 - 2.3.1 - - jruby-9.1.2.0 + - jruby - rbx cache: bundler sudo: false matrix: allow_failures: - rvm: rbx + - rvm: jruby From 6deb6a9e5cc86a5154965a0669caae50572075fd Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 10 Sep 2016 14:29:45 -0700 Subject: [PATCH 8/9] Add priority to content_type. --- dependencyci.yml | 5 +++++ lib/rdf/microdata/format.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 dependencyci.yml diff --git a/dependencyci.yml b/dependencyci.yml new file mode 100644 index 0000000..0c67c1b --- /dev/null +++ b/dependencyci.yml @@ -0,0 +1,5 @@ +platform: + Rubygems: + rdf-isomorphic: + tests: + unmaintained: skip \ No newline at end of file diff --git a/lib/rdf/microdata/format.rb b/lib/rdf/microdata/format.rb index 8de4a16..a11dca1 100644 --- a/lib/rdf/microdata/format.rb +++ b/lib/rdf/microdata/format.rb @@ -26,7 +26,7 @@ class Format < RDF::Format # Only define content type if RDFa is not available. # The Microdata processor will be launched from there # otherwise. - content_type 'text/html', extension: :html unless RDF::Format.for(:rdfa) + content_type 'text/html;q=0.5', extension: :html unless RDF::Format.for(:rdfa) reader { RDF::Microdata::Reader } ## From 443737da34638b3e456f1b52932639a077f60e7f Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 31 Dec 2016 12:24:32 -0800 Subject: [PATCH 9/9] Version 2.1.0. --- .travis.yml | 5 +++-- VERSION | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24a5a31..de10948 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,9 @@ script: "bundle exec rspec spec" env: - CI=true rvm: - - 2.2.5 - - 2.3.1 + - 2.2.6 + - 2.3.3 + - 2.4.0 - jruby - rbx cache: bundler diff --git a/VERSION b/VERSION index 50ffc5a..7ec1d6d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.3 +2.1.0