rdf 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b35c022bb44e2984bddf19489cd1f4735c03b75
-  data.tar.gz: 720f825d01d2c76aca6e27e0b1ad2101beebc362
+  metadata.gz: 9264fbe27f459f9604dbcb9c4c51cb337699186f
+  data.tar.gz: 0dd6fc0bc4406fe10b947cd2b784ca00d24a01f3
 SHA512:
-  metadata.gz: fab5abcd8aa2c90c9ab0a4ddd8fe33c25bd83cb0a5e2451fb64e7e0b00c19354aff75f8aa51fa228ebdf3c8522d3b1e19ff02bad2be809e302532a38d11ebb80
-  data.tar.gz: e73edad908ae432613d5f4cfd2e712fa933fb0b75f185acf8731a9948de8bd8c9e1679a39faefbb5457a55a5c0ee0d16717ec84363d2ca518cfe0538c8afc331
+  metadata.gz: 7bcb3e1123ee603fd659cbaccf429ccceded50e109eed283e56b6bab09b3b776b3727cf5c354df0ce9bf0df3e54e2f8ad2c304399eacc9236f763d08b097c38c
+  data.tar.gz: 468bdca03374b09c08a20de648955c2eb3fa6309c7a98e5aaf698230902b58b6989b5813afdb8152f975f4a42cce329b0ef1fddaa5b0d553810aea69682006c3

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/rdf/model/list.rb

@@ -139,6 +139,13 @@ module RDF
     # @return [RDF::Graph] the underlying graph storing the statements that constitute this list
     attr_reader :graph
 
+    ##
+    # @see RDF::Value#==
+    def ==(other)
+      return false if other.is_a?(RDF::Value) && !other.list?
+      super
+    end
+
     ##
     # Returns the set intersection of this list and `other`.
     #
@@ -272,7 +279,7 @@ module RDF
     #     a[3, 0] = "B"               #=> [1, 2, "A", "B"]
     #
     # @overload []=(index, term)
-    #   Replaces the element at `index` with `term`. 
+    #   Replaces the element at `index` with `term`.
     #   @param [Integer] index
     #   @param [RDF::Term] term
     #     A non-RDF::Term is coerced to a Literal.
@@ -445,7 +452,7 @@ module RDF
     # @return [Integer]
     # @see    http://ruby-doc.org/core-2.2.2/Array.html#method-i-3C-3D-3E
     def <=>(other)
-      to_a <=> other.to_a # TODO: optimize this
+      to_a <=> Array(other)
     end
 
     ##

data/lib/rdf/model/statement.rb

@@ -135,7 +135,7 @@ module RDF
     #
     # @return [Boolean]
     def variable?
-      !(has_subject?    && subject.resource? && 
+      !(has_subject?    && subject.resource? &&
         has_predicate?  && predicate.resource? &&
         has_object?     && (object.resource? || object.literal?) &&
         (has_graph?     ? graph_name.resource? : true ))
@@ -150,7 +150,7 @@ module RDF
     ##
     # @return [Boolean]
     def valid?
-      has_subject?    && subject.resource? && subject.valid? && 
+      has_subject?    && subject.resource? && subject.valid? &&
       has_predicate?  && predicate.uri? && predicate.valid? &&
       has_object?     && object.term? && object.valid? &&
       (has_graph?      ? graph_name.resource? && graph_name.valid? : true )
@@ -228,22 +228,61 @@ module RDF
     alias_method :has_blank_nodes?, :node?
 
     ##
+    # Checks statement equality as a quad.
+    #
     # @param  [Statement] other
     # @return [Boolean]
+    #
+    # @see RDF::URI#==
+    # @see RDF::Node#==
+    # @see RDF::Literal#==
+    # @see RDF::Query::Variable#==
     def eql?(other)
       other.is_a?(Statement) && self == other && (self.graph_name || false) == (other.graph_name || false)
     end
 
     ##
+    # Checks statement equality as a triple.
+    #
     # @param  [Object] other
     # @return [Boolean]
+    #
+    # @see RDF::URI#==
+    # @see RDF::Node#==
+    # @see RDF::Literal#==
+    # @see RDF::Query::Variable#==
     def ==(other)
-      to_a == Array(other)
+      to_a == Array(other) &&
+        !(other.is_a?(RDF::Value) && other.list?)
     end
 
     ##
+    # Checks statement equality with patterns.
+    #
+    # Uses `#eql?` to compare each of `#subject`, `#predicate`, `#object`, and
+    # `#graph_name` to those of `other`. Any statement part which is not
+    # present in `self` is ignored.
+    #
+    # @example
+    #   statement = RDF::Statement.new(RDF::URI('s'), RDF::URI('p'), RDF::URI('o'))
+    #   pattern   = RDF::Statement.new(RDF::URI('s'), RDF::URI('p'), RDF::Query::Variable.new)
+    #
+    #   # true
+    #   statement === statement
+    #   pattern   === statement
+    #   RDF::Statement.new(nil, nil, nil) === statement
+    #
+    #   # false
+    #   statement === pattern
+    #   statement === RDF::Statement.new(nil, nil, nil)
+    #
     # @param  [Statement] other
     # @return [Boolean]
+    #
+    # @see RDF::URI#eql?
+    # @see RDF::Node#eql?
+    # @see RDF::Literal#eql?
+    # @see RDF::Query::Variable#eql?
     def ===(other)
       return false if has_object?    && !object.eql?(other.object)
       return false if has_predicate? && !predicate.eql?(other.predicate)

data/lib/rdf/model/uri.rb

@@ -377,7 +377,7 @@ module RDF
       @object = {
         scheme: normalized_scheme,
         authority: normalized_authority,
-        path: normalized_path.sub(/\/+/, '/'),
+        path: normalized_path.squeeze('/'),
         query: normalized_query,
         fragment: normalized_fragment
       }
@@ -887,7 +887,7 @@ module RDF
     # Return normalized version of scheme, if any
     # @return [String]
     def normalized_scheme
-      scheme.strip.downcase if scheme
+      normalize_segment(scheme.strip, SCHEME, true) if scheme
     end
 
     ##
@@ -965,7 +965,7 @@ module RDF
     # @return [String]
     def normalized_host
       # Remove trailing '.' characters
-      normalize_segment(host, IHOST, true).sub(/\.*$/, '') if host
+      normalize_segment(host, IHOST, true).chomp('.') if host
     end
 
     ##
@@ -1059,7 +1059,7 @@ module RDF
 
       res = self.class.normalize_path(norm_segs.join("/"))
       # Special rules for specific protocols having empty paths
-      res.empty? ? (%w(http https ftp tftp).include?(normalized_scheme) ? '/' : "") : res
+      normalize_segment(res.empty? ? (%w(http https ftp tftp).include?(normalized_scheme) ? '/' : "") : res, IHIER_PART)
     end
 
     ##
@@ -1134,9 +1134,9 @@ module RDF
     # @return [String]
     def normalized_authority
       if authority
-        (userinfo ? "#{normalized_userinfo}@" : "") +
+        (userinfo ? normalized_userinfo.to_s + "@" : "") +
         normalized_host.to_s +
-        (normalized_port ? ":#{normalized_port}" : "")
+        (normalized_port ? ":" + normalized_port.to_s : "")
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header