rosemary 0.4.1 → 0.4.2

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p448
+1.9.3-p547

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+
+before_install:
+  - sudo apt-get install libxml2-dev
+
 rvm:
   - 1.9.3
   - 2.0.0

data/lib/rosemary/api.rb

@@ -73,8 +73,8 @@ module Rosemary
     #
     # call-seq: find_or_create_open_changeset(id, comment) -> Rosemary::Changeset
     #
-    def find_or_create_open_changeset(id, comment = nil)
-      find_open_changeset(id) || create_changeset(comment)
+    def find_or_create_open_changeset(id, comment = nil, tags = {})
+      find_open_changeset(id) || create_changeset(comment, tags)
     end
 
     def find_open_changeset(id)
@@ -150,8 +150,9 @@ module Rosemary
     # @param [String] comment a meaningful comment for this changeset
     # @return [Rosemary::Changeset] the changeset which was newly created
     # @raise [Rosemary::NotFound] in case the changeset could not be found
-    def create_changeset(comment = nil)
-      changeset = Changeset.new(:tags => { :comment => comment })
+    def create_changeset(comment = nil, tags = {})
+      tags.merge!(:comment => comment) { |key, v1, v2| v1 }
+      changeset = Changeset.new(:tags => tags)
       changeset_id = put("/changeset/create", :body => changeset.to_xml).to_i
       find_changeset(changeset_id) unless changeset_id == 0
     end

data/lib/rosemary/version.rb

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

data/spec/integration/changeset_spec.rb

@@ -78,13 +78,13 @@ describe Changeset do
       stubbed_request.to_return(:status => 200, :body => single_changeset, :headers => {'Content-Type' => 'application/xml'})
       changeset = osm.find_changeset(10)
       assert_requested :get, request_url, :times => 1
-      changeset.class.should eql Changeset
+      expect(changeset.class).to eql Changeset
     end
 
     it "should raise an NotFound error, when a changeset cannot be found" do
       stubbed_request.to_return(:status => 404, :body => '', :headers => {'Content-Type' => 'text/plain'})
       node = osm.find_changeset(10)
-      node.should be_nil
+      expect(node).to be_nil
     end
   end
 
@@ -102,30 +102,35 @@ describe Changeset do
       body = Changeset.new(:tags => { :comment => 'New changeset' }).to_xml
 
       stub_create_request.with(:body => body).to_return(:status => 200, :body => "3", :headers => {'Content-Type' => 'plain/text'})
-      auth_osm.should_receive(:find_changeset).with(3).and_return(cs = double())
-      auth_osm.create_changeset('New changeset').should == cs
+      expect(auth_osm).to receive(:find_changeset).with(3).and_return(cs = double())
+      expect(auth_osm.create_changeset('New changeset')).to eql cs
     end
   end
 
   describe "#find_or_create_open_changeset" do
     it "returns an exisiting changeset if that exists and is open" do
-      auth_osm.should_receive(:find_changeset).with(3).and_return(cs = double(:open? => true))
-      auth_osm.should_not_receive(:create_changeset)
-      auth_osm.find_or_create_open_changeset(3, "some foo comment").should == cs
+      expect(auth_osm).to receive(:find_changeset).with(3).and_return(cs = double(:open? => true))
+      expect(auth_osm).not_to receive(:create_changeset)
+      expect(auth_osm.find_or_create_open_changeset(3, "some foo comment")).to eql cs
     end
 
     it "returns an new changeset if the requested one exists and is closed" do
-      auth_osm.should_receive(:find_changeset).with(3).and_return(double(:open? => false))
-      auth_osm.should_receive(:create_changeset).with("some foo comment").and_return(cs = double())
-      auth_osm.find_or_create_open_changeset(3, "some foo comment").should == cs
+      expect(auth_osm).to receive(:find_changeset).with(3).and_return(double(:open? => false))
+      expect(auth_osm).to receive(:create_changeset).with("some foo comment", {}).and_return(cs = double())
+      expect(auth_osm.find_or_create_open_changeset(3, "some foo comment")).to eql cs
     end
 
     it "returns an new changeset if the requested one doesn't exist" do
-      auth_osm.should_receive(:find_changeset).with(3).and_return(nil)
-      auth_osm.should_receive(:create_changeset).with("some foo comment").and_return(cs = double())
-      auth_osm.find_or_create_open_changeset(3, "some foo comment").should == cs
+      expect(auth_osm).to receive(:find_changeset).with(3).and_return(nil)
+      expect(auth_osm).to receive(:create_changeset).with("some foo comment", {}).and_return(cs = double())
+      expect(auth_osm.find_or_create_open_changeset(3, "some foo comment")).to eql cs
     end
 
+    it "appends arbitrary tags to the changeset itself" do
+      expect(auth_osm).to receive(:find_changeset).with(3).and_return(nil)
+      expect(auth_osm).to receive(:create_changeset).with("some foo comment", :source => 'http://example.com' ).and_return(cs = double())
+      expect(auth_osm.find_or_create_open_changeset(3, "some foo comment", :source => 'http://example.com' )).to eql cs
+    end
   end
 
   describe '#find_for_user' do
@@ -145,21 +150,21 @@ describe Changeset do
     it "should not find changeset for user if user has none" do
       stubbed_request.to_return(:status => 200, :body => missing_changeset, :headers => {'Content-Type' => 'application/xml'})
       changesets = auth_osm.find_changesets_for_user
-      changesets.should be_empty
+      expect(changesets).to be_empty
     end
 
     it "should find a single changeset for user" do
       stubbed_request.to_return(:status => 200, :body => single_changeset, :headers => {'Content-Type' => 'application/xml'})
       changesets = auth_osm.find_changesets_for_user
-      changesets.size.should eql 1
-      changesets.first.class.should eql Changeset
+      expect(changesets.size).to eql 1
+      expect(changesets.first.class).to eql Changeset
     end
 
     it "should find a multiple changesets for a user" do
       stubbed_request.to_return(:status => 200, :body => multiple_changeset, :headers => {'Content-Type' => 'application/xml'})
       changesets = auth_osm.find_changesets_for_user
-      changesets.size.should eql 2
-      changesets.first.class.should eql Changeset
+      expect(changesets.size).to eql 2
+      expect(changesets.first.class).to eql Changeset
     end
   end
 

data/spec/integration/node_spec.rb

@@ -72,32 +72,32 @@ describe Node do
       stubbed_request.to_return(:status => 200, :body => valid_fake_node, :headers => {'Content-Type' => 'application/xml'})
       node = osm.find_node 1234
       assert_requested :get, request_url, :times => 1
-      node.class.should eql Node
-      node.tags.size.should eql 3
-      node.tags['name'].should eql 'The rose'
-      node['name'].should eql 'The rose'
+      expect(node.class).to eql Node
+      expect(node.tags.size).to eql 3
+      expect(node.tags['name']).to eql 'The rose'
+      expect(node['name']).to eql 'The rose'
       node.add_tags('wheelchair' => 'yes')
-      node['wheelchair'].should eql 'yes'
+      expect(node['wheelchair']).to eql 'yes'
     end
 
     it "should raise a Unavailable, when api times out" do
       stubbed_request.to_timeout
-      lambda {
+      expect {
         node = osm.find_node(1234)
-      }.should raise_error(Unavailable)
+      }.to raise_exception(Unavailable)
     end
 
     it "should raise an Gone error, when a node has been deleted" do
       stubbed_request.to_return(:status => 410, :body => '', :headers => {'Content-Type' => 'text/plain'})
-      lambda {
+      expect {
         node = osm.find_node(1234)
-      }.should raise_error(Gone)
+      }.to raise_exception(Gone)
     end
 
     it "should raise an NotFound error, when a node cannot be found" do
       stubbed_request.to_return(:status => 404, :body => '', :headers => {'Content-Type' => 'text/plain'})
       node = osm.find_node(1234)
-      node.should be_nil
+      expect(node).to be_nil
     end
   end
 
@@ -142,37 +142,37 @@ describe Node do
 
       it "should raise a Unavailable, when api times out" do
         stubbed_request.to_timeout
-        lambda {
+        expect {
           new_id = osm.create(node, changeset)
-        }.should raise_error(Unavailable)
+        }.to raise_exception(Unavailable)
       end
 
       it "should not create a Node with invalid xml but raise BadRequest" do
         stubbed_request.to_return(:status => 400, :body => 'The given node is invalid', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           new_id = osm.save(node, changeset)
-        }.should raise_error(BadRequest)
+        }.to raise_exception(BadRequest)
       end
 
       it "should not allow to create a node when a changeset has been closed" do
         stubbed_request.to_return(:status => 409, :body => 'The given node is invalid', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           new_id = osm.save(node, changeset)
-        }.should raise_error(Conflict)
+        }.to raise_exception(Conflict)
       end
 
       it "should not allow to create a node when no authentication client is given" do
         osm = Api.new
-        lambda {
+        expect {
           osm.save(node, changeset)
-        }.should raise_error(CredentialsMissing)
+        }.to raise_exception(CredentialsMissing)
       end
 
       it "should set a changeset" do
         stubbed_request.to_return(:status => 200, :body => '123', :headers => {'Content-Type' => 'text/plain'})
         node.changeset = nil
         osm.save(node, changeset)
-        node.changeset.should == changeset.id
+        expect(node.changeset).to eql changeset.id
       end
     end
 
@@ -191,16 +191,16 @@ describe Node do
         stub_request(:put, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 200, :body => '43', :headers => {'Content-Type' => 'text/plain'})
         node.tags['amenity'] = 'restaurant'
         node.tags['name'] = 'Il Tramonto'
-        node.should_receive(:changeset=)
+        expect(node).to receive(:changeset=)
         new_version = osm.save(node, changeset)
-        new_version.should eql 43
+        expect(new_version).to eql 43
       end
 
       it "should set a changeset" do
         stub_request(:put, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 200, :body => '43', :headers => {'Content-Type' => 'text/plain'})
         node.changeset = nil
         osm.save(node, changeset)
-        node.changeset.should == changeset.id
+        expect(node.changeset).to eql changeset.id
       end
 
 
@@ -225,56 +225,56 @@ describe Node do
 
       it "should delete an existing node" do
         stub_request(:delete, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 200, :body => '43', :headers => {'Content-Type' => 'text/plain'})
-        node.should_receive(:changeset=)
+        expect(node).to receive(:changeset=)
         new_version = osm.destroy(node, changeset)
-        new_version.should eql 43 # new version number
+        expect(new_version).to eql 43 # new version number
       end
 
       it "should raise an error if node to be deleted is still part of a way" do
         stub_request(:delete, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 400, :body => 'Version does not match current database version', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           response = osm.destroy(node, changeset)
-          response.should eql "Version does not match current database version"
-        }.should raise_error BadRequest
+          expect(response).to eql "Version does not match current database version"
+        }.to raise_exception BadRequest
       end
 
       it "should raise an error if node cannot be found" do
         stub_request(:delete, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 404, :body => 'Node cannot be found', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           response = osm.destroy(node, changeset)
-          response.should eql "Node cannot be found"
-        }.should raise_error NotFound
+          expect(response).to eql "Node cannot be found"
+        }.to raise_exception NotFound
       end
 
       it "should raise an error if there is a conflict" do
         stub_request(:delete, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 409, :body => 'Node has been deleted in this changeset', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           response = osm.destroy(node, changeset)
-          response.should eql "Node has been deleted in this changeset"
-        }.should raise_error Conflict
+          expect(response).to eql "Node has been deleted in this changeset"
+        }.to raise_exception Conflict
       end
 
       it "should raise an error if the node is already delted" do
         stub_request(:delete, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 410, :body => 'Node has been deleted', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           response = osm.destroy(node, changeset)
-          response.should eql "Node has been deleted"
-        }.should raise_error Gone
+          expect(response).to eql "Node has been deleted"
+        }.to raise_exception Gone
       end
 
       it "should raise an error if the node is part of a way" do
         stub_request(:delete, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 412, :body => 'Node 123 is still used by way 456', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           response = osm.destroy(node, changeset)
-          response.should eql "Node 123 is still used by way 456"
-        }.should raise_error Precondition
+          expect(response).to eql "Node 123 is still used by way 456"
+        }.to raise_exception Precondition
       end
 
       it "should set the changeset an existing node" do
         stub_request(:delete, "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/123").to_return(:status => 200, :body => '43', :headers => {'Content-Type' => 'text/plain'})
         node.changeset = nil
         new_version = osm.destroy(node, changeset)
-        node.changeset.should == changeset.id
+        expect(node.changeset).to eql changeset.id
       end
     end
   end
@@ -324,37 +324,37 @@ describe Node do
 
       it "should create a new Node from given attributes" do
         stubbed_request.to_return(:status => 200, :body => '123', :headers => {'Content-Type' => 'text/plain'})
-        node.id.should be_nil
+        expect(node.id).to be_nil
         new_id = osm.save(node, changeset)
       end
 
       it "should raise a Unavailable, when api times out" do
         stubbed_request.to_timeout
-        lambda {
+        expect {
           new_id = osm.save(node, changeset)
-        }.should raise_error(Unavailable)
+        }.to raise_exception(Unavailable)
       end
 
 
       it "should not create a Node with invalid xml but raise BadRequest" do
         stubbed_request.to_return(:status => 400, :body => 'The given node is invalid', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           new_id = osm.save(node, changeset)
-        }.should raise_error(BadRequest)
+        }.to raise_exception(BadRequest)
       end
 
       it "should not allow to create a node when a changeset has been closed" do
         stubbed_request.to_return(:status => 409, :body => 'The given node is invalid', :headers => {'Content-Type' => 'text/plain'})
-        lambda {
+        expect {
           new_id = osm.save(node, changeset)
-        }.should raise_error(Conflict)
+        }.to raise_exception(Conflict)
       end
 
       it "should not allow to create a node when no authentication client is given" do
         osm = Api.new
-        lambda {
+        expect {
           osm.save(node, changeset)
-        }.should raise_error(CredentialsMissing)
+        }.to raise_exception(CredentialsMissing)
       end
 
     end
@@ -375,9 +375,9 @@ describe Node do
         stub_request(:put, "http://www.openstreetmap.org/api/0.6/node/123").to_return(:status => 200, :body => '43', :headers => {'Content-Type' => 'text/plain'})
         node.tags['amenity'] = 'restaurant'
         node.tags['name'] = 'Il Tramonto'
-        node.should_receive(:changeset=)
+        expect(node).to receive(:changeset=)
         new_version = osm.save(node, changeset)
-        new_version.should eql 43
+        expect(new_version).to eql 43
       end
     end
 
@@ -395,11 +395,11 @@ describe Node do
 
       it "should delete an existing node" do
         stub_request(:delete, "http://www.openstreetmap.org/api/0.6/node/123").to_return(:status => 200, :body => '43', :headers => {'Content-Type' => 'text/plain'})
-        node.should_receive(:changeset=)
-        lambda {
+        expect(node).to receive(:changeset=)
+        expect {
           # Delete is not implemented using oauth
           new_version = osm.destroy(node, changeset)
-        }.should raise_error(NotImplemented)
+        }.to raise_exception(NotImplemented)
       end
     end
   end

data/spec/integration/note_spec.rb

@@ -59,12 +59,12 @@ describe Note do
           to_return(:status => 200, :body => valid_fake_note, :headers => {'Content-Type' => 'application/xml'})
 
         new_note = osm.create_note(valid_note)
-        new_note.id.should eql '174576'
-        new_note.lon.should eql '102.2205'
-        new_note.lat.should eql '2.1059'
-        new_note.text.should eql 'Test note'
-        new_note.user.should eql 'osmthis'
-        new_note.action.should eql 'opened'
+        expect(new_note.id).to eql '174576'
+        expect(new_note.lon).to eql '102.2205'
+        expect(new_note.lat).to eql '2.1059'
+        expect(new_note.text).to eql 'Test note'
+        expect(new_note.user).to eql 'osmthis'
+        expect(new_note.action).to eql 'opened'
       end
     end
 

data/spec/integration/user_spec.rb

@@ -47,14 +47,14 @@ describe User do
     it "should build a User from API response via find_user" do
       stub_request(:get, "http://www.openstreetmap.org/api/0.6/user/details").to_return(:status => 200, :body => valid_fake_user, :headers => {'Content-Type' => 'application/xml'})
       user = osm.find_user
-      user.class.should eql User
+      expect(user.class).to eql User
     end
 
     it "should raise error from api" do
       stub_request(:get, "http://www.openstreetmap.org/api/0.6/user/details").to_return(:status => 403, :body => "OAuth token doesn't have that capability.", :headers => {'Content-Type' => 'plain/text'})
-      lambda {
+      expect {
         osm.find_user
-      }.should raise_error Forbidden
+      }.to raise_exception Forbidden
     end
   end
 end

data/spec/integration/way_spec.rb

@@ -36,8 +36,8 @@ describe Way do
     it "should build a Way from API response via get_way" do
       stub_request(:get, "http://www.openstreetmap.org/api/0.6/way/1234").to_return(:status => 200, :body => valid_fake_way, :headers => {'Content-Type' => 'application/xml'})
       way = osm.find_way(1234)
-      way.class.should eql Way
-      way.nodes.should include(15735246)
+      expect(way.class).to eql Way
+      expect(way.nodes).to include(15735246)
     end
   end
 

data/spec/models/changeset_spec.rb

@@ -20,43 +20,43 @@ describe Changeset do
     subject { changeset }
 
     it "should have an id attribute set from attributes" do
-      subject.id.should eql(123)
+      expect(subject.id).to eql(123)
     end
 
     it "should have a user attributes set from attributes" do
-      subject.user.should eql("fred")
+      expect(subject.user).to eql("fred")
     end
 
     it "should have an uid attribute set from attributes" do
-      subject.uid.should eql(123)
+      expect(subject.uid).to eql(123)
     end
 
     it "should have a changeset attributes set from attributes" do
-      subject.should be_open
+      expect(subject).to be_open
     end
 
     it "should have a min_lat attribute set from attributes" do
-      subject.min_lat.should eql(52.2)
+      expect(subject.min_lat).to eql(52.2)
     end
 
     it "should have a min_lon attribute set from attributes" do
-      subject.min_lon.should eql(13.4)
+      expect(subject.min_lon).to eql(13.4)
     end
 
     it "should have a max_lat attribute set from attributes" do
-      subject.max_lat.should eql(52.3)
+      expect(subject.max_lat).to eql(52.3)
     end
 
     it "should have a max_lon attribute set from attributes" do
-      subject.max_lon.should eql(13.5)
+      expect(subject.max_lon).to eql(13.5)
     end
 
     it "should have a created_at attribute set from attributes" do
-      subject.created_at.should eql Time.parse('2008-11-08T19:07:39+01:00')
+      expect(subject.created_at).to eql Time.parse('2008-11-08T19:07:39+01:00')
     end
 
     it "should have a comment attribute set from attributes" do
-      subject.tags['comment'].should eql 'A bloody comment'
+      expect(subject.tags['comment']).to eql 'A bloody comment'
     end
   end
 
@@ -65,43 +65,43 @@ describe Changeset do
     subject { changeset.to_xml }
 
     it "should have an id attribute within xml representation" do
-      subject.should have_xml "//changeset[@id='123']"
+      expect(subject).to have_xml "//changeset[@id='123']"
     end
 
     it "should have a user attribute within xml representation" do
-      subject.should have_xml "//changeset[@user='fred']"
+      expect(subject).to have_xml "//changeset[@user='fred']"
     end
 
     it "should have an uid attribute within xml representation" do
-      subject.should have_xml "//changeset[@uid='123']"
+      expect(subject).to have_xml "//changeset[@uid='123']"
     end
 
     it "should have an open attribute within xml representation" do
-      subject.should have_xml "//changeset[@open='true']"
+      expect(subject).to have_xml "//changeset[@open='true']"
     end
 
     it "should have a min_lat attribute within xml representation" do
-      subject.should have_xml "//changeset[@min_lat='52.2']"
+      expect(subject).to have_xml "//changeset[@min_lat='52.2']"
     end
 
     it "should have a min_lon attribute within xml representation" do
-      subject.should have_xml "//changeset[@min_lon='13.4']"
+      expect(subject).to have_xml "//changeset[@min_lon='13.4']"
     end
 
     it "should have a max_lat attribute within xml representation" do
-      subject.should have_xml "//changeset[@max_lat='52.3']"
+      expect(subject).to have_xml "//changeset[@max_lat='52.3']"
     end
 
     it "should have a max_lon attribute within xml representation" do
-      subject.should have_xml "//changeset[@max_lon='13.5']"
+      expect(subject).to have_xml "//changeset[@max_lon='13.5']"
     end
 
     it "should have a created_at attribute within xml representation" do
-      subject.should have_xml "//changeset[@created_at=\'#{Time.parse('2008-11-08T19:07:39+01:00')}\']"
+      expect(subject).to have_xml "//changeset[@created_at=\'#{Time.parse('2008-11-08T19:07:39+01:00')}\']"
     end
 
     it "should have a comment tag within xml representation" do
-      subject.should have_xml "//tag[@k='comment'][@v='A bloody comment']"
+      expect(subject).to have_xml "//tag[@k='comment'][@v='A bloody comment']"
     end
 
   end

data/spec/models/node_spec.rb

@@ -19,99 +19,99 @@ describe Node do
   it "should be invalid without lat, lon" do
     subject.lat = nil
     subject.lon = nil
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
   end
 
   it "does not modify the hash passed into constructor" do
     h = { :lat => 13.9, :lon => 54.1 }.freeze
-    lambda { Node.new(h) }.should_not raise_error
+    expect { Node.new(h) }.not_to raise_exception
   end
 
   it "should not be valid when using to large lat value" do
     subject.lat = 181
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
   end
 
   it "should not be valid when using to large lat value" do
     subject.lon = 91
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
   end
 
   it "should have an id attribute set from attributes" do
-    subject.id.should eql(123)
+    expect(subject.id).to eql(123)
   end
 
   it "should have an id attribute within xml representation" do
-    subject.to_xml.should match /id=\"123\"/
+    expect(subject.to_xml).to match /id=\"123\"/
   end
 
   it "should have a lat attribute set from attributes" do
-    subject.lat.should eql(52.2)
+    expect(subject.lat).to eql(52.2)
   end
 
   it "should have a lat attribute within xml representation" do
-    subject.to_xml.should match /lat=\"52.2\"/
+    expect(subject.to_xml).to match /lat=\"52.2\"/
   end
 
   it "should have a lon attribute set from attributes" do
-    subject.lon.should eql(13.4)
+    expect(subject.lon).to eql(13.4)
   end
 
   it "should have a lon attribute within xml representation" do
-    subject.to_xml.should match /lon=\"13.4\"/
+    expect(subject.to_xml).to match /lon=\"13.4\"/
   end
 
   it "should have a user attributes set from attributes" do
-    subject.user.should eql("fred")
+    expect(subject.user).to eql("fred")
   end
 
   it "should have a user attribute within xml representation" do
-    subject.to_xml.should match /user=\"fred\"/
+    expect(subject.to_xml).to match /user=\"fred\"/
   end
 
   it "should have a changeset attributes set from attributes" do
-    subject.changeset.should eql(12)
+    expect(subject.changeset).to eql(12)
   end
 
   it "should have a changeset attribute within xml representation" do
-    subject.to_xml.should match /changeset=\"12\"/
+    expect(subject.to_xml).to match /changeset=\"12\"/
   end
 
   it "should have a uid attribute set from attributes" do
-    subject.uid.should eql(123)
+    expect(subject.uid).to eql(123)
   end
 
   it "should have a uid attribute within xml representation" do
-    subject.to_xml.should match /uid=\"123\"/
+    expect(subject.to_xml).to match /uid=\"123\"/
   end
 
   it "should have a version attribute for osm tag" do
-    subject.to_xml.should match /version=\"0.6\"/
+    expect(subject.to_xml).to match /version=\"0.6\"/
   end
 
   it "should have a generator attribute for osm tag" do
-    subject.to_xml.should match /generator=\"rosemary v/
+    expect(subject.to_xml).to match /generator=\"rosemary v/
   end
 
   it "should produce xml" do
     subject.add_tags(:wheelchair => 'yes')
-    subject.to_xml.should match /k=\"wheelchair\"/
-    subject.to_xml.should match /v=\"yes\"/
+    expect(subject.to_xml).to match /k=\"wheelchair\"/
+    expect(subject.to_xml).to match /v=\"yes\"/
   end
 
   it "should not add tags with empty value to xml" do
     subject.add_tags(:wheelchair => '')
-    subject.to_xml.should_not match /k=\"wheelchair\"/
+    expect(subject.to_xml).not_to match /k=\"wheelchair\"/
   end
 
   it "should properly escape ampersands" do
     subject.name = "foo & bar"
-    subject.to_xml.should match "foo & bar"
+    expect(subject.to_xml).to match "foo & bar"
   end
 
   it "should properly strip leading and trailing whitespace" do
     subject.name = " Allice and Bob "
-    subject.to_xml.should match "\"Allice and Bob\""
+    expect(subject.to_xml).to match "\"Allice and Bob\""
   end
 
   it "should compare identity depending on tags and attributes" do
@@ -119,43 +119,43 @@ describe Node do
     first_node.tags[:name] = 'Black horse'
     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 <=> second_node).should == 0
+    expect(first_node <=> second_node).to eql 0
   end
 
   it "should not be equal when id does not match" do
     first_node = Node.new('id' => 123)
     second_node = Node.new('id' => 234)
-    first_node.should_not == second_node
+    expect(first_node).not_to eql second_node
   end
 
   it "should not be equal when changeset does not match" do
     first_node = Node.new('changeset' => 123)
     second_node = Node.new('changeset' => 234)
-    first_node.should_not == second_node
+    expect(first_node).not_to eql second_node
   end
 
   it "should not be equal when version does not match" do
     first_node = Node.new('version' => 1)
     second_node = Node.new('version' => 2)
-    first_node.should_not == second_node
+    expect(first_node).not_to eql second_node
   end
 
   it "should not be equal when user does not match" do
     first_node = Node.new('user' => 'horst')
     second_node = Node.new('user' => 'jack')
-    first_node.should_not == second_node
+    expect(first_node).not_to eql second_node
   end
 
   it "should not be equal when uid does not match" do
     first_node = Node.new('uid' => 123)
     second_node = Node.new('uid' => 234)
-    first_node.should_not == second_node
+    expect(first_node).not_to eql second_node
   end
 
   it "should not be equal when timestamp does not match" do
     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
+    expect(first_node).not_to eql second_node
   end
 
   it "should not be equal when tags do not match" do
@@ -163,15 +163,15 @@ describe Node do
     first_node.tags[:name] = 'black horse'
     second_node = Node.new('id' => 123)
     second_node.tags[:name] = 'white horse'
-    first_node.should_not == second_node
+    expect(first_node).not_to eql second_node
   end
 
   it "should be ok to pass tags with emtpy value" do
-    lambda {
+    expect {
       subject.add_tags({"wheelchair_description"=>"", "type"=>"convenience",
         "street"=>nil, "name"=>"Kochhaus", "wheelchair"=>nil, "postcode"=>nil,
         "phone"=>nil, "city"=>nil, "website"=>nil, "lon"=>"13.35598468780518",
         "lat"=>"52.48627569798567", "housenumber"=>nil})
-    }.should_not raise_error
+    }.not_to raise_exception
   end
 end

data/spec/models/parser_spec.rb

@@ -15,7 +15,7 @@ describe Parser do
       EOF
 
       n = Parser.call(node_xml, :xml)
-      n.name.should == "The rose & the pony"
+      expect(n.name).to eql "The rose & the pony"
 
 
 
@@ -30,7 +30,7 @@ describe Parser do
       EOF
 
       permissions = Parser.call(permissions_xml, :xml)
-      permissions.raw.should be_empty
+      expect(permissions.raw).to be_empty
     end
 
     it "parses permissions" do
@@ -44,11 +44,11 @@ describe Parser do
       EOF
 
       permissions = Parser.call(permissions_xml, :xml)
-      permissions.raw.sort.should == %w(allow_read_prefs allow_write_api)
+      expect(permissions.raw.sort).to eql %w(allow_read_prefs allow_write_api)
 
-      permissions.allow_write_api?.should be_true
-      permissions.allow_read_prefs?.should be_true
-      permissions.allow_write_prefs?.should be_false
+      expect(permissions.allow_write_api?).to eql true
+      expect(permissions.allow_read_prefs?).to eql true
+      expect(permissions.allow_write_prefs?).to eql false
     end
   end
 

data/spec/models/relation_spec.rb

@@ -20,7 +20,7 @@ describe Relation do
   it { should be_valid }
 
   it "should have members" do
-    subject.members.size.should eql 2
+    expect(subject.members.size).to eql 2
   end
 
   it "should compare identity depending on tags and attributes" do
@@ -28,43 +28,43 @@ describe Relation do
     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
+    expect(first_relation == second_relation).to eql true
   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
+    expect(first_relation).not_to eql 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
+    expect(first_relation).not_to eql 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
+    expect(first_relation).not_to eql 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
+    expect(first_relation).not_to eql 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
+    expect(first_relation).not_to eql 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
+    expect(first_relation).not_to eql second_relation
   end
 
   it "should not be equal when members do not match" do
@@ -74,7 +74,7 @@ describe Relation do
     second_relation = Relation.new('id' => 123)
     second_relation.members << 1
     second_relation.members << 3
-    first_relation.should_not == second_relation
+    expect(first_relation).not_to eql second_relation
   end
 
   it "should not be equal when tags do not match" do
@@ -82,7 +82,7 @@ describe Relation do
     first_relation.tags[:name] = 'black horse'
     second_relation = Relation.new('id' => 123)
     second_relation.tags[:name] = 'white horse'
-    first_relation.should_not == second_relation
+    expect(first_relation).not_to eql second_relation
   end
 
 end

data/spec/models/way_spec.rb

@@ -27,65 +27,65 @@ describe Way do
     @way ||= Way.from_xml(valid_fake_way)
   end
 
-  it "should have 4 nodes" do
-    subject.nodes.size.should eql 11
-    subject.nodes.first.should eql 15735248
+  it "should have 11 nodes" do
+    expect(subject.nodes.size).to eql 11
+    expect(subject.nodes.first).to eql 15735248
   end
 
   it "should have node referenzes in xml representation" do
-    subject.to_xml.should match /ref=\"15735248\"/
+    expect(subject.to_xml).to match /ref=\"15735248\"/
   end
 
 
   it "should have an id attribute set from attributes" do
-    subject.id.should eql(1234)
+    expect(subject.id).to eql(1234)
   end
 
   it "should have an id attribute within xml representation" do
-    subject.to_xml.should match /id=\"1234\"/
+    expect(subject.to_xml).to match /id=\"1234\"/
   end
 
   it "should have a user attributes set from attributes" do
-    subject.user.should eql("fred")
+    expect(subject.user).to eql("fred")
   end
 
   it "should have a user attribute within xml representation" do
-    subject.to_xml.should match /user=\"fred\"/
+    expect(subject.to_xml).to match /user=\"fred\"/
   end
 
   it "should have a changeset attributes set from attributes" do
-    subject.changeset.should eql(12)
+    expect(subject.changeset).to eql(12)
   end
 
   it "should have a changeset attribute within xml representation" do
-    subject.to_xml.should match /changeset=\"12\"/
+    expect(subject.to_xml).to match /changeset=\"12\"/
   end
 
   it "should have a uid attribute set from attributes" do
-    subject.uid.should eql(123)
+    expect(subject.uid).to eql(123)
   end
 
   it "should have a uid attribute within xml representation" do
-    subject.to_xml.should match /uid=\"123\"/
+    expect(subject.to_xml).to match /uid=\"123\"/
   end
 
   it "should have a version attribute for osm tag" do
-    subject.to_xml.should match /version=\"0.6\"/
+    expect(subject.to_xml).to match /version=\"0.6\"/
   end
 
   it "should have a generator attribute for osm tag" do
-    subject.to_xml.should match /generator=\"rosemary v/
+    expect(subject.to_xml).to match /generator=\"rosemary v/
   end
 
   it "should produce xml" do
     subject.add_tags(:wheelchair => 'yes')
-    subject.to_xml.should match /k=\"wheelchair\"/
-    subject.to_xml.should match /v=\"yes\"/
+    expect(subject.to_xml).to match /k=\"wheelchair\"/
+    expect(subject.to_xml).to match /v=\"yes\"/
   end
 
   it "should not add tags with empty value to xml" do
     subject.add_tags(:wheelchair => '')
-    subject.to_xml.should_not match /k=\"wheelchair\"/
+    expect(subject.to_xml).not_to match /k=\"wheelchair\"/
   end
 
   it "should compare identity depending on tags and attributes" do
@@ -93,43 +93,43 @@ describe Way do
     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
+    expect(first_way == second_way).to eql true
   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
+    expect(first_way == second_way).not_to eql true
   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
+    expect(first_way == second_way).not_to eql true
   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
+    expect(first_way == second_way).not_to eql true
   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
+    expect(first_way == second_way).not_to eql true
   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
+    expect(first_way == second_way).not_to eql true
   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
+    expect(first_way == second_way).not_to eql true
   end
 
   it "should not be equal when nodes do not match" do
@@ -139,7 +139,7 @@ describe Way do
     second_way = Way.new('id' => 123)
     second_way.nodes << 1
     second_way.nodes << 3
-    first_way.should_not == second_way
+    expect(first_way == second_way).not_to eql true
   end
 
   it "should not be equal when tags do not match" do
@@ -147,6 +147,6 @@ describe Way do
     first_way.tags[:name] = 'black horse'
     second_way = Way.new('id' => 123)
     second_way.tags[:name] = 'white horse'
-    first_way.should_not == second_way
+    expect(first_way == second_way).not_to eql true
   end
 end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ RSpec::Matchers.define :have_xml do |xpath, text|
     parser = LibXML::XML::Parser.string body
     doc = parser.parse
     nodes = doc.find(xpath)
-    nodes.empty?.should be_false
+    expect(nodes).not_to be_empty
     if text
       nodes.each do |node|
         node.content.should == text
@@ -18,11 +18,11 @@ RSpec::Matchers.define :have_xml do |xpath, text|
     true
   end
 
-  failure_message_for_should do |body|
+  failure_message do |body|
     "expected to find xml tag #{xpath} in:\n#{body}"
   end
 
-  failure_message_for_should_not do |response|
+  failure_message_when_negated do |response|
     "expected not to find xml tag #{xpath} in:\n#{body}"
   end
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
+  prerelease: 
 platform: ruby
 authors:
 - Christoph Bünte, Enno Brehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -218,7 +241,6 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/sozialhelden/rosemary
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -230,18 +252,23 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1969309869700129610
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: rosemary
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: OpenStreetMap API client for ruby

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDI3NDY3ZWM5MTI0MTE3OTgzYTE2MWNlMWU2MTM1YWNiNjBiNDY3ZA==
-  data.tar.gz: !binary |-
-    ZWQyNmNlMWVmZTdjYmIyNDE0NmRhZmQ2ZGU5MjJhZDdhNDQwYTA2Yg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OTkxZjI5NjY3NzhkZGM1ZTM5NzhlYjJmYzFjZDhjNzkwZDgyNWIzYTY5ZTA1
-    ZTVhMjNjNTU3ZjMwYWNiZjY2MjczNjhkMmUzYWY2YzdmYWUwNzU5OTA3MjY1
-    YTZkYzhkMTkwZjRjZmMzZjJlZjc5YWVmMjQ0YzM3ZTllZDBmMjE=
-  data.tar.gz: !binary |-
-    MzBkZTViYTBkNjVlNzdmNzQ1YTkyNDdiMjNlNTgxNzU0YzM5Y2Q4OTk2Nzk4
-    ZDgwMjA5OTUwZDI2ZmNlOTUxNmU3NzI4ZWM1Y2FhNzBhOTFlZGY3M2Q0OWVi
-    NjQ1Mjg4ZTVjZDdhNTliZTk0MDZiYzAwMjlmZTg3OGFjMTI5YzY=