From df836f37c2a05d163a13f092b3b0fe31f3ae7711 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 8 Jul 2016 14:36:50 -0700 Subject: [PATCH 1/7] Update minumum ruby version to 2.2.2, which is broadly taking hold across other gems. This will require updating the minor release number (at least). Fixes #307. --- .travis.yml | 2 -- rdf.gemspec | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad8ec26d..161d6a67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ script: "bundle exec rspec spec" env: - CI=true rvm: - - 2.0 - - 2.1 - 2.2.5 - 2.3.1 - jruby-9.0.5.0 diff --git a/rdf.gemspec b/rdf.gemspec index 6a7fa868..5011e792 100755 --- a/rdf.gemspec +++ b/rdf.gemspec @@ -25,7 +25,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 'link_header', '~> 0.0', '>= 0.0.8' gem.add_runtime_dependency 'hamster', '~> 3.0' From fbcda91c8cca85771220c0d082cc66ee23e86f5a Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 8 Jul 2016 14:44:08 -0700 Subject: [PATCH 2/7] Minor dependency update in README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09c01390..ce2f37df 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ This is a pure-Ruby library for working with [Resource Description Framework not modify any of Ruby's core classes or standard library. * Based entirely on Ruby's autoloading, meaning that you can generally make use of any one part of the library without needing to load up the rest. -* Compatible with Ruby Ruby 2.x, Rubinius and JRuby 1.7+ (in Ruby 2.0 mode). +* Compatible with Ruby Ruby >= 2.2.2, Rubinius and JRuby 9.0+. * Performs auto-detection of input to select appropriate Reader class if one cannot be determined from file characteristics. From 669b8d46c8edc4b6ec7a67118e41d28e7d3cb807 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 11 Jul 2016 12:46:28 -0700 Subject: [PATCH 3/7] Fix bug when loading vocabularies that didn't remove previous term definitions from term cache. --- lib/rdf/vocabulary.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rdf/vocabulary.rb b/lib/rdf/vocabulary.rb index e07965a1..d3f3c3c6 100644 --- a/lib/rdf/vocabulary.rb +++ b/lib/rdf/vocabulary.rb @@ -117,7 +117,7 @@ def property(*args) name, options = args options = {label: name.to_s, vocab: self}.merge(options || {}) uri_str = [to_s, name.to_s].join('') - Term.cache.delete(uri_str) # Clear any previous entry + Term.cache.delete(uri_str.to_sym) # Clear any previous entry prop = Term.intern(uri_str, attributes: options) props[name.to_sym] = prop # Define an accessor, except for problematic properties From fc06d1fa6cc234845ea846f192988bc676fd9287 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 11 Jul 2016 13:03:57 -0700 Subject: [PATCH 4/7] Fix vocabulary term attributes to only contain symbol keys. --- lib/rdf/vocabulary.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rdf/vocabulary.rb b/lib/rdf/vocabulary.rb index d3f3c3c6..3aaf475b 100644 --- a/lib/rdf/vocabulary.rb +++ b/lib/rdf/vocabulary.rb @@ -295,7 +295,7 @@ def from_graph(graph, url: nil, class_name: nil, extra: nil) when RDF::URI("http://schema.org/inverseOf") then :inverseOf when RDF::URI("http://schema.org/domainIncludes") then :domainIncludes when RDF::URI("http://schema.org/rangeIncludes") then :rangeIncludes - else statement.predicate.pname + else statement.predicate.pname.to_sym end value = if statement.object.uri? From 2b1fed132dbcf4bc22f7205619df25fe53bf7f6a Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 12 Aug 2016 18:09:05 -0700 Subject: [PATCH 5/7] Remove wirble from Gemfile, as dependency-ci objects that it has no license and it's not really neccessary. --- .travis.yml | 2 +- Gemfile | 1 - lib/rdf/cli.rb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 161d6a67..fe893f0f 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-9.1.2.0 - rbx cache: bundler sudo: false diff --git a/Gemfile b/Gemfile index 64dc96dc..322acabf 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,6 @@ end group :debug do gem 'psych', platforms: [:mri, :rbx] - gem "wirble" gem "redcarpet", platforms: :ruby gem "byebug", platforms: :mri gem 'rubinius-debugger', platform: :rbx diff --git a/lib/rdf/cli.rb b/lib/rdf/cli.rb index baca7d86..3ede0493 100644 --- a/lib/rdf/cli.rb +++ b/lib/rdf/cli.rb @@ -204,7 +204,7 @@ def call(arg) parse: true, help: "validate [options] [args...]\nvalidates parsed input (may also be used with --validate)", lambda: ->(argv, opts) do - $stdout.puts "Input is " + (repository.valid? ? "" :"in") + "valid" + $stdout.puts "Input is " + (repository.valid? ? "" : "in") + "valid" end } } From 1814af2fcbc96c42b3403685453430513d2a313e Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 13 Aug 2016 15:18:23 -0700 Subject: [PATCH 6/7] Change Travis JRuby to default and allow failures. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe893f0f..5c4ab159 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,13 @@ env: rvm: - 2.2.5 - 2.3.1 - - jruby-9.1.2.0 + - jruby - rbx cache: bundler sudo: false addons: code_climate: repo_token: 5806cc8a21c03f4e2f9d3b9d98d5d9fe084b66243b1dbb27b467dbc795acdcac +matrix: + allow_failures: + - rvm: jruby From f64db9c0ddc23e814da26f483d55a2763c4caccb Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 14 Aug 2016 11:33:49 -0700 Subject: [PATCH 7/7] Version 2.0.3. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e9307ca5..50ffc5aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.2 +2.0.3