Finish 3.1.0

Author: gkellogg

.travis.yml

@@ -1,18 +1,16 @@
 language: ruby
-bundler_args: --without debug
 script: "bundle exec rspec spec"
 env:
   - CI=true
 rvm:
-  - 2.2
-  - 2.3
   - 2.4
-  - jruby-9
-  - rbx-3
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby
 cache: bundler
 sudo: false
 matrix:
   allow_failures:
-    - rvm: jruby-9
-    - rvm: rbx-3
+    - rvm: jruby
 dist: trusty

Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rdf',  github: "ruby-rdf/rdf",  branch: "develop"
-gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
+gem 'ebnf', github: "dryruby/ebnf",  branch: "develop"
 
 group :debug do
   gem "byebug", platforms: :mri
@@ -21,13 +21,7 @@ group :development, :test do
   gem 'sparql-client',      github: "ruby-rdf/sparql-client",       branch: "develop"
   gem 'sxp',                github: "dryruby/sxp.rb",               branch: "develop"
   gem 'rest-client-components'
-  gem 'simplecov',  require: false
-  gem 'coveralls',  require: false
+  gem 'simplecov',  platforms: :mri
+  gem 'coveralls',  '~> 0.8', platforms: :mri
   gem 'psych',      platforms: [:mri, :rbx]
 end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius', '~> 2.0'
-  gem 'json'
-end

README.md

@@ -24,7 +24,7 @@ This gem implements the [LD Patch][] specification with a couple of changes and/
 * 100% free and unencumbered [public domain](http://unlicense.org/) software.
 * Complete [Linked Data Patch Format][LD Patch] parsing and execution
 * Implementation Report: {file:etc/earl.html EARL}
-* Compatible with Ruby >= 2.2.2.
+* Compatible with Ruby >= 2.4.
 
 ## Documentation
 Full documentation available on [Rubydoc.info][LD-Patch doc]
@@ -73,12 +73,12 @@ The parser takes branch and follow tables generated from the [LD Patch Grammar](
 
 ## Dependencies
 
-* [Ruby](http://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (~> 2.0)
-* [EBNF][] (~> 1.0)
-* [SPARQL][] (~> 2.0)
-* [SXP][] (~> 0.1.6)
-* [RDF::XSD][] (~> 2.0)
+* [Ruby](http://ruby-lang.org/) (>= 2.4)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.1)
+* [EBNF][] (~> 1.2)
+* [SPARQL][] (~> 3.1)
+* [SXP][] (~> 1.1)
+* [RDF::XSD][] (~> 3.1)
 
 ## Mailing List
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>

VERSION

@@ -1 +1 @@
-0.3.3
+3.1.0

ld-patch.gemspec

@@ -16,32 +16,26 @@ Gem::Specification.new do |gem|
   gem.platform           = Gem::Platform::RUBY
   gem.files              = %w(AUTHORS README.md LICENSE VERSION bin/ldpatch) + Dir.glob('lib/**/*.rb')
   gem.require_paths      = %w(lib)
-  gem.has_rdoc           = false
   gem.description        = %(
     Implements the W3C Linked Data Patch Format and operations for RDF.rb.
     Makes use of the SPARQL gem for performing updates.)
 
-  gem.required_ruby_version      = '>= 2.2.2'
+  gem.required_ruby_version      = '>= 2.4'
   gem.requirements               = []
-  #gem.add_runtime_dependency     'rdf',               '~> 3.0'
-  gem.add_runtime_dependency     'rdf',               '>= 2.2', '< 4.0'
-  gem.add_runtime_dependency     'ebnf',              '~> 1.1'
-  #gem.add_runtime_dependency     'sparql',            '~> 3.0'
-  gem.add_runtime_dependency     'sparql',            '>= 2.2', '< 4.0'
-  gem.add_runtime_dependency     'sxp',               '~> 1.0'
-  #gem.add_runtime_dependency     'rdf-xsd',           '~> 3.0'
-  gem.add_runtime_dependency     'rdf-xsd',           '>= 2.2', '< 4.0'
+  gem.add_runtime_dependency     'rdf',               '~> 3.1'
+  gem.add_runtime_dependency     'ebnf',              '~> 1.2'
+  gem.add_runtime_dependency     'sparql',            '~> 3.1'
+  gem.add_runtime_dependency     'sxp',               '~> 1.1'
+  gem.add_runtime_dependency     'rdf-xsd',           '~> 3.1'
 
-  #gem.add_development_dependency 'json-ld',           '~> 2.0'
-  gem.add_development_dependency 'json-ld',           '>= 2.1', '< 4.0'
-  gem.add_development_dependency 'rack',              '~> 1.6'
-  #gem.add_development_dependency 'rdf-spec',          '~> 2.0'
-  gem.add_development_dependency 'rdf-spec',          '>= 2.2', '< 4.0'
+  gem.add_development_dependency 'json-ld',           '~> 3.1'
+  gem.add_development_dependency 'rack',              '~> 2.0'
+  gem.add_development_dependency 'rdf-spec',          '~> 3.1'
   gem.add_development_dependency 'open-uri-cached',   '~> 0.0', '>= 0.0.5'
-  gem.add_development_dependency 'rspec',             '~> 3.7'
-  gem.add_development_dependency 'rspec-its',         '~> 1.2'
-  gem.add_development_dependency 'yard' ,             '~> 0.9'
-  gem.add_development_dependency 'webmock',           '~> 3.0'
+  gem.add_development_dependency 'rspec',             '~> 3.9'
+  gem.add_development_dependency 'rspec-its',         '~> 1.3'
+  gem.add_development_dependency 'yard' ,             '~> 0.9.20'
+  gem.add_development_dependency 'webmock',           '~> 3.7'
 
   gem.post_install_message       = nil
 end

lib/ld/patch.rb

@@ -28,8 +28,8 @@ module Patch
     #   the base URI to use when resolving relative URIs
     # @option (see LD::Patch::Parser#initialize)
     # @return [SPARQL::Algebra::Operator] The executable parsed Patch
-    def self.parse(input, options = {})
-      LD::Patch::Parser.new(input, options).parse
+    def self.parse(input, **options)
+      LD::Patch::Parser.new(input, **options).parse
     end
 
     class Error < StandardError
@@ -42,7 +42,7 @@ class Error < StandardError
       # @param  [String, #to_s]          message
       # @param  [Hash{Symbol => Object}] options
       # @option options [Integer]        :code (422)
-      def initialize(message, options = {})
+      def initialize(message, **options)
         @code = options.fetch(:status_code, 422)
         super(message.to_s)
       end
@@ -70,7 +70,7 @@ class ParseError < Error
       # @option options [String]         :token  (nil)
       # @option options [Integer]        :lineno (nil)
       # @option options [Integer]        :code (400)
-      def initialize(message, options = {})
+      def initialize(message, **options)
         @token      = options[:token]
         @lineno     = options[:lineno] || (@token.lineno if @token.respond_to?(:lineno))
         super(message.to_s, code: options.fetch(:code, 400))

lib/ld/patch/format.rb

@@ -42,7 +42,7 @@ def self.cli_commands
               control: :none,
               on: ["--patch-input STRING"],
               description: "Patch in URI encoded format"
-            ) {|v| URI.decode(v)},
+            ) {|v| CGI.decode(v)},
             RDF::CLI::Option.new(
               symbol: :patch_file,
               datatype: String,

lib/ld/patch/parser.rb

@@ -295,7 +295,7 @@ class Parser
         str = lit.delete(:string)
         lit[:datatype] = lit.delete(:iri) if lit[:iri]
         lit[:language] = lit.delete(:language).last.downcase if lit[:language]
-        input[:literal] = RDF::Literal.new(str, lit) if str
+        input[:literal] = RDF::Literal.new(str, **lit) if str
       end
     end
 
@@ -323,7 +323,7 @@ class Parser
     # @yield  [parser] `self`
     # @yieldparam  [LD::Patch::Parser] parser
     # @return [LD::Patch::Parser] The parser instance, or result returned from block
-    def initialize(input = nil, options = {}, &block)
+    def initialize(input = nil, **options, &block)
       @input = case input
       when IO, StringIO then input.read
       else input.to_s.dup
@@ -366,10 +366,13 @@ def initialize(input = nil, options = {}, &block)
     # @return [SPARQL::Algebra::Operator, Object]
     # @raise [ParseError] when illegal grammar detected.
     def parse(prod = START)
-      ll1_parse(@input, prod.to_sym, @options.merge(branch: BRANCH,
-                                                    first: FIRST,
-                                                    follow: FOLLOW,
-                                                    whitespace: WS)
+      ll1_parse(@input,
+        prod.to_sym,
+        branch: BRANCH,
+        first: FIRST,
+        follow: FOLLOW,
+        whitespace: WS,
+        **@options
       ) do |context, *data|
         case context
         when :trace
@@ -545,7 +548,7 @@ def ns(prefix, suffix)
     end
 
     # Create a literal
-    def literal(value, options = {})
+    def literal(value, **options)
       options = options.dup
       # Internal representation is to not use xsd:string, although it could arguably go the other way.
       options.delete(:datatype) if options[:datatype] == RDF::XSD.string
@@ -554,7 +557,7 @@ def literal(value, options = {})
         "options: #{options.inspect}, " +
         "validate: #{validate?.inspect}, "
       end
-      RDF::Literal.new(value, options.merge(validate: validate?))
+      RDF::Literal.new(value, validate: validate?, **options)
     end
   end
 end

spec/matchers.rb

@@ -8,11 +8,11 @@
    array_nl:      "\n"
  )
 
-RSpec::Matchers.define :generate do |expected, options = {}|
+RSpec::Matchers.define :generate do |expected, **options|
   def parser(options = {})
     @debug = options[:progress] ? 2 : []
     Proc.new do |input|
-      parser = LD::Patch::Parser.new(input, {debug: @debug, resolve_iris: false}.merge(options))
+      parser = LD::Patch::Parser.new(input, debug: @debug, resolve_iris: false, **options)
       options[:production] ? parser.parse(options[:production]) : parser.parse
     end
   end
@@ -31,15 +31,15 @@ def normalize(obj)
   match do |input|
     case
     when expected == LD::Patch::ParseError
-      expect {parser(options).call(input)}.to raise_error(expected)
+      expect {parser(**options).call(input)}.to raise_error(expected)
     when expected.is_a?(Regexp)
-      @actual = parser(options).call(input)
+      @actual = parser(**options).call(input)
       expect(normalize(@actual.to_sxp)).to match(expected)
     when expected.is_a?(String)
-      @actual = parser(options).call(input)
+      @actual = parser(**options).call(input)
       expect(normalize(@actual.to_sxp)).to eq normalize(expected)
     else
-      @actual = parser(options).call(input)
+      @actual = parser(**options).call(input)
       expect(@actual).to eq expected
     end
   end

spec/suite_helper.rb

@@ -22,11 +22,11 @@ class << self
     #   HTTP Request headers.
     # @return [IO] File stream
     # @yield [IO] File stream
-    def self.open_file(filename_or_url, options = {}, &block)
+    def self.open_file(filename_or_url, **options, &block)
       case
       when filename_or_url.to_s =~ /^file:/
         path = filename_or_url[5..-1]
-        Kernel.open(path.to_s, options, &block)
+        Kernel.open(path.to_s, **options, &block)
       when (filename_or_url.to_s =~ %r{^#{REMOTE_PATH}} && Dir.exist?(LOCAL_PATH))
         localpath = RDF::URI(filename_or_url).dup
         localpath.query = nil
@@ -44,6 +44,7 @@ def self.open_file(filename_or_url, options = {}, &block)
         }
         #puts "use #{filename_or_url} locally"
         document_options[:headers][:content_type] = case filename_or_url.to_s
+        when /\.nt$/      then 'application/n-triples'
         when /\.ttl$/     then 'text/turtle'
         when /\.ldpatch$/ then 'text/ldpatch'
         else                  'unknown'
@@ -53,14 +54,14 @@ def self.open_file(filename_or_url, options = {}, &block)
         # For overriding content type from test data
         document_options[:headers][:content_type] = options[:contentType] if options[:contentType]
 
-        remote_document = RDF::Util::File::RemoteDocument.new(response.read, document_options)
+        remote_document = RDF::Util::File::RemoteDocument.new(response.read, **document_options)
         if block_given?
           yield remote_document
         else
           remote_document
         end
       else
-        original_open_file(filename_or_url, options) do |rd|
+        original_open_file(filename_or_url, **options) do |rd|
           # Override content_type
           if options[:contentType]
             rd.headers[:content_type] = options[:contentType]
@@ -112,7 +113,7 @@ def self.open(file)
         g = RDF::Repository.load(file, format:  :ttl)
         JSON::LD::API.fromRDF(g) do |expanded|
           JSON::LD::API.frame(expanded, FRAME) do |framed|
-            yield Manifest.new(framed['@graph'].first)
+            yield Manifest.new(framed)
           end
         end
       end
@@ -142,23 +143,23 @@ def input
         when Hash then action['patch']
         else action
         end
-        @input ||= RDF::Util::File.open_file(URI.decode(url)) {|f| f.read}
+        @input ||= RDF::Util::File.open_file(CGI.unescape(url)) {|f| f.read}
       end
 
       def data
         action.is_a?(Hash) && action["data"]
       end
 
       def target_graph
-        @graph ||= RDF::Graph.load(URI.decode(data), base_uri: base)
+        @graph ||= RDF::Graph.load(CGI.unescape(data), base_uri: base)
       end
 
       def expected
-        @expected ||= RDF::Util::File.open_file(URI.decode(result)) {|f| f.read}
+        @expected ||= RDF::Util::File.open_file(CGI.unescape(result)) {|f| f.read}
       end
 
       def expected_graph
-        @expected_graph ||= RDF::Graph.load(URI.decode(result), base_uri: base)
+        @expected_graph ||= RDF::Graph.load(CGI.unescape(result), base_uri: base)
       end
 
       def evaluate?