ld-patch 0.3.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 27a3642a91846cb23466184a3d5bfc4397b20df4
-  data.tar.gz: f542b62f93ad91a1899097a47c0ab5e6c4047d1a
+SHA256:
+  metadata.gz: 5d07d0448e3c60b5914fc701865a6616b8c5f060db3ace27d3faf36c7b4e4055
+  data.tar.gz: 4b712590d54698ed034ccfe3240a26a473903ca52cf50848e2887ee82ed607d2
 SHA512:
-  metadata.gz: 714a26208900d98bb44ea32b08e76624ce3712ecb90eeb2a3a6ad66c0424b780676ed83c3c723eefd0e931919c3cceb5a48c5d9d569b0fc1162e07ecd9477c3b
-  data.tar.gz: 0b330bc3cc7892334f6c84aeea48c01cf203b0ad7d7899f5b849f346fe486b59940c9e4d2cd32d534cf05ac0c05d2c4e346b2c405a2bd332a8e03bf4ca5e77d7
+  metadata.gz: c7a2fd556c496f710019ad71690e942c56bad0db2cea739120ba82e87f36f6a3e2b6c9f947416c00f60cba925ef3af3296ba9fb39ea83d5cbaa355f999cfd5f0
+  data.tar.gz: a549e48839de8448deb97190fba247bed927a5cccd320c7b06af498f4ce356fd713a8c5adba73063c7bb39c5c1439458368f739a56397871ff42c865d040386d

data/README.md

@@ -2,9 +2,10 @@
 
 This is a [Ruby][] implementation of [LD Patch][] for [RDF.rb][].
 
-[![Gem Version](https://badge.fury.io/rb/ld-patch.png)](http://badge.fury.io/rb/ld-patch)
-[![Build Status](https://travis-ci.org/ruby-rdf/ld-patch.png?branch=master)](http://travis-ci.org/ruby-rdf/ld-patch)
-[![Coverage Status](https://coveralls.io/repos/ruby-rdf/ld-patch/badge.svg)](https://coveralls.io/r/ruby-rdf/ld-patch)
+[![Gem Version](https://badge.fury.io/rb/ld-patch.png)](https://badge.fury.io/rb/ld-patch)
+[![Build Status](https://github.com/ruby-rdf/ld-patch/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/ld-patch/actions?query=workflow%3ACI)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/ld-patch/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/ld-patch?branch=develop)
+[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## Description
 
@@ -24,7 +25,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]
@@ -50,7 +51,7 @@ Full documentation available on [Rubydoc.info][LD-Patch doc]
       Bind ?ruby <> / doap:programming-language .
       Cut ?ruby .
     )
-    operator = LD::Patch.parse(patch, base_uri: "http://rubygems.org/gems/ld-patch")
+    operator = LD::Patch.parse(patch, base_uri: "https://rubygems.org/gems/ld-patch")
     operator.execute(queryable) # alternatively queryable.query(operator)
 
 ## Command Line
@@ -73,18 +74,18 @@ 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](https://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/>
 
 ## Author
-* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
+* [Gregg Kellogg](https://github.com/gkellogg) - <http://greggkellogg.net/>
 
 ## Contributing
 This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
@@ -94,7 +95,11 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
 * Do document every method you add using [YARD][] annotations. Read the [tutorial][YARD-GS] or just look at the existing code for examples.
 * Don't touch the `.gemspec`, `VERSION` or `AUTHORS` files. If you need to change them, do so on your private branch only.
 * Do feel free to add yourself to the `CREDITS` file and the corresponding list in the the `README`. Alphabetical order applies.
-* Do note that in order for us to merge any non-trivial changes (as a rule of thumb, additions larger than about 15 lines of code), we need an explicit [public domain dedication][PDD] on record from you.
+* Do note that in order for us to merge any non-trivial changes (as a rule
+  of thumb, additions larger than about 15 lines of code), we need an
+  explicit [public domain dedication][PDD] on record from you,
+  which you will be asked to agree to on the first commit to a repo within the organization.
+  Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.
 
 ## License
 This is free and unencumbered public domain software. For more information,
@@ -106,13 +111,13 @@ A copy of the [LD Patch EBNF](file:etc/ld-patch.ebnf) and derived parser files a
 [RDF]:            http://www.w3.org/RDF/
 [YARD]:           http://yardoc.org/
 [YARD-GS]:        http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
-[PDD]:             http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
-[RDF.rb]:         http://rubygems.org/gems/rdf
-[RDF::XSD]:       http://rubygems.org/gems/rdf-xsd
-[EBNF]:           http://rubygems.org/gems/ebnf
-[SPARQL]:         http://rubygems.org/gems/sparql
-[Linked Data]:    http://rubygems.org/gems/linkeddata
+[PDD]:              https://unlicense.org/#unlicensing-contributions
+[RDF.rb]:         https://rubygems.org/gems/rdf
+[RDF::XSD]:       https://rubygems.org/gems/rdf-xsd
+[EBNF]:           https://rubygems.org/gems/ebnf
+[SPARQL]:         https://rubygems.org/gems/sparql
+[Linked Data]:    https://rubygems.org/gems/linkeddata
 [SSE]:            http://openjena.org/wiki/SSE
-[SXP]:            http://rubygems.org/gems/sxp-ruby
+[SXP]:            https://rubygems.org/gems/sxp-ruby
 [LD Patch]:       http://www.w3.org/TR/ldpatch/
 [LD-Patch doc]:   http://rubydoc.info/github/ruby-rdf/ld-patch

data/VERSION

@@ -1 +1 @@
-0.3.2
+3.1.3

data/lib/ld/patch.rb

@@ -28,8 +28,8 @@ module LD
     #   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 @@ module LD
       # @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 @@ module LD
       # @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))

data/lib/ld/patch/algebra/cut.rb

@@ -43,7 +43,7 @@ module LD::Patch::Algebra
       end
 
       # Also delete triples having var in the object position
-      queryable.query(object: var).each do |statement|
+      queryable.query({object: var}).each do |statement|
         queryable.delete(statement)
         cut_count += 1
       end

data/lib/ld/patch/algebra/patch.rb

@@ -23,10 +23,17 @@ module LD::Patch::Algebra
     def execute(graph, options = {})
       debug(options) {"Delete"}
 
-      graph.transaction(mutable: true) do |tx|
+      if graph.respond_to?(:transaction)
+        graph.transaction(mutable: true) do |tx|
+          operands.inject(RDF::Query::Solutions.new([RDF::Query::Solution.new])) do |bindings, op|
+            # Invoke operand using bindings from prvious operation
+            op.execute(tx, options.merge(bindings: bindings))
+          end
+        end
+      else
         operands.inject(RDF::Query::Solutions.new([RDF::Query::Solution.new])) do |bindings, op|
           # Invoke operand using bindings from prvious operation
-          op.execute(tx, options.merge(bindings: bindings))
+          op.execute(graph, options.merge(bindings: bindings))
         end
       end
     end

data/lib/ld/patch/algebra/path.rb

@@ -52,11 +52,11 @@ module LD::Patch::Algebra
         case op
         when RDF::URI
           terms.map do |subject|
-            queryable.query(subject: subject, predicate: op).map(&:object)
+            queryable.query({subject: subject, predicate: op}).map(&:object)
           end.flatten
         when SPARQL::Algebra::Query
           # Get path solutions for each term for op
-          op.execute(queryable, options.merge(terms: terms)).map do |soln|
+          op.execute(queryable, **options.merge(terms: terms)).map do |soln|
             soln.path
           end.flatten
         else

data/lib/ld/patch/algebra/prefix.rb

@@ -31,7 +31,7 @@ module LD::Patch::Algebra
     # @see    http://www.w3.org/TR/rdf-sparql-query/#sparqlAlgebra
     def execute(queryable, options = {}, &block)
       debug(options) {"Prefix"}
-      @solutions = queryable.query(operands.last, options.merge(depth: options[:depth].to_i + 1), &block)
+      @solutions = queryable.query(operands.last, **options.merge(depth: options[:depth].to_i + 1), &block)
     end
     
     ##

data/lib/ld/patch/algebra/reverse.rb

@@ -30,7 +30,7 @@ module LD::Patch::Algebra
       terms = Array(options.fetch(:terms))
 
       results = terms.map do |object|
-        queryable.query(object: object, predicate: op).map(&:subject)
+        queryable.query({object: object, predicate: op}).map(&:subject)
       end.flatten
 
       RDF::Query::Solutions.new(results.map {|t| RDF::Query::Solution.new(path: t)})

data/lib/ld/patch/algebra/update_list.rb

@@ -35,7 +35,7 @@ module LD::Patch::Algebra
         var_or_iri = solution[var_or_iri]
       end
 
-      list_heads = queryable.query(subject: var_or_iri, predicate: predicate).map {|s| s.object}
+      list_heads = queryable.query({subject: var_or_iri, predicate: predicate}).map {|s| s.object}
 
       raise LD::Patch::Error, "UpdateList ambigious value for #{var_or_iri.to_ntriples} and #{predicate.to_ntriples}" if list_heads.length > 1
       raise LD::Patch::Error, "UpdateList no value found for #{var_or_iri.to_ntriples} and #{predicate.to_ntriples}" if list_heads.empty?

data/lib/ld/patch/format.rb

@@ -31,8 +31,8 @@ module LD::Patch
             end
             raise ArgumentError, "Patching requires a patch or reference to patch resource" unless opts[:patch_input]
             opts[:logger].info "Patch"
-            patch = LD::Patch.parse(opts[:patch_input], base_uri: opts.fetch(:patch_file, "http://rubygems.org/gems/ld-patch"))
-            opts[:messages][:"S-Expression"] = [patch.to_sse] if opts[:to_sxp]
+            patch = LD::Patch.parse(opts[:patch_input], base_uri: opts.fetch(:patch_file, "https://rubygems.org/gems/ld-patch"))
+            opts[:messages][:reasoner] = {"S-Expression": [patch.to_sse]} if opts[:to_sxp]
             RDF::CLI.repository.query(patch)
           end,
           options: [
@@ -42,7 +42,7 @@ module LD::Patch
               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,

data/lib/ld/patch/parser.rb

@@ -295,7 +295,7 @@ module LD::Patch
         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 @@ module LD::Patch
     # @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 @@ module LD::Patch
     # @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 @@ module LD::Patch
     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 @@ module LD::Patch
         "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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ld-patch
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-27 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,118 +16,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
@@ -154,56 +148,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.11'
 description: |2-
 
       Implements the W3C Linked Data Patch Format and operations for RDF.rb.
@@ -236,11 +230,11 @@ files:
 - lib/ld/patch/parser.rb
 - lib/ld/patch/terminals.rb
 - lib/ld/patch/version.rb
-homepage: http://github.com/ruby-rdf/ld-patch
+homepage: https://github.com/ruby-rdf/ld-patch
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -248,16 +242,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: W3C Linked Data Patch Format for RDF.rb.
 test_files: []