rdf 1.1.12 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 424861a5701eb72e91b109582c0fa5a822a55077
-  data.tar.gz: 6e3bb83de003042827fc25fd5b77522fa957c6a8
+  metadata.gz: d8cc213b390113a8231b320a298d2aa83a2d9139
+  data.tar.gz: 9d073afff562399f2cb879d10cfafa0409d484b1
 SHA512:
-  metadata.gz: cab68b2efe3db88ea4f11b71818c2966ccda4f41a3a41aeff008d41535bec2798c4e03e9db39219f767b3255974291243f14aeb5798b5733629e829a5a1bc74d
-  data.tar.gz: e7edd05ebdeec991a7403d26debf884a98ff94dbf74985c77b092aafe61f53bdc7f937b6ac77266d6506cebc01f0de1bbf2b832811ef6a3e9afecd4a55247239
+  metadata.gz: 1b0dfaf09965c2bb8cde8472882efb2223b0f5126e11d71d5aefcd560102e0213539a963d6b23bba3261e6261272794efdf56a7f66fe047d81f40afa7aaca302
+  data.tar.gz: 4499c53c7c4bfa96f3377f6ea9344054e8dbe182f42479bba2f535d453a44fecbdbdaf8853d82ed93d612edd74fc0dbee39af864e4994f0785cf5c61c8ade8c5

data/CREDITS

@@ -11,3 +11,4 @@
 * Pius Uzamere <pius@alum.mit.edu>
 * Judson Lester <nyarly@gmail.com>
 * Peter Vandenabeele <peter@vandenabeele.com>
+* Tom Johnson <johnson.tom@gmail.com>

data/README

@@ -419,6 +419,7 @@ follows:
 * [Pius Uzamere](http://github.com/pius) - <http://pius.me/>
 * [Judson Lester](https://github.com/nyarly) - <https://github.com/nyarly>
 * [Peter Vandenabeele](https://github.com/petervandenabeele) - <https://github.com/petervandenabeele>
+* [Tom Johnson](https://github.com/no-reply) - <https://github.com/no-reply>
 
 ## Contributing
 

data/VERSION

@@ -1 +1 @@
-1.1.12
+1.1.13

data/lib/rdf/mixin/enumerable.rb

@@ -103,11 +103,12 @@ module RDF
 
     ##
     # Default validate! implementation, overridden in concrete classes
-    # @return [RDF::Literal] `self`
+    # @return [RDF::Enumerable] `self`
     # @raise  [ArgumentError] if the value is invalid
     # @since  0.3.9
     def validate!
       raise ArgumentError if supports?(:validity) && invalid?
+      self
     end
     alias_method :validate, :validate!
 

data/lib/rdf/model/node.rb

@@ -146,9 +146,9 @@ module RDF
       when Literal
         # If other is a Literal, reverse test to consolodate complex type checking logic
         other == self
-      else 
+      else
         other.respond_to?(:node?) && other.node? &&
-          self.hash == other.hash &&
+          self.hash == other.to_term.hash &&
           other.respond_to?(:id) && @id == other.id
       end
     end

data/lib/rdf/model/value.rb

@@ -150,11 +150,12 @@ module RDF
 
     ##
     # Default validate! implementation, overridden in concrete classes
-    # @return [RDF::Literal] `self`
+    # @return [RDF::Value] `self`
     # @raise  [ArgumentError] if the value is invalid
     # @since  0.3.9
     def validate!
       raise ArgumentError if invalid?
+      self
     end
     alias_method :validate, :validate!
 

data/lib/rdf/query.rb

@@ -490,32 +490,36 @@ module RDF
       Query.new(*patterns)
     end
 
+    ##
+    # Determine if the URI is a valid according to RFC3987
+    #
+    # @return [Boolean] `true` or `false`
+    # @since 0.3.9
+    def valid?
+      !!validate!
+    rescue
+      false
+    end
+
     ##
     # Validate this query, making sure it can be executed by our query engine.
     # This method is public so that it may be called by implementations of
     # RDF::Queryable#query_execute that bypass our built-in query engine.
     #
-    # @return [void]
+    # @return [RDF::Query] `self`
     # @raise [ArgumentError] This query cannot be executed.
     def validate!
-      # Our first pattern, if it exists, cannot be an optional pattern.
-      if @patterns.length > 0 && @patterns[0].optional?
-        raise ArgumentError.new("Query must not begin with an optional pattern")
-      end
+      # All patterns must be valid
+      @patterns.each(&:validate!)
 
-      # All optional patterns must appear after the regular patterns.  We
-      # could test this more cleanly using Ruby 1.9-specific features, but
-      # we want to run under Ruby 1.8, too.
-      i = 0
-      i += 1 while i < @patterns.length && !@patterns[i].optional?
-      while i < @patterns.length
-        unless @patterns[i].optional?
+      # All optional patterns must appear after the regular patterns.
+      if i = @patterns.find_index(&:optional?)
+        unless @patterns[i..-1].all?(&:optional?)
           raise ArgumentError.new("Optional patterns must appear at end of query")
         end
-        i += 1
       end
 
-      nil
+      self
     end
 
   protected

data/lib/rdf/query/pattern.rb

@@ -96,6 +96,19 @@ module RDF; class Query
       !!options[:optional]
     end
 
+    ##
+    # Is this pattern composed only of valid components?
+    #
+    # @return [Boolean] `true` or `false`
+    def valid?
+      (has_subject?   ? (subject.resource? || subject.variable?) && subject.valid? : true) && 
+      (has_predicate? ? (predicate.uri? || predicate.variable?) && predicate.valid? : true) &&
+      (has_object?    ? (object.term? || object.variable?) && object.valid? : true) &&
+      (has_context?   ? (context.resource? || context.variable?) && context.valid? : true )
+    rescue NoMethodError
+      false
+    end
+
     ##
     # Executes this query pattern on the given `queryable` object.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -41,7 +41,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.13
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement