Finish 0.3.2

Author: gkellogg

.travis.yml

@@ -4,14 +4,15 @@ script: "bundle exec rspec spec"
 env:
   - CI=true
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - jruby
-  - rbx
+  - 2.2
+  - 2.3
+  - 2.4
+  - jruby-9
+  - rbx-3
 cache: bundler
 sudo: false
 matrix:
   allow_failures:
-    - rvm: rbx
-    - rvm: jruby
+    - rvm: jruby-9
+    - rvm: rbx-3
+dist: trusty

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.
 

VERSION

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

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"

ld-patch.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
   gem.homepage           = "http://github.com/ruby-rdf/ld-patch"
   gem.license            = 'Unlicense'
   gem.summary            = "W3C Linked Data Patch Format for RDF.rb."
-  gem.rubyforge_project  = 'ld-patch'
 
   gem.authors            = ['Gregg Kellogg']
   gem.email              = 'public-rdf-ruby@w3.org'

lib/ld/patch/format.rb

@@ -20,29 +20,43 @@ class Format < RDF::Format
     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"
+            ),
           ]
         }
       }

spec/format_spec.rb

@@ -36,8 +36,11 @@
       it "patches from file" do
         expect {RDF::CLI.exec(["patch", "serialize", nt], patch_file: patch)}.to write.to(:output)
       end
+      it "patches from StringIO" do
+        expect {RDF::CLI.exec(["patch", "serialize", nt], patch_file: StringIO.new(File.read(patch)))}.to write.to(:output)
+      end
       it "patches from argument" do
-        expect {RDF::CLI.exec(["patch", "serialize", nt], patch: patch_enc)}.to write.to(:output)
+        expect {RDF::CLI.exec(["patch", "serialize", nt], patch_input: patch_enc)}.to write.to(:output)
       end
     end
   end