rdf 1.1.0.p2 → 1.1.0.p3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzZkZDE2NTczM2Q1MGRjYjM1ZjJmYzNkNWY4YTY3MWMxZmJjNzZlZQ==
+  data.tar.gz: !binary |-
+    ODM4ZmFlMThiYjRiNTI5YTk3MGI0ODg4NTIwODhkZWRlMGNiYTA1ZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MTYyYjUwMDc4YTIyMDBhM2JiZDhhYTMwN2E4NjQxNGU3NDM1ZDhhZmVmOWNj
+    NjBiNWI3ZDUxZTdlNjI4ZDY0NTJlOWNhMTEwN2I3OWVjMzg4NTc3YTQ5YzU2
+    NTU3ZDk1ZmQ0ZDY2ZWUzM2U0YzQ3YjAzNjhiODVhNjgwMjVmYTA=
+  data.tar.gz: !binary |-
+    NDQ0MTRiYzNjMmQ3NTk3NTU1NDIzMWIwYzgxNzcxYmI4MWRmYzRiM2U0MmQw
+    YTdjZmEzZGUzOWRiMWU3YmRlODhjYjZkOGJlOTZlMzM3OGI5ZGYzMzA4NGJh
+    ZGI0MWIyNjU0MTljYmZhNGEwYWRlNzMwNjFlNWRmOTk5YzBmZWU=

data/CREDITS

@@ -8,3 +8,4 @@
 * John Fieber <jrf@ursamaris.org>
 * Keita Urashima <ursm@ursm.jp>
 * Pius Uzamere <pius@alum.mit.edu>
+* Judson Lester <nyarly@gmail.com>

data/README

@@ -387,6 +387,7 @@ follows:
 * [John Fieber](http://github.com/jfieber) - <http://github.com/jfieber>
 * [Keita Urashima](http://github.com/ursm) - <http://ursm.jp/>
 * [Pius Uzamere](http://github.com/pius) - <http://pius.me/>
+* [Judson Lester](https://github.com/nyarly) - <https://github.com/nyarly>
 
 ## Contributing
 

data/VERSION

@@ -1 +1 @@
-1.1.0.p2
+1.1.0.p3

data/lib/rdf/model/list.rb

@@ -39,10 +39,12 @@ module RDF
     # @yield  [list]
     # @yieldparam [RDF::List] list
     def initialize(subject = nil, graph = nil, values = nil, &block)
-      @subject = subject || RDF::Node.new
+      @subject = subject || RDF.nil
       @graph   = graph   || RDF::Graph.new
 
-      values.each { |value| self << value } unless values.nil? || values.empty?
+      unless values.to_a.empty?
+        values.reverse_each {|value| self.unshift(value)}
+      end
 
       if block_given?
         case block.arity
@@ -71,6 +73,7 @@ module RDF
         rest = nil
         firsts = rests = 0
         @graph.query(:subject => li) do |st|
+          return false unless st.subject.node?
           case st.predicate
           when RDF.first
             firsts += 1
@@ -202,6 +205,70 @@ module RDF
       at(index)
     end
 
+    ##
+    # Appends an element to the head of this list. Existing references are not updated, as the list subject changes as a side-effect.
+    #
+    # @example
+    #   RDF::List[].unshift(1).unshift(2).unshift(3) #=> RDF::List[3, 2, 1]
+    #
+    # @param  [RDF::Term] value
+    # @return [RDF::List]
+    # @see    http://www.ruby-doc.org/core-1.9.3/Array.html#method-i-unshift
+    #
+    def unshift(value)
+      value = case value
+        when nil         then RDF.nil
+        when RDF::Value  then value
+        when Array       then RDF::List.new(nil, graph, value)
+        else value
+      end
+
+      new_subject, old_subject = RDF::Node.new, subject
+
+      graph.insert([new_subject, RDF.first, value.is_a?(RDF::List) ? value.subject : value])
+      graph.insert([new_subject, RDF.rest, old_subject])
+
+      @subject = new_subject
+
+      return self
+    end
+
+    ##
+    # Removes and returns the element at the head of this list.
+    #
+    # @example
+    #   RDF::List[1,2,3].shift              #=> 1
+    #
+    # @return [RDF::Term]
+    # @see    http://www.ruby-doc.org/core-1.9.3/Array.html#method-i-shift
+    def shift
+      return nil if empty?
+
+      value = first
+      old_subject, new_subject = subject, rest_subject
+      graph.delete([old_subject, RDF.type, RDF.List])
+      graph.delete([old_subject, RDF.first, value])
+      graph.delete([old_subject, RDF.rest, new_subject])
+
+      @subject = new_subject
+      return value
+    end
+
+    ##
+    # Empties this list
+    #
+    # @example
+    #   RDF::List[1, 2, 2, 3].clear    #=> RDF::List[]
+    #
+    # @return [RDF::List]
+    # @see    http://ruby-doc.org/core-1.9.3/classes/Array.html#method-i-clear
+    def clear
+      until empty?
+        shift
+      end
+      return self
+    end
+
     ##
     # Appends an element to the tail of this list.
     #
@@ -220,7 +287,7 @@ module RDF
       end
 
       if empty?
-        new_subject = subject
+        @subject = new_subject = RDF::Node.new
       else
         old_subject, new_subject = last_subject, RDF::Node.new
         graph.delete([old_subject, RDF.rest, RDF.nil])

data/lib/rdf/model/statement.rb

@@ -182,12 +182,11 @@ module RDF
     end
 
     ##
-    # Returns `true` if the subject or object of this statement is a blank
-    # node.
+    # Returns `true` if any resource of this statement is a blank node.
     #
     # @return [Boolean]
     def has_blank_nodes?
-      (has_object? && object.node?) || (has_subject? && subject.node?)
+      to_quad.compact.any?(&:node?)
     end
 
     ##

data/lib/rdf/nquads.rb

@@ -38,12 +38,14 @@ module RDF
       def self.detect(sample)
         !!sample.match(%r(
           (?:\s*(?:<[^>]*>) | (?:_:\w+))                          # Subject
+          \s*
           (?:\s*<[^>]*>)                                          # Predicate
           \s*
           (?:(?:<[^>]*>) | (?:_:\w+) | (?:"[^"\n]*"(?:^^|@\S+)?)) # Object
-          (?:\s*<[^>]*>)                                          # Context
+          \s*
+          (?:\s*(?:<[^>]*>) | (?:_:\w+))                          # Context
           \s*\.
-        )mx) && !(
+        )x) && !(
           sample.match(%r(@(base|prefix|keywords)|\{)) ||         # Not Turtle/N3/TriG
           sample.match(%r(<(html|rdf))i)                          # Not HTML or XML
         )

data/lib/rdf/ntriples/format.rb

@@ -40,7 +40,7 @@ module RDF::NTriples
         \s*
         (?:(?:<[^>]*>) | (?:_:\w+) | (?:"[^"\n]*"(?:^^|@\S+)?)) # Object
         \s*\.
-      )mx) && !(
+      )x) && !(
         sample.match(%r(@(base|prefix|keywords)|\{)) ||         # Not Turtle/N3/TriG
         sample.match(%r(<(html|rdf))i)                          # Not HTML or XML
       ) && !RDF::NQuads::Format.detect(sample)

data/lib/rdf/query/solution.rb

@@ -182,17 +182,33 @@ class RDF::Query
 
     ##
     # Compatible Mappings
+    #
     # Two solution mappings u1 and u2 are compatible if, for every variable v in dom(u1) and in dom(u2), u1(v) = u2(v).
     #
     # @param [RDF::Query::Solution, #to_hash] other
     #   another query solution or hash bindings
     # @return [Boolean]
+    # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algCompatibleMapping
     def compatible?(other)
       @bindings.all? do |k, v|
         !other.to_hash.has_key?(k) || other[k].eql?(v)
       end
     end
-    
+
+    ##
+    # Disjoint mapping
+    #
+    # A solution is disjoint with another solution if it shares no common variables in their domains.
+    #
+    # @param [RDF::Query::Solution] other
+    # @return [Boolean]
+    # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algMinus
+    def disjoint?(other)
+      @bindings.none? do |k, v|
+        v && other.to_hash.has_key?(k) && other[k].eql?(v)
+      end
+    end
+
     ##
     # Isomorphic Mappings
     # Two solution mappings u1 and u2 are isomorphic if,

data/lib/rdf/query/solutions.rb

@@ -106,6 +106,20 @@ module RDF; class Query
     end
     alias_method :filter!, :filter
 
+    ##
+    # Difference between solution sets, from SPARQL 1.1.
+    #
+    # The `minus` operation on solutions returns those solutions which either have no compatible solution in `other`, or the solution domains are disjoint.
+    #
+    # @param [RDF::Query::Solutions] other
+    # @return [RDF::Query::Solutions] a new solution set
+    # @see http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#defn_algMinus
+    def -(other)
+      self.dup.filter! do |soln|
+        !other.any? {|soln2| soln.compatible?(soln2) && !soln.disjoint?(soln2)}
+      end
+    end
+
     ##
     # Reorders this solution sequence by the given `variables`.
     #

metadata

@@ -1,85 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.1.0.p2
-  prerelease: 6
+  version: 1.1.0.p3
 platform: ruby
 authors:
 - Arto Bendiken
 - Ben Lavender
 - Gregg Kellogg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-    none: false
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-rdfxml
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.12'
-    none: false
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: yard
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
-    none: false
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.8'
-    none: false
-  prerelease: false
   type: :development
-description: RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
+description: RDF.rb is a pure-Ruby library for working with Resource Description Framework
+  (RDF) data.
 email: public-rdf-ruby@w3.org
 executables:
 - rdf
@@ -94,19 +84,8 @@ files:
 - bin/rdf
 - etc/doap.nt
 - lib/df.rb
-- lib/rdf.rb
 - lib/rdf/cli.rb
 - lib/rdf/format.rb
-- lib/rdf/nquads.rb
-- lib/rdf/ntriples.rb
-- lib/rdf/query.rb
-- lib/rdf/reader.rb
-- lib/rdf/repository.rb
-- lib/rdf/transaction.rb
-- lib/rdf/util.rb
-- lib/rdf/version.rb
-- lib/rdf/vocab.rb
-- lib/rdf/writer.rb
 - lib/rdf/mixin/countable.rb
 - lib/rdf/mixin/durable.rb
 - lib/rdf/mixin/enumerable.rb
@@ -119,13 +98,6 @@ files:
 - lib/rdf/mixin/writable.rb
 - lib/rdf/model/graph.rb
 - lib/rdf/model/list.rb
-- lib/rdf/model/literal.rb
-- lib/rdf/model/node.rb
-- lib/rdf/model/resource.rb
-- lib/rdf/model/statement.rb
-- lib/rdf/model/term.rb
-- lib/rdf/model/uri.rb
-- lib/rdf/model/value.rb
 - lib/rdf/model/literal/boolean.rb
 - lib/rdf/model/literal/date.rb
 - lib/rdf/model/literal/datetime.rb
@@ -135,18 +107,33 @@ files:
 - lib/rdf/model/literal/numeric.rb
 - lib/rdf/model/literal/time.rb
 - lib/rdf/model/literal/token.rb
+- lib/rdf/model/literal.rb
+- lib/rdf/model/node.rb
+- lib/rdf/model/resource.rb
+- lib/rdf/model/statement.rb
+- lib/rdf/model/term.rb
+- lib/rdf/model/uri.rb
+- lib/rdf/model/value.rb
+- lib/rdf/nquads.rb
 - lib/rdf/ntriples/format.rb
 - lib/rdf/ntriples/reader.rb
 - lib/rdf/ntriples/writer.rb
+- lib/rdf/ntriples.rb
 - lib/rdf/query/hash_pattern_normalizer.rb
 - lib/rdf/query/pattern.rb
 - lib/rdf/query/solution.rb
 - lib/rdf/query/solutions.rb
 - lib/rdf/query/variable.rb
+- lib/rdf/query.rb
+- lib/rdf/reader.rb
+- lib/rdf/repository.rb
+- lib/rdf/transaction.rb
 - lib/rdf/util/aliasing.rb
 - lib/rdf/util/cache.rb
 - lib/rdf/util/file.rb
 - lib/rdf/util/uuid.rb
+- lib/rdf/util.rb
+- lib/rdf/version.rb
 - lib/rdf/vocab/cc.rb
 - lib/rdf/vocab/cert.rb
 - lib/rdf/vocab/dc.rb
@@ -166,31 +153,32 @@ files:
 - lib/rdf/vocab/wot.rb
 - lib/rdf/vocab/xhtml.rb
 - lib/rdf/vocab/xsd.rb
+- lib/rdf/vocab.rb
+- lib/rdf/writer.rb
+- lib/rdf.rb
 homepage: http://ruby-rdf.github.com/
 licenses:
 - Public Domain
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - !binary |-
-      Pg==
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
-  none: false
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubygems_version: 2.0.3
+signing_key: 
+specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.
 test_files: []
 has_rdoc: false