diff --git a/.travis.yml b/.travis.yml index ad8ec26d..5c4ab159 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,15 @@ script: "bundle exec rspec spec" env: - CI=true rvm: - - 2.0 - - 2.1 - 2.2.5 - 2.3.1 - - jruby-9.0.5.0 + - jruby - rbx cache: bundler sudo: false addons: code_climate: repo_token: 5806cc8a21c03f4e2f9d3b9d98d5d9fe084b66243b1dbb27b467dbc795acdcac +matrix: + allow_failures: + - rvm: jruby 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/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. diff --git a/VERSION b/VERSION index e9307ca5..50ffc5aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.2 +2.0.3 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 } } diff --git a/lib/rdf/vocabulary.rb b/lib/rdf/vocabulary.rb index e07965a1..3aaf475b 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 @@ -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? 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'