rosemary 0.3.8 → 0.3.9

data/lib/rosemary/node.rb

@@ -53,9 +53,7 @@ module Rosemary
       # don't bother to compare more stuff if parent comparison failed
       return parent_compare unless parent_compare == 0
 
-      tags_compare = self.send(:tags).sort <=> another_node.send(:tags).sort
-      # don't bother to compare more stuff if tags comparison failed
-      return tags_compare unless tags_compare == 0
+      return -1 if self.send(:tags) != another_node.send(:tags)
 
       0
     end

data/lib/rosemary/relation.rb

@@ -44,14 +44,12 @@ module Rosemary
       # don't bother to compare more stuff if parent comparison failed
       return parent_compare unless parent_compare == 0
 
+      return -1 if self.send(:tags) != another_relation.send(:tags)
+
       members_compare = self.send(:members).sort <=> another_relation.send(:members).sort
       # don't bother to compare more stuff if nodes comparison failed
       return members_compare unless members_compare == 0
 
-      tags_compare = self.send(:tags).sort <=> another_relation.send(:tags).sort
-      # don't bother to compare more stuff if tags comparison failed
-      return tags_compare unless tags_compare == 0
-
       0
     end
 

data/lib/rosemary/version.rb

@@ -1,4 +1,4 @@
 module Rosemary
   # The current version of this gem.
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/lib/rosemary/way.rb

@@ -90,14 +90,12 @@ module Rosemary
       # don't bother to compare more stuff if parent comparison failed
       return parent_compare unless parent_compare == 0
 
+      return -1 if self.send(:tags) != another_way.send(:tags)
+
       nodes_compare = self.send(:nodes).sort <=> another_way.send(:nodes).sort
       # don't bother to compare more stuff if nodes comparison failed
       return nodes_compare unless nodes_compare == 0
 
-      tags_compare = self.send(:tags).sort <=> another_way.send(:tags).sort
-      # don't bother to compare more stuff if tags comparison failed
-      return tags_compare unless tags_compare == 0
-
       0
     end
   end

data/spec/models/node_spec.rb

@@ -115,53 +115,53 @@ describe Node do
   end
 
   it "should compare identity depending on tags and attributes" do
-    first_node = Way.new('id' => 123, 'changeset' => '123', 'version' => 1, 'user' => 'horst', 'uid' => '123', 'timestamp' => '2005-07-30T14:27:12+01:00')
+    first_node = Node.new('id' => 123, 'changeset' => '123', 'version' => 1, 'user' => 'horst', 'uid' => '123', 'timestamp' => '2005-07-30T14:27:12+01:00')
     first_node.tags[:name] = 'Black horse'
-    second_node = Way.new('id' => 123, 'changeset' => '123', 'version' => 1, 'user' => 'horst', 'uid' => '123', 'timestamp' => '2005-07-30T14:27:12+01:00')
+    second_node = Node.new('id' => 123, 'changeset' => '123', 'version' => 1, 'user' => 'horst', 'uid' => '123', 'timestamp' => '2005-07-30T14:27:12+01:00')
     second_node.tags[:name] = 'Black horse'
-    first_node.should == second_node
+    (first_node <=> second_node).should == 0
   end
 
   it "should not be equal when id does not match" do
-    first_node = Way.new('id' => 123)
-    second_node = Way.new('id' => 234)
+    first_node = Node.new('id' => 123)
+    second_node = Node.new('id' => 234)
     first_node.should_not == second_node
   end
 
   it "should not be equal when changeset does not match" do
-    first_node = Way.new('changeset' => 123)
-    second_node = Way.new('changeset' => 234)
+    first_node = Node.new('changeset' => 123)
+    second_node = Node.new('changeset' => 234)
     first_node.should_not == second_node
   end
 
   it "should not be equal when version does not match" do
-    first_node = Way.new('version' => 1)
-    second_node = Way.new('version' => 2)
+    first_node = Node.new('version' => 1)
+    second_node = Node.new('version' => 2)
     first_node.should_not == second_node
   end
 
   it "should not be equal when user does not match" do
-    first_node = Way.new('user' => 'horst')
-    second_node = Way.new('user' => 'jack')
+    first_node = Node.new('user' => 'horst')
+    second_node = Node.new('user' => 'jack')
     first_node.should_not == second_node
   end
 
   it "should not be equal when uid does not match" do
-    first_node = Way.new('uid' => 123)
-    second_node = Way.new('uid' => 234)
+    first_node = Node.new('uid' => 123)
+    second_node = Node.new('uid' => 234)
     first_node.should_not == second_node
   end
 
   it "should not be equal when timestamp does not match" do
-    first_node = Way.new('timestamp' => '2005-07-30T14:27:12+01:00')
-    second_node = Way.new('timestamp' => '2006-07-30T14:27:12+01:00')
+    first_node = Node.new('timestamp' => '2005-07-30T14:27:12+01:00')
+    second_node = Node.new('timestamp' => '2006-07-30T14:27:12+01:00')
     first_node.should_not == second_node
   end
 
   it "should not be equal when tags do not match" do
-    first_node = Way.new('id' => 123)
+    first_node = Node.new('id' => 123)
     first_node.tags[:name] = 'black horse'
-    second_node = Way.new('id' => 123)
+    second_node = Node.new('id' => 123)
     second_node.tags[:name] = 'white horse'
     first_node.should_not == second_node
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3489737723584128145
+      hash: 4362026444618257339
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: