Release 2.0.2

Author: gkellogg

.travis.yml

@@ -6,10 +6,10 @@ env:
 rvm:
   - 2.0
   - 2.1
-  - 2.2.4
+  - 2.2.5
   - 2.3.1
-  - jruby-9.0.4.0
-  - rbx-2
+  - jruby-9.0.5.0
+  - rbx
 cache: bundler
 sudo: false
 addons:

VERSION

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

lib/rdf/model/list.rb

@@ -139,6 +139,13 @@ def valid?
     # @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 @@ def [](index)
     #     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 @@ def eql?(other)
     # @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
 
     ##

lib/rdf/model/statement.rb

@@ -135,7 +135,7 @@ def statement?
     #
     # @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 @@ def invalid?
     ##
     # @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 @@ def node?
     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)

lib/rdf/model/uri.rb

@@ -377,7 +377,7 @@ def canonicalize!
       @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 @@ def scheme=(value)
     # 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 @@ def host=(value)
     # @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 @@ def normalized_path
 
       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 @@ def authority=(value)
     # @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
 

spec/model_list_spec.rb

@@ -571,6 +571,10 @@
     it "returns 0 when given the same list" do
       expect(ten).to eq ten
     end
+
+    it "returns 0 when given the same list as array" do
+      expect(ten).to eq ten.to_a
+    end
   end
 
   describe "#==" do
@@ -585,6 +589,22 @@
     it "returns true when comparing a list to its contents" do
       expect(ten).to eq ten.to_a
     end
+
+    it "returns false when comparing to non-list Values" do
+      expect(ten).not_to eq ten.subject
+      expect(ten).not_to eq ten.statements.first
+      expect(ten).not_to eq RDF::Node.new
+      expect(ten).not_to eq RDF::Graph.new
+      expect(ten).not_to eq RDF::Literal.new('')
+      expect(ten).not_to eq Object.new
+    end
+
+    it "returns false when comparing to similar statements" do
+      statement      = RDF::Statement(:s, :p, :o)
+      quasistatement = RDF::List[:s, :p, :o]
+      
+      expect(quasistatement).not_to eq statement
+    end
   end
 
   describe "#empty?" do

spec/model_statement_spec.rb

@@ -207,6 +207,10 @@
       expect(subject).not_to equal RDF::Statement.new s, p, o
       expect(subject).to equal subject
     end
+
+    it "is not == a RDF::List" do
+      expect(subject).not_to eq RDF::List[*subject]
+    end
   end
 
   context "completness" do

spec/model_uri_spec.rb

@@ -477,6 +477,12 @@
       expect(u1.canonicalize!.to_s).to eq u2.to_s
       expect(u1).to eq u2
     end
+    it "#canonicalize does not fail with Encoding::CompatibilityError on weird IRIs" do
+      u1 = RDF::URI "htЫtp://user:passoЫd@exaЫmple.com:8080/path ПУТЬ?queЫry=valЫue#fragmeЫnt"
+      u2 = RDF::URI "ht%D0%ABtp://user:passoЫd@exaЫmple.com:8080/path%20ПУТЬ?queЫry=valЫue#fragmeЫnt"
+      expect(u1.canonicalize.to_s.dup.force_encoding(u2.to_s.encoding)).to eq u2.to_s
+      expect(u1).to eq u1
+    end
   end
 
   describe "#/" do