ld-patch 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 487103c7936e34423555d2da4dcdee60ef0b882f
-  data.tar.gz: d394490da8bea83bc4198e7bb9a278ef4719aeb3
+  metadata.gz: 27a3642a91846cb23466184a3d5bfc4397b20df4
+  data.tar.gz: f542b62f93ad91a1899097a47c0ab5e6c4047d1a
 SHA512:
-  metadata.gz: 363c254bb67028732686af8e1ce2808a9250b93d400f16c4c3e4b0ac32a133d94e80f5e22a0483b3e6e3b27a48de92fe9f5d5f3c2064476fcbd23a156ed419b1
-  data.tar.gz: a1aff9d1f218b27ccd9a77f9a6bccacc7c57d2d656ba608235ff772d06b4acda023c7d9734941e5d37666a9ae6fea7fc39ea6596c168f21274b8c3947d8e64f4
+  metadata.gz: 714a26208900d98bb44ea32b08e76624ce3712ecb90eeb2a3a6ad66c0424b780676ed83c3c723eefd0e931919c3cceb5a48c5d9d569b0fc1162e07ecd9477c3b
+  data.tar.gz: 0b330bc3cc7892334f6c84aeea48c01cf203b0ad7d7899f5b849f346fe486b59940c9e4d2cd32d534cf05ac0c05d2c4e346b2c405a2bd332a8e03bf4ca5e77d7

data/README.md

@@ -53,6 +53,19 @@ Full documentation available on [Rubydoc.info][LD-Patch doc]
     operator = LD::Patch.parse(patch, base_uri: "http://rubygems.org/gems/ld-patch")
     operator.execute(queryable) # alternatively queryable.query(operator)
 
+## Command Line
+When the `linkeddata` gem is installed, RDF.rb includes a `rdf` executable which acts as a wrapper to perform a number of different
+operations on RDF files, including LD::Patch, which is used as a stream command and must be followed by serialize to see the results. The commands specific to LD::Patch is 
+
+* `ld-patch`: Patch the current graph using a patch file
+
+Using this command requires either a `patch-input` where the patch is URI encoded, or `patch-file`, which references a URI or file path to the patch. 
+Example usage:
+
+    rdf patch serialize https://raw.githubusercontent.com/ruby-rdf/ld-patch/develop/etc/doap.ttl \
+      --patch-input Add%20%7B%20%3Chttp://example.org/s2%3E%20%3Chttp://example.org/p2%3E%20%3Chttp://example.org/o2%3E%20%7D%20. \
+      --output-format ttl
+
 ## Implementation Notes
 The reader uses the [EBNF][] gem to generate first, follow and branch tables, and uses the `Parser` and `Lexer` modules to implement the LD Patch parser.
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/ldpatch

@@ -22,9 +22,9 @@ def run(graph, options = {})
 
   patch =  LD::Patch.parse(options[:patch], options)
 
-  puts ("\nSSE:\n" + patch.to_sse) if options[:debug] || options[:to_sse]
+  puts ("\nSXP:\n" + patch.to_sse) if options[:debug] || options[:to_sxp]
 
-  unless options[:to_sse]
+  unless options[:to_sxp]
     res = patch.execute(graph, options)
     puts res.dump(:ttl, base_uri: patch.base_uri, prefixes: patch.prefixes, standard_prefixes: true)
   end
@@ -35,7 +35,7 @@ opts = GetoptLong.new(
   ["--execute", "-e", GetoptLong::REQUIRED_ARGUMENT],
   ["--patch", GetoptLong::REQUIRED_ARGUMENT],
   ["--progress", GetoptLong::NO_ARGUMENT],
-  ["--to-sse", GetoptLong::NO_ARGUMENT],
+  ["--to-sxp", GetoptLong::NO_ARGUMENT],
   ["--validate", GetoptLong::NO_ARGUMENT],
   ["--verbose", GetoptLong::NO_ARGUMENT],
   ["--help", "-?", GetoptLong::NO_ARGUMENT]
@@ -50,7 +50,7 @@ opts.each do |opt, arg|
   when '--execute'      then options[:patch] = arg
   when '--patch'        then options[:patch] = RDF::Util::File.open_file(arg).read
   when '--progress'     then options[:debug] ||= 2
-  when '--to-sse'       then options[:to_sse] = true
+  when '--to-sxp'       then options[:to_sxp] = true
   when '--validate'     then options[:validate] = true
   when '--verbose'      then options[:verbose] = true
   when "--help"
@@ -61,7 +61,7 @@ opts.each do |opt, arg|
     puts "      --execute,-e: Use option argument as the patch input"
     puts "      --patch:      Location of patch document"
     puts "      --progress    Display parse tree"
-    puts "      --to-sse:     Generate SSE for patch instead of running query"
+    puts "      --to-sxp:     Generate S-Expression for patch instead of running query"
     puts "      --validate:   Validate patch document"
     puts "      --verbose:    Display details of processing"
     puts "      --help,-?:    This message"

data/lib/ld/patch/format.rb

@@ -20,29 +20,43 @@ module LD::Patch
     def self.cli_commands
       {
         patch: {
-          description: "Patch the current graph using a URI Encoded patch file, or a referenced path file/URI",
-          help: "patch [--patch 'patch'] [--patch-file file]",
+          description: "Patch the current graph using a patch file",
+          help: "patch [--patch-input 'patch'] [--patch-file file]",
+          control: :button,
           parse: true,
           lambda: -> (argv, opts) do
-            opts[:patch] ||= RDF::Util::File.open_file(opts[:patch_file]) {|f| f.read}
-            raise ArgumentError, "Patching requires a URI encoded patch or reference to patch resource" unless opts[:patch]
-            $stdout.puts "Patch"
-            patch = LD::Patch.parse(opts[:patch], base_uri: opts.fetch(:patch_file, "http://rubygems.org/gems/ld-patch"))
+            opts[:patch_input] ||= case opts[:patch_file]
+            when IO, StringIO then opts[:patch_file]
+            else RDF::Util::File.open_file(opts[:patch_file]) {|f| f.read}
+            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]
             RDF::CLI.repository.query(patch)
           end,
           options: [
             RDF::CLI::Option.new(
-              symbol: :patch,
+              symbol: :patch_input,
               datatype: String,
-              on: ["--patch STRING"],
+              control: :none,
+              on: ["--patch-input STRING"],
               description: "Patch in URI encoded format"
             ) {|v| URI.decode(v)},
             RDF::CLI::Option.new(
               symbol: :patch_file,
               datatype: String,
+              control: :url2,
               on: ["--patch-file URI"],
-              description: "URI of patch file"
+              description: "Patch file"
             ) {|v| RDF::URI(v)},
+            RDF::CLI::Option.new(
+              symbol: :to_sxp,
+              datatype: String,
+              control: :checkbox,
+              on: ["--to-sxp"],
+              description: "Instead of patching repository, display parsed patch as an S-Expression"
+            ),
           ]
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ld-patch
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -255,8 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ld-patch
-rubygems_version: 2.6.8
+rubyforge_project: 
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: W3C Linked Data Patch Format for RDF.rb.