rosemary 0.3.7 → 0.3.8

data/lib/rosemary/element.rb

@@ -2,6 +2,7 @@ module Rosemary
   # This is a virtual parent class for the OSM objects Node, Way and Relation.
   class Element
     include ActiveModel::Validations
+    include Comparable
 
     # Unique ID
     # @return [Fixnum] id of this element
@@ -55,6 +56,19 @@ module Rosemary
       add_tags(attrs['tag']) if attrs['tag']
     end
 
+    def <=>(another_element)
+      attribute_list.each do |attrib|
+        next if self.send(attrib) == another_element.send(attrib)
+
+        if self.send(attrib) < another_element.send(attrib)
+          return -1
+        else
+          return 1
+        end
+      end
+      0
+    end
+
     # Create an error when somebody tries to set the ID.
     # (We need this here because otherwise method_missing will be called.)
     def id=(id) # :nodoc:
@@ -69,7 +83,7 @@ module Rosemary
 
     # The list of attributes for this object
     def attribute_list # :nodoc:
-      [:id, :version, :uid, :user, :timestamp, :tags]
+      [:id, :version, :uid, :user, :timestamp, :changeset, :tags]
     end
 
     # Returns a hash of all non-nil attributes of this object.

data/lib/rosemary/node.rb

@@ -48,5 +48,18 @@ module Rosemary
       end
     end
 
+    def <=>(another_node)
+      parent_compare = super(another_node)
+      # 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
+
+      0
+    end
+
+
   end
 end

data/lib/rosemary/relation.rb

@@ -39,6 +39,23 @@ module Rosemary
       end
     end
 
+    def <=>(another_relation)
+      parent_compare = super(another_relation)
+      # don't bother to compare more stuff if parent comparison failed
+      return parent_compare unless parent_compare == 0
+
+      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
+
+
     protected
 
     def extract_member(member_array)

data/lib/rosemary/version.rb

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

data/lib/rosemary/way.rb

@@ -84,5 +84,21 @@ module Rosemary
         end
       end
     end
+
+    def <=>(another_way)
+      parent_compare = super(another_way)
+      # don't bother to compare more stuff if parent comparison failed
+      return parent_compare unless parent_compare == 0
+
+      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
 end

data/rosemary.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Bünte, Enno Brehm"]
-  s.date = "2012-03-22"
+  s.date = Time.now
   s.description = "OpenStreetMap API client for ruby"
   s.email = ["info@christophbuente.de"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md"]

data/spec/models/node_spec.rb

@@ -113,4 +113,56 @@ describe Node do
     subject.name = " Allice and Bob "
     subject.to_xml.should match "\"Allice and Bob\""
   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.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.tags[:name] = 'Black horse'
+    first_node.should == second_node
+  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.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.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.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.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.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.should_not == second_node
+  end
+
+  it "should not be equal when tags do not match" do
+    first_node = Way.new('id' => 123)
+    first_node.tags[:name] = 'black horse'
+    second_node = Way.new('id' => 123)
+    second_node.tags[:name] = 'white horse'
+    first_node.should_not == second_node
+  end
 end

data/spec/models/relation_spec.rb

@@ -23,4 +23,66 @@ describe Relation do
     subject.members.size.should eql 2
   end
 
+  it "should compare identity depending on tags and attributes" do
+    first_relation = Relation.new('id' => 123, 'changeset' => '123', 'version' => 1, 'user' => 'horst', 'uid' => '123', 'timestamp' => '2005-07-30T14:27:12+01:00')
+    first_relation.tags[:name] = 'Black horse'
+    second_relation = Relation.new('id' => 123, 'changeset' => '123', 'version' => 1, 'user' => 'horst', 'uid' => '123', 'timestamp' => '2005-07-30T14:27:12+01:00')
+    second_relation.tags[:name] = 'Black horse'
+    first_relation.should == second_relation
+  end
+
+  it "should not be equal when id does not match" do
+    first_relation = Relation.new('id' => 123)
+    second_relation = Relation.new('id' => 234)
+    first_relation.should_not == second_relation
+  end
+
+  it "should not be equal when changeset does not match" do
+    first_relation = Relation.new('changeset' => 123)
+    second_relation = Relation.new('changeset' => 234)
+    first_relation.should_not == second_relation
+  end
+
+  it "should not be equal when version does not match" do
+    first_relation = Relation.new('version' => 1)
+    second_relation = Relation.new('version' => 2)
+    first_relation.should_not == second_relation
+  end
+
+  it "should not be equal when user does not match" do
+    first_relation = Relation.new('user' => 'horst')
+    second_relation = Relation.new('user' => 'jack')
+    first_relation.should_not == second_relation
+  end
+
+  it "should not be equal when uid does not match" do
+    first_relation = Relation.new('uid' => 123)
+    second_relation = Relation.new('uid' => 234)
+    first_relation.should_not == second_relation
+  end
+
+  it "should not be equal when timestamp does not match" do
+    first_relation = Relation.new('timestamp' => '2005-07-30T14:27:12+01:00')
+    second_relation = Relation.new('timestamp' => '2006-07-30T14:27:12+01:00')
+    first_relation.should_not == second_relation
+  end
+
+  it "should not be equal when members do not match" do
+    first_relation = Relation.new('id' => 123)
+    first_relation.members << 1
+    first_relation.members << 2
+    second_relation = Relation.new('id' => 123)
+    second_relation.members << 1
+    second_relation.members << 3
+    first_relation.should_not == second_relation
+  end
+
+  it "should not be equal when tags do not match" do
+    first_relation = Relation.new('id' => 123)
+    first_relation.tags[:name] = 'black horse'
+    second_relation = Relation.new('id' => 123)
+    second_relation.tags[:name] = 'white horse'
+    first_relation.should_not == second_relation
+  end
+
 end

data/spec/models/way_spec.rb

@@ -87,4 +87,66 @@ describe Way do
     subject.add_tags(:wheelchair => '')
     subject.to_xml.should_not match /k=\"wheelchair\"/
   end
+
+  it "should compare identity depending on tags and attributes" do
+    first_way = Way.new('id' => 123, 'changeset' => '123', 'version' => 1, 'user' => 'horst', 'uid' => '123', 'timestamp' => '2005-07-30T14:27:12+01:00')
+    first_way.tags[:name] = 'Black horse'
+    second_way = Way.new('id' => 123, 'changeset' => '123', 'version' => 1, 'user' => 'horst', 'uid' => '123', 'timestamp' => '2005-07-30T14:27:12+01:00')
+    second_way.tags[:name] = 'Black horse'
+    first_way.should == second_way
+  end
+
+  it "should not be equal when id does not match" do
+    first_way = Way.new('id' => 123)
+    second_way = Way.new('id' => 234)
+    first_way.should_not == second_way
+  end
+
+  it "should not be equal when changeset does not match" do
+    first_way = Way.new('changeset' => 123)
+    second_way = Way.new('changeset' => 234)
+    first_way.should_not == second_way
+  end
+
+  it "should not be equal when version does not match" do
+    first_way = Way.new('version' => 1)
+    second_way = Way.new('version' => 2)
+    first_way.should_not == second_way
+  end
+
+  it "should not be equal when user does not match" do
+    first_way = Way.new('user' => 'horst')
+    second_way = Way.new('user' => 'jack')
+    first_way.should_not == second_way
+  end
+
+  it "should not be equal when uid does not match" do
+    first_way = Way.new('uid' => 123)
+    second_way = Way.new('uid' => 234)
+    first_way.should_not == second_way
+  end
+
+  it "should not be equal when timestamp does not match" do
+    first_way = Way.new('timestamp' => '2005-07-30T14:27:12+01:00')
+    second_way = Way.new('timestamp' => '2006-07-30T14:27:12+01:00')
+    first_way.should_not == second_way
+  end
+
+  it "should not be equal when nodes do not match" do
+    first_way = Way.new('id' => 123)
+    first_way.nodes << 1
+    first_way.nodes << 2
+    second_way = Way.new('id' => 123)
+    second_way.nodes << 1
+    second_way.nodes << 3
+    first_way.should_not == second_way
+  end
+
+  it "should not be equal when tags do not match" do
+    first_way = Way.new('id' => 123)
+    first_way.tags[:name] = 'black horse'
+    second_way = Way.new('id' => 123)
+    second_way.tags[:name] = 'white horse'
+    first_way.should_not == second_way
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -321215509293511542
+      hash: -3489737723584128145
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: