From 9759fe4e6e3e0d0af5e94e452a1b02ab8f15a0a5 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 8 Jul 2016 17:47:06 -0700 Subject: [PATCH 1/6] Update minimum ruby version to 2.2.2. See https://github.com/ruby-rdf/rdf/issues/307. --- .travis.yml | 14 ++++++-------- rdf-n3.gemspec | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index eea2813..e707354 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,15 +4,13 @@ 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: jruby-9.0.4.0 - - rvm: rbx-2 + - rvm: jruby-9.0.5.0 + - rvm: rbx diff --git a/rdf-n3.gemspec b/rdf-n3.gemspec index 54ed07e..83cbc7d 100755 --- a/rdf-n3.gemspec +++ b/rdf-n3.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |gem| gem.require_paths = %w(lib) gem.has_rdoc = false - gem.required_ruby_version = '>= 2.0.0' + gem.required_ruby_version = '>= 2.2.2' gem.requirements = [] gem.add_dependency 'rdf', '~> 2.0' From 872cbc1ab3672b68a55c8d4f02c8ed339d27d7c5 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 12 Aug 2016 18:12:15 -0700 Subject: [PATCH 2/6] Remove wirble from Gemfile, as dependency-ci objects that it has no license and it's not really neccessary. --- .travis.yml | 4 ++-- Gemfile | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e707354..06480df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,11 @@ env: rvm: - 2.2.5 - 2.3.1 - - jruby-9.0.5.0 + - jruby-9.1.2.0 - rbx cache: bundler sudo: false matrix: allow_failures: - - rvm: jruby-9.0.5.0 + - rvm: jruby-9.1.2.0 - rvm: rbx diff --git a/Gemfile b/Gemfile index 1b9777d..8b4c8b9 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,6 @@ group :development do end group :debug do - gem "wirble" gem "byebug", platform: :mri end From 7dfcb60d4cb3ad8580f0345a8888a6ebc2ef0ddf Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 13 Aug 2016 15:21:00 -0700 Subject: [PATCH 3/6] Change Travis JRuby to default and allow failures. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06480df..24a5a31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +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: jruby-9.1.2.0 - rvm: rbx + - rvm: jruby From 4cfca2ac94dd40294e9029395a9fe9787698441f Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 10 Sep 2016 14:30:20 -0700 Subject: [PATCH 4/6] Add lower content_type priority for aliased types. --- dependencyci.yml | 5 +++++ lib/rdf/n3/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/n3/format.rb b/lib/rdf/n3/format.rb index 3e0995b..b62183c 100644 --- a/lib/rdf/n3/format.rb +++ b/lib/rdf/n3/format.rb @@ -17,7 +17,7 @@ module RDF::N3 # # @see http://www.w3.org/TR/rdf-testcases/#ntriples class Format < RDF::Format - content_type 'text/n3', extension: :n3, aliases: %w(text/rdf+n3 application/rdf+n3) + content_type 'text/n3', extension: :n3, aliases: %w(text/rdf+n3;q=0.2 application/rdf+n3;q=0.2) content_encoding 'utf-8' reader { RDF::N3::Reader } From fe975f8e6d30c233890f4e7d5dfcd85e7a61ae7b Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 30 Dec 2016 15:15:01 -0800 Subject: [PATCH 5/6] Pass options hash to URI methods to avoid implicit conversion of URI to hash. --- .travis.yml | 5 +++-- Gemfile | 10 +++++----- lib/rdf/n3/reader.rb | 4 ++-- 3 files changed, 10 insertions(+), 9 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/Gemfile b/Gemfile index 8b4c8b9..dbb1d09 100644 --- a/Gemfile +++ b/Gemfile @@ -2,13 +2,13 @@ source "https://rubygems.org" gemspec -gem "rdf", git: "git://github.com/ruby-rdf/rdf.git", branch: "develop" +gem "rdf", github: "ruby-rdf/rdf", branch: "develop" group :development do - gem "rdf-spec", git: "git://github.com/ruby-rdf/rdf-spec.git", branch: "develop" - gem "rdf-isomorphic", git: "git://github.com/ruby-rdf/rdf-isomorphic.git", branch: "develop" - gem "rdf-xsd", git: "git://github.com/ruby-rdf/rdf-xsd.git", branch: "develop" - gem "json-ld", git: "git://github.com/ruby-rdf/json-ld.git", branch: "develop" + gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop" + gem "rdf-isomorphic", github: "ruby-rdf/rdf-isomorphic", branch: "develop" + gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop" + gem "json-ld", github: "ruby-rdf/json-ld", branch: "develop" end group :debug do diff --git a/lib/rdf/n3/reader.rb b/lib/rdf/n3/reader.rb index f5e4d1a..1a3c2fd 100644 --- a/lib/rdf/n3/reader.rb +++ b/lib/rdf/n3/reader.rb @@ -657,11 +657,11 @@ def keyword_check(kw) # Create URIs def uri(value, append = nil) - value = RDF::URI.new(value) + value = RDF::URI(value) value = value.join(append) if append value.validate! if validate? && value.respond_to?(:validate) value.canonicalize! if canonicalize? - value = RDF::URI.intern(value) if intern? + value = RDF::URI.intern(value, {}) if intern? # Variable substitution for in-scope variables. Variables are in scope if they are defined in anthing other than # the current formula From 2104c5e1dacb50ab9d25c0284187a0e8ef7a08f5 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 31 Dec 2016 12:28:38 -0800 Subject: [PATCH 6/6] Version 2.1.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 227cea2..7ec1d6d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.1.0