Release 0.3.0.beta1

gkellogg · gkellogg · commit eedda87cd246 · 2016-02-22T15:03:18.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ build/
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 /Gemfile.lock
+/.byebug_history
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,12 @@ env:
 rvm:
   - 2.0
   - 2.1
-  - 2.2
-  - jruby
+  - 2.2.4
+  - 2.3.0
+  - jruby-9.0.4.0
   - rbx-2
 cache: bundler
 sudo: false
+matrix:
+  allow_failures:
+    - rvm: rbx-2
diff --git a/Gemfile b/Gemfile
@@ -2,15 +2,26 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rdf', git: "git://github.com/ruby-rdf/rdf.git", branch: "develop"
-gem 'ebnf', git: "git://github.com/gkellogg/ebnf.git", branch: "develop"
+gem 'rdf',  github: "ruby-rdf/rdf",  branch: "develop"
+gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
 
-group :development do
+group :debug do
   gem "wirble"
-  gem "byebug", platforms: :mri_21
+  gem "byebug", platforms: :mri
 end
 
 group :development, :test do
+  gem 'json-ld',            github: "ruby-rdf/json-ld",             branch: "develop"
+  gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo",  branch: "develop"
+  gem 'rdf-isomorphic',     github: "ruby-rdf/rdf-isomorphic",      branch: "develop"
+  gem 'rdf-spec',           github: "ruby-rdf/rdf-spec",            branch: "develop"
+  gem "rdf-vocab",          github: "ruby-rdf/rdf-vocab",           branch: "develop"
+  gem 'rdf-turtle',         github: "ruby-rdf/rdf-turtle",          branch: "develop"
+  gem 'rdf-xsd',            github: "ruby-rdf/rdf-xsd",             branch: "develop"
+  gem 'sparql',             github: "ruby-rdf/sparql",              branch: "develop"
+  gem 'sparql-client',      github: "ruby-rdf/sparql-client",       branch: "develop"
+  gem 'sxp',                github: "gkellogg/sxp-ruby"
+  gem 'rest-client-components'
   gem 'simplecov',  require: false
   gem 'coveralls',  require: false
   gem 'psych',      platforms: [:mri, :rbx]
diff --git a/README.md b/README.md
@@ -61,11 +61,11 @@ The parser takes branch and follow tables generated from the [LD Patch Grammar](
 ## Dependencies
 
 * [Ruby](http://ruby-lang.org/) (>= 2.0.0)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1.15)
-* [EBNF][] (>= 0.3.0)
-* [SPARQL][] (>= 1.1.7)
-* [SXP][] (>= 0.1.5)
-* [RDF::XSD][] (>= 1.1.4)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 2.0)
+* [EBNF][] (~> 1.0)
+* [SPARQL][] (~> 2.0)
+* [SXP][] (~> 0.1.6)
+* [RDF::XSD][] (~> 2.0)
 
 ## Mailing List
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.0
+0.3.0.beta1
diff --git a/ld-patch.gemspec b/ld-patch.gemspec
@@ -20,24 +20,24 @@ Gem::Specification.new do |gem|
   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)
+    Makes use of the SPARQL gem for performing updates.)
 
   gem.required_ruby_version      = '>= 2.0.0'
   gem.requirements               = []
-  gem.add_runtime_dependency     'rdf',               '~> 1.1', '>= 1.1.15'
-  gem.add_runtime_dependency     'ebnf',              '~> 1.0'
-  gem.add_runtime_dependency     'sparql',            '~> 1.1', '>= 1.1.7'
-  gem.add_runtime_dependency     'sxp',               '~> 0.1'
-  gem.add_runtime_dependency     'rdf-xsd',           '~> 1.1'
+  gem.add_runtime_dependency     'rdf',               '>= 2.0.0.beta', '< 3'
+  gem.add_runtime_dependency     'ebnf',              '~> 1.0', '>= 1.0.1'
+  gem.add_runtime_dependency     'sparql',            '>= 1.99', '< 3'
+  gem.add_runtime_dependency     'sxp',               '>= 1.0.0.beta', '< 2'
+  gem.add_runtime_dependency     'rdf-xsd',           '>= 1.99', '< 3'
 
+  gem.add_development_dependency 'json-ld',             '>= 1.99', '< 3'
   gem.add_development_dependency 'rack',              '~> 1.6'
-  gem.add_development_dependency 'linkeddata',        '~> 1.1'
-  gem.add_development_dependency 'rdf-spec',          '~> 1.1'
+  gem.add_development_dependency 'rdf-spec',          '>= 2.0.0.beta', '< 3'
   gem.add_development_dependency 'open-uri-cached',   '~> 0.0', '>= 0.0.5'
-  gem.add_development_dependency 'rspec',             '~> 3.2'
+  gem.add_development_dependency 'rspec',             '~> 3.4'
   gem.add_development_dependency 'rspec-its',         '~> 1.2'
   gem.add_development_dependency 'yard' ,             '~> 0.8'
-  gem.add_development_dependency 'webmock',           '~> 1.17'
+  gem.add_development_dependency 'webmock',           '~> 1.22'
 
   gem.post_install_message       = nil
 end
diff --git a/lib/ld/patch/algebra/index.rb b/lib/ld/patch/algebra/index.rb
@@ -24,7 +24,7 @@ def execute(queryable, options = {})
       index = operand(0)
 
       results = terms.map do |term|
-        list = RDF::List.new(term, queryable)
+        list = RDF::List.new(subject: term, graph: queryable)
         list.at(index.to_i)
       end.flatten
 
diff --git a/lib/ld/patch/algebra/patch.rb b/lib/ld/patch/algebra/patch.rb
@@ -10,31 +10,25 @@ class Patch < SPARQL::Algebra::Operator
     NAME = :patch
 
     ##
-    # Executes this upate on the given `writable` graph or repository.
+    # Executes this upate on the given `transactable` graph or repository.
     #
-    # @param  [RDF::Queryable] queryable
-    #   the graph or repository to write
+    # @param  [RDF::Transactable] graph
+    #   the graph to update.
     # @param  [Hash{Symbol => Object}] options
     #   any additional options
-    # @return [RDF::Queryable]
-    #   Returns queryable.
+    # @return [RDF::Transactable]
+    #   Returns graph.
     # @raise [Error]
     #   If any error is caught along the way, and rolls back the transaction
-    def execute(queryable, options = {})
+    def execute(graph, options = {})
       debug(options) {"Delete"}
 
-      # FIXME: due to insufficient transaction support, this is implemented by running through operands twice: the first using a clone of the graph, and the second acting on the graph directly
-      graph = RDF::Graph.new << queryable
-      loop do
+      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(graph, options.merge(bindings: bindings))
+          op.execute(tx, options.merge(bindings: bindings))
         end
-
-        break if graph.equal?(queryable)
-        graph = queryable
       end
-      queryable
     end
   end
 end
diff --git a/lib/ld/patch/algebra/update_list.rb b/lib/ld/patch/algebra/update_list.rb
@@ -40,7 +40,7 @@ def execute(queryable, options = {})
       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?
       lh = list_heads.first
-      list = RDF::List.new(lh, queryable)
+      list = RDF::List.new(subject: lh, graph: queryable)
       raise LD::Patch::Error, "Invalid list" unless list.valid?
 
       start = case
diff --git a/lib/ld/patch/parser.rb b/lib/ld/patch/parser.rb
@@ -261,7 +261,7 @@ class Parser
       else
         debug("object") {"current: #{current.inspect}"}
         object = current[:resource] || current[:literal] || current[:iri]
-        (input[:triples] ||= []) << RDF::Query::Pattern.new(input[:subject], input[:predicate], object)
+        (input[:triples] ||= []) << RDF::Query::Pattern.new(subject: input[:subject], predicate: input[:predicate], object: object)
       end
     end
 
diff --git a/spec/matchers.rb b/spec/matchers.rb
@@ -1,5 +1,4 @@
 # coding: utf-8
-require 'rdf/isomorphic'
 require 'json'
 JSON_STATE = JSON::State.new(
    indent:        "  ",
@@ -9,59 +8,6 @@
    array_nl:      "\n"
  )
 
-def normalize(graph)
-  case graph
-  when RDF::Queryable then graph
-  when IO, StringIO
-    RDF::Graph.new.load(graph, base_uri:  @info.about)
-  else
-    # Figure out which parser to use
-    g = RDF::Repository.new
-    reader_class = detect_format(graph)
-    reader_class.new(graph, base_uri:  @info.about).each {|s| g << s}
-    g
-  end
-end
-
-Info = Struct.new(:about, :coment, :trace, :input, :result, :action, :expected)
-
-RSpec::Matchers.define :be_equivalent_graph do |expected, info|
-  match do |actual|
-    @info = if info.respond_to?(:input)
-      info
-    elsif info.is_a?(Hash)
-      identifier = info[:identifier] || expected.is_a?(RDF::Enumerable) ? expected.context : info[:about]
-      trace = info[:trace]
-      if trace.is_a?(Array)
-        trace = trace.map {|s| s.dup.force_encoding(Encoding::UTF_8)}.join("\n")
-      end
-      Info.new(identifier, info[:comment] || "", trace)
-    else
-      Info.new(expected.is_a?(RDF::Enumerable) ? expected.context : info, info.to_s)
-    end
-    @expected = normalize(expected)
-    @actual = normalize(actual)
-    @actual.isomorphic_with?(@expected) rescue false
-  end
-
-  failure_message do |actual|
-    info = @info.respond_to?(:comment) ? @info.comment : @info.inspect
-    if @expected.is_a?(RDF::Graph) && @actual.size != @expected.size
-      "Graph entry count differs:\nexpected: #{@expected.size}\nactual:   #{@actual.size}"
-    elsif @expected.is_a?(Array) && @actual.size != @expected.length
-      "Graph entry count differs:\nexpected: #{@expected.length}\nactual:   #{@actual.size}"
-    else
-      "Graph differs"
-    end +
-    "\n#{info + "\n" unless info.empty?}" +
-    (@info.action ? "Input file: #{@info.action}\n" : "") +
-    (@info.result ? "Result file: #{@info.result}\n" : "") +
-    "Unsorted Expected:\n#{@expected.dump(:ttl, standard_prefixes:  true)}" +
-    "Unsorted Results:\n#{@actual.dump(:ttl, standard_prefixes:  true)}" +
-    (@info.trace ? "\nDebug:\n#{@info.trace}" : "")
-  end  
-end
-
 RSpec::Matchers.define :generate do |expected, options = {}|
   def parser(options = {})
     @debug = options[:progress] ? 2 : []
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,14 +1,16 @@
 require "bundler/setup"
 require 'rspec/its'
+require 'rdf/spec'
+require 'rdf/spec/matchers'
 require 'matchers'
 require 'webmock/rspec'
 require 'rdf/turtle'
 require 'simplecov'
 require 'coveralls'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
-]
+])
 SimpleCov.start do
   add_filter "/spec/"
 end
diff --git a/spec/suite_helper.rb b/spec/suite_helper.rb
@@ -177,6 +177,15 @@ def negative_test?
         !positive_test?
       end
 
+      # Create a logger initialized with the content of `debug`
+      def logger
+        @logger ||= begin
+          l = RDF::Spec.logger
+          debug.each {|d| l.debug(d)}
+          l
+        end
+      end
+
       def inspect
         super.sub('>', "\n" +
         "  syntax?: #{syntax?.inspect}\n" +
diff --git a/spec/suite_spec.rb b/spec/suite_spec.rb
@@ -21,6 +21,9 @@
             if %w(turtle-syntax-bad-struct-09 turtle-syntax-bad-struct-10).include?(t.name)
               pending "Multiple '.' allowed in this grammar"
             end
+            if %w(localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries__reverted).include?(t.name)
+              pending "I18N URI valid syntax but not URI"
+            end
             t.debug = []
             begin
               operator = LD::Patch.parse(t.input,
