rosemary 0.2.8 → 0.3.0

data/lib/rosemary/api.rb

@@ -12,7 +12,6 @@ module Rosemary
   #   api.save(@node)
   class Api
     include HTTParty
-    include ChangesetCallbacks
     API_VERSION = "0.6".freeze
 
     # the default base URI for the API
@@ -31,10 +30,6 @@ module Rosemary
       @client = client
     end
 
-    def changeset!
-      @changeset ||= create_changeset
-    end
-
     # Get a Node with specified ID from API.
     #
     # call-seq: find_node(id) -> Rosemary::Node
@@ -67,6 +62,21 @@ module Rosemary
       find_element('changeset', id)
     end
 
+    # Get a Changeset with specified ID from API
+    # if that changeset is missing, id is nil, or the changeset is closed
+    # create a new one
+    #
+    # 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)
+    end
+
+    def find_open_changeset(id)
+      cs = find_changeset(id)
+      (cs && cs.open?) ? cs : nil
+    end
+
     # Get the user which represented by the Rosemary::Client
     #
     # call-seq: find_user -> Rosemary::User
@@ -79,8 +89,7 @@ module Rosemary
     end
 
     # Delete an element
-    def destroy(element)
-      raise ChangesetMissing unless changeset.open?
+    def destroy(element, changeset)
       element.changeset = changeset.id
       response = delete("/#{element.type.downcase}/#{element.id}", :body => element.to_xml) unless element.id.nil?
       response.to_i # New version number
@@ -88,34 +97,32 @@ module Rosemary
 
     # Saves an element to the API.
     # If it has no id yet, the element will be created, otherwise updated.
-    def save(element)
+    def save(element, changeset)
       response = if element.id.nil?
-        create(element)
+        create(element, changeset)
       else
-        update(element)
+        update(element, changeset)
       end
     end
 
-    def create(element)
-      raise ChangesetMissing unless changeset.open?
+    def create(element, changeset)
       element.changeset = changeset.id
       put("/#{element.type.downcase}/create", :body => element.to_xml)
     end
 
-    def update(element)
-      raise ChangesetMissing unless changeset.open?
+    def update(element, changeset)
       element.changeset = changeset.id
       response = put("/#{element.type.downcase}/#{element.id}", :body => element.to_xml)
       response.to_i # New Version number
     end
 
-    def create_changeset
-      changeset = Changeset.new
+    def create_changeset(comment = nil)
+      changeset = Changeset.new(:tags => { :comment => comment })
       changeset_id = put("/changeset/create", :body => changeset.to_xml).to_i
       find_changeset(changeset_id) unless changeset_id == 0
     end
 
-    def close_changeset
+    def close_changeset(changeset)
       put("/changeset/#{changeset.id}/close")
     end
 
@@ -131,9 +138,13 @@ module Rosemary
     #
     def find_element(type, id)
       raise ArgumentError.new("type needs to be one of 'node', 'way', and 'relation'") unless type =~ /^(node|way|relation|changeset)$/
-      raise TypeError.new('id needs to be a positive integer') unless(id.kind_of?(Fixnum) && id > 0)
-      response = get("/#{type}/#{id}")
-      response.is_a?(Array ) ? response.first : response
+      return nil if id.nil?
+      begin
+        response = get("/#{type}/#{id}")
+        response.is_a?(Array ) ? response.first : response
+      rescue NotFound
+        nil
+      end
     end
 
     private
@@ -197,14 +208,6 @@ module Rosemary
       end
     end
 
-    def find_open_changeset
-      find_changesets_for_user(:open => true).first
-    end
-
-    def find_or_create_open_changeset(options = {})
-      @changeset = (find_open_changeset || create_changeset)
-    end
-
     def check_response_codes(response)
       body = response.body
       case response.code.to_i
@@ -220,7 +223,7 @@ module Rosemary
 #      when 414 then raise UriTooLarge.new(body)
       when 500 then raise ServerError
       when 503 then raise Unavailable.new('Service Unavailable')
-      else raise Error("Unknown response code: #{response.code}")
+      else raise "Unknown response code: #{response.code}"
       end
     end
 

data/lib/rosemary/changeset.rb

@@ -30,19 +30,20 @@ module Rosemary
     attr_reader :tags
 
     def initialize(attrs = {}) #:nodoc:
-      attrs.stringify_keys!
-      @id         = attrs['id'].to_i if attrs['id']
-      @uid        = attrs['uid'].to_i
-      @user       = attrs['user']
-      @created_at = Time.parse(attrs['created_at']) rescue nil
-      @closed_at  = Time.parse(attrs['closed_at']) rescue nil
-      @open       = attrs['open']
-      @tags       = Tags.new
-      @tags[:created_by] = 'osm for ruby'
-      @min_lat    = attrs['min_lat'].to_f
-      @min_lon    = attrs['min_lon'].to_f
-      @max_lat    = attrs['max_lat'].to_f
-      @max_lon    = attrs['max_lon'].to_f
+      attrs = attrs.dup.stringify_keys!
+      @id                 = attrs['id'].to_i if attrs['id']
+      @uid                = attrs['uid'].to_i
+      @user               = attrs['user']
+      @created_at         = Time.parse(attrs['created_at']) rescue nil
+      @closed_at          = Time.parse(attrs['closed_at']) rescue nil
+      @open               = attrs['open']
+      tags = attrs['tags'] || {}
+      @tags               = Tags.new.merge(tags.dup.stringify_keys!)
+      @tags['created_by'] = 'osm for ruby'
+      @min_lat            = attrs['min_lat'].to_f
+      @min_lon            = attrs['min_lon'].to_f
+      @max_lat            = attrs['max_lat'].to_f
+      @max_lon            = attrs['max_lon'].to_f
 
     end
 

data/lib/rosemary/errors.rb

@@ -12,9 +12,6 @@ module Rosemary
   # This error occurs when Rosemary is instantiated without a client
   class CredentialsMissing < StandardError; end
 
-  # This error occurs when Rosemary has no changeset.
-  class ChangesetMissing < StandardError; end
-
   # An object was not found in the database.
   class NotFound < Error; end
 

data/lib/rosemary/version.rb

@@ -1,3 +1,3 @@
 module Rosemary
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/lib/rosemary.rb

@@ -2,7 +2,6 @@ require "rosemary/version"
 
 require 'hash'
 require 'active_model'
-require 'changeset_callbacks'
 require 'rosemary/tags'
 require 'rosemary/element'
 require 'rosemary/node'

data/rosemary.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.date = "2012-03-22"
   s.description = "OpenStreetMap API client for ruby"
   s.email = ["info@christophbuente.de"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/changeset_callbacks.rb", "lib/hash.rb", "lib/rosemary/api.rb", "lib/rosemary/basic_auth_client.rb", "lib/rosemary/changeset.rb", "lib/rosemary/element.rb", "lib/rosemary/errors.rb", "lib/rosemary/member.rb", "lib/rosemary/node.rb", "lib/rosemary/oauth_client.rb", "lib/rosemary/parser.rb", "lib/rosemary/relation.rb", "lib/rosemary/tags.rb", "lib/rosemary/user.rb", "lib/rosemary/way.rb", "lib/rosemary.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md"]
   s.homepage = "https://github.com/sozialhelden/rosemary"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "OpenStreetMap", "--main", "README.md"]
   s.require_paths = ["lib"]

data/spec/integration/changeset_spec.rb

@@ -1,13 +1,18 @@
 require 'spec_helper'
+include Rosemary
 
-describe Rosemary::Changeset do
+describe Changeset do
 
   before do
     WebMock.disable_net_connect!
   end
 
   let :osm do
-    Rosemary::Api.new
+    Api.new
+  end
+
+  let :auth_osm do
+    Api.new(BasicAuthClient.new('a_username', 'a_password'))
   end
 
   def valid_fake_user
@@ -61,11 +66,11 @@ describe Rosemary::Changeset do
 
   describe '#find:' do
 
-    let :request_url do
+    def request_url
       "http://www.openstreetmap.org/api/0.6/changeset/10"
     end
 
-    let :stubbed_request do
+    def stubbed_request
       stub_request(:get, request_url)
     end
 
@@ -73,28 +78,63 @@ describe Rosemary::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 Rosemary::Changeset
+      changeset.class.should 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'})
-      lambda {
-        node = osm.find_changeset(10)
-      }.should raise_error(Rosemary::NotFound)
+      node = osm.find_changeset(10)
+      node.should be_nil
     end
   end
 
-  describe '#find_for_user' do
+  describe '#create' do
+
+    def request_url
+      "http://a_username:a_password@www.openstreetmap.org/api/0.6/changeset/create"
+    end
 
-    let :osm do
-      Rosemary::Api.new(Rosemary::BasicAuthClient.new('a_username', 'a_password'))
+    def stub_create_request
+      stub_request(:put, request_url)
     end
 
-    let :request_url do
+    it "should post a new changeset with given comment" 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 = mock())
+      auth_osm.create_changeset('New changeset').should == 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 = mock(:open? => true))
+      auth_osm.should_not_receive(:create_changeset)
+      auth_osm.find_or_create_open_changeset(3, "some foo comment").should == 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(mock(:open? => false))
+      auth_osm.should_receive(:create_changeset).with("some foo comment").and_return(cs = mock())
+      auth_osm.find_or_create_open_changeset(3, "some foo comment").should == 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 = mock())
+      auth_osm.find_or_create_open_changeset(3, "some foo comment").should == cs
+    end
+
+  end
+
+  describe '#find_for_user' do
+
+    def request_url
       "http://www.openstreetmap.org/api/0.6/changesets?user=1234"
     end
 
-    let :stubbed_request do
+    def stubbed_request
       stub_request(:get, request_url)
     end
 
@@ -104,22 +144,22 @@ describe Rosemary::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 = osm.find_changesets_for_user
+      changesets = auth_osm.find_changesets_for_user
       changesets.should 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 = osm.find_changesets_for_user
+      changesets = auth_osm.find_changesets_for_user
       changesets.size.should eql 1
-      changesets.first.class.should eql Rosemary::Changeset
+      changesets.first.class.should 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 = osm.find_changesets_for_user
+      changesets = auth_osm.find_changesets_for_user
       changesets.size.should eql 2
-      changesets.first.class.should eql Rosemary::Changeset
+      changesets.first.class.should eql Changeset
     end
   end
 

data/spec/integration/node_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
-
-describe Rosemary::Node do
+include Rosemary
+describe Node do
 
   before do
     WebMock.disable_net_connect!
   end
 
-  let :osm do
-    Rosemary::Api.new
-  end
+  let(:changeset) { Changeset.new(:id => 1) }
 
-  let :stub_changeset_lookup do
+  let(:osm) { Api.new }
+
+  def stub_changeset_lookup
     stub_request(:get, "http://www.openstreetmap.org/api/0.6/changesets?open=true&user=1234").to_return(:status => 200, :body => valid_fake_changeset, :headers => {'Content-Type' => 'application/xml'} )
   end
 
-  let :stub_node_lookup do
+  def stub_node_lookup
     stub_request(:get, "http://www.openstreetmap.org/api/0.6/node/123").to_return(:status => 200, :body => valid_fake_node, :headers => {'Content-Type' => 'application/xml'})
   end
 
@@ -60,11 +60,11 @@ describe Rosemary::Node do
 
   describe '#find:' do
 
-    let :request_url do
+    def request_url
       "http://www.openstreetmap.org/api/0.6/node/1234"
     end
 
-    let :stubbed_request do
+    def stubbed_request
       stub_request(:get, request_url)
     end
 
@@ -72,7 +72,7 @@ describe Rosemary::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 Rosemary::Node
+      node.class.should eql Node
       node.tags.size.should eql 3
       node.tags['name'].should eql 'The rose'
       node['name'].should eql 'The rose'
@@ -84,84 +84,95 @@ describe Rosemary::Node do
       stubbed_request.to_timeout
       lambda {
         node = osm.find_node(1234)
-      }.should raise_error(Rosemary::Unavailable)
+      }.should raise_error(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 {
         node = osm.find_node(1234)
-      }.should raise_error(Rosemary::Gone)
+      }.should raise_error(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'})
-      lambda {
-        node = osm.find_node(1234)
-      }.should raise_error(Rosemary::NotFound)
+      node = osm.find_node(1234)
+      node.should be_nil
     end
   end
 
   describe 'with BasicAuthClient' do
 
     let :osm do
-      Rosemary::Api.new(Rosemary::BasicAuthClient.new('a_username', 'a_password'))
+      Api.new(BasicAuthClient.new('a_username', 'a_password'))
     end
 
-    let :stub_user_lookup do
+    def stub_user_lookup
       stub_request(:get, "http://a_username:a_password@www.openstreetmap.org/api/0.6/user/details").to_return(:status => 200, :body => valid_fake_user, :headers => {'Content-Type' => 'application/xml'} )
     end
 
     describe '#create:' do
 
-      let (:node) { Rosemary::Node.new }
-      let (:request_url)     { "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/create" }
-      let (:stubbed_request) { stub_request(:put, request_url) }
+      let (:node) { Node.new }
+
+      let (:expected_body) {
+        expected_node = node.dup
+        expected_node.changeset = changeset.id
+        expected_node.to_xml
+      }
+
+      def request_url
+        "http://a_username:a_password@www.openstreetmap.org/api/0.6/node/create"
+      end
+
+      def stubbed_request
+        stub_request(:put, request_url)
+      end
 
       before do
-        stub_changeset_lookup
         stub_user_lookup
       end
 
       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
-        new_id = osm.save(node)
+        stubbed_request.with(:body => expected_body).
+          to_return(:status => 200, :body => '123', :headers => {'Content-Type' => 'text/plain'})
+
+        new_id = osm.create(node, changeset)
       end
 
       it "should raise a Unavailable, when api times out" do
         stubbed_request.to_timeout
         lambda {
-          new_id = osm.save(node)
-        }.should raise_error(Rosemary::Unavailable)
+          new_id = osm.create(node, changeset)
+        }.should raise_error(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 {
-          new_id = osm.save(node)
-        }.should raise_error(Rosemary::BadRequest)
+          new_id = osm.save(node, changeset)
+        }.should raise_error(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 {
-          new_id = osm.save(node)
-        }.should raise_error(Rosemary::Conflict)
+          new_id = osm.save(node, changeset)
+        }.should raise_error(Conflict)
       end
 
       it "should not allow to create a node when no authentication client is given" do
-        osm = Rosemary::Api.new
+        osm = Api.new
         lambda {
-          osm.save(node)
-        }.should raise_error(Rosemary::CredentialsMissing)
+          osm.save(node, changeset)
+        }.should raise_error(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)
-        node.changeset.should == osm.changeset.id
+        osm.save(node, changeset)
+        node.changeset.should == changeset.id
       end
     end
 
@@ -172,7 +183,6 @@ describe Rosemary::Node do
       end
 
       before do
-        stub_changeset_lookup
         stub_user_lookup
         stub_node_lookup
       end
@@ -182,15 +192,15 @@ describe Rosemary::Node do
         node.tags['amenity'] = 'restaurant'
         node.tags['name'] = 'Il Tramonto'
         node.should_receive(:changeset=)
-        new_version = osm.save(node)
+        new_version = osm.save(node, changeset)
         new_version.should 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)
-        node.changeset.should == osm.changeset.id
+        osm.save(node, changeset)
+        node.changeset.should == changeset.id
       end
 
 
@@ -209,62 +219,62 @@ describe Rosemary::Node do
       end
 
       it "should not delete an node with missing id" do
-        node = Rosemary::Node.new
-        osm.destroy(node)
+        node = Node.new
+        osm.destroy(node, changeset)
       end
 
       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=)
-        new_version = osm.destroy(node)
+        new_version = osm.destroy(node, changeset)
         new_version.should 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 {
-          response = osm.destroy(node)
+          response = osm.destroy(node, changeset)
           response.should eql "Version does not match current database version"
-        }.should raise_error Rosemary::BadRequest
+        }.should raise_error 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 {
-          response = osm.destroy(node)
+          response = osm.destroy(node, changeset)
           response.should eql "Node cannot be found"
-        }.should raise_error Rosemary::NotFound
+        }.should raise_error 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 {
-          response = osm.destroy(node)
+          response = osm.destroy(node, changeset)
           response.should eql "Node has been deleted in this changeset"
-        }.should raise_error Rosemary::Conflict
+        }.should raise_error 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 {
-          response = osm.destroy(node)
+          response = osm.destroy(node, changeset)
           response.should eql "Node has been deleted"
-        }.should raise_error Rosemary::Gone
+        }.should raise_error 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 {
-          response = osm.destroy(node)
+          response = osm.destroy(node, changeset)
           response.should eql "Node 123 is still used by way 456"
-        }.should raise_error Rosemary::Precondition
+        }.should raise_error 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)
-        node.changeset.should == osm.changeset.id
+        new_version = osm.destroy(node, changeset)
+        node.changeset.should == changeset.id
       end
     end
   end
@@ -287,23 +297,23 @@ describe Rosemary::Node do
     end
 
     let :osm do
-      Rosemary::Api.new(Rosemary::OauthClient.new(access_token))
+      Api.new(OauthClient.new(access_token))
     end
 
-    let :stub_user_lookup do
+    def stub_user_lookup
       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'} )
     end
 
     describe '#create:' do
       let :node do
-        Rosemary::Node.new
+        Node.new
       end
 
-      let :request_url do
+      def request_url
         "http://www.openstreetmap.org/api/0.6/node/create"
       end
 
-      let :stubbed_request do
+      def stubbed_request
         stub_request(:put, request_url)
       end
 
@@ -315,36 +325,36 @@ describe Rosemary::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
-        new_id = osm.save(node)
+        new_id = osm.save(node, changeset)
       end
 
       it "should raise a Unavailable, when api times out" do
         stubbed_request.to_timeout
         lambda {
-          new_id = osm.save(node)
-        }.should raise_error(Rosemary::Unavailable)
+          new_id = osm.save(node, changeset)
+        }.should raise_error(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 {
-          new_id = osm.save(node)
-        }.should raise_error(Rosemary::BadRequest)
+          new_id = osm.save(node, changeset)
+        }.should raise_error(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 {
-          new_id = osm.save(node)
-        }.should raise_error(Rosemary::Conflict)
+          new_id = osm.save(node, changeset)
+        }.should raise_error(Conflict)
       end
 
       it "should not allow to create a node when no authentication client is given" do
-        osm = Rosemary::Api.new
+        osm = Api.new
         lambda {
-          osm.save(node)
-        }.should raise_error(Rosemary::CredentialsMissing)
+          osm.save(node, changeset)
+        }.should raise_error(CredentialsMissing)
       end
 
     end
@@ -366,7 +376,7 @@ describe Rosemary::Node do
         node.tags['amenity'] = 'restaurant'
         node.tags['name'] = 'Il Tramonto'
         node.should_receive(:changeset=)
-        new_version = osm.save(node)
+        new_version = osm.save(node, changeset)
         new_version.should eql 43
       end
     end
@@ -388,8 +398,8 @@ describe Rosemary::Node do
         node.should_receive(:changeset=)
         lambda {
           # Delete is not implemented using oauth
-          new_version = osm.destroy(node)
-        }.should raise_error(Rosemary::NotImplemented)
+          new_version = osm.destroy(node, changeset)
+        }.should raise_error(NotImplemented)
       end
     end
   end

data/spec/integration/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
-
-describe Rosemary::User do
+include Rosemary
+describe User do
 
   before do
     WebMock.disable_net_connect!
@@ -22,7 +22,7 @@ describe Rosemary::User do
   end
 
   let :osm do
-    Rosemary::Api.new(Rosemary::OauthClient.new(access_token))
+    Api.new(OauthClient.new(access_token))
   end
 
   def valid_fake_user
@@ -47,14 +47,14 @@ describe Rosemary::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 Rosemary::User
+      user.class.should 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 {
         osm.find_user
-      }.should raise_error Rosemary::Forbidden
+      }.should raise_error Forbidden
     end
   end
 end

data/spec/integration/way_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
-
-describe Rosemary::Way do
+include Rosemary
+describe Way do
 
   before do
     WebMock.disable_net_connect!
   end
 
   let :osm do
-    Rosemary::Api.new
+    Api.new
   end
 
   def valid_fake_way
@@ -36,7 +36,7 @@ describe Rosemary::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 Rosemary::Way
+      way.class.should eql Way
       way.nodes.should include(15735246)
     end
   end

data/spec/models/changeset_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
-
-describe 'Rosemary::Changeset' do
+include Rosemary
+describe Changeset do
 
   let :changeset do
-    Rosemary::Changeset.new( :id => "123",
+    Changeset.new( :id => "123",
                                   :user => "fred",
                                   :uid => "123",
                                   :created_at => "2008-11-08T19:07:39+01:00",
@@ -11,80 +11,98 @@ describe 'Rosemary::Changeset' do
                                   :min_lat => "52.2",
                                   :max_lat => "52.3",
                                   :min_lon => "13.4",
-                                  :max_lon => "13.5")
+                                  :max_lon => "13.5",
+                                  :tags    => { :comment => 'A bloody comment' })
   end
 
-  it "should have an id attribute set from attributes" do
-    changeset.id.should eql(123)
-  end
+  context 'attributes' do
 
-  it "should have an id attribute within xml representation" do
-    changeset.to_xml.should match /id=\"123\"/
-  end
+    subject { changeset }
 
-  it "should have a user attributes set from attributes" do
-    changeset.user.should eql("fred")
-  end
+    it "should have an id attribute set from attributes" do
+      subject.id.should eql(123)
+    end
 
-  it "should have a user attribute within xml representation" do
-    changeset.to_xml.should match /user=\"fred\"/
-  end
+    it "should have a user attributes set from attributes" do
+      subject.user.should eql("fred")
+    end
 
-  it "should have an uid attribute set from attributes" do
-    changeset.uid.should eql(123)
-  end
+    it "should have an uid attribute set from attributes" do
+      subject.uid.should eql(123)
+    end
 
-  it "should have an uid attribute within xml representation" do
-    changeset.to_xml.should match /uid=\"123\"/
-  end
+    it "should have a changeset attributes set from attributes" do
+      subject.should be_open
+    end
 
-  it "should have a changeset attributes set from attributes" do
-    changeset.should be_open
-  end
+    it "should have a min_lat attribute set from attributes" do
+      subject.min_lat.should eql(52.2)
+    end
 
-  it "should have an open attribute within xml representation" do
-    changeset.to_xml.should match /open=\"true\"/
-  end
+    it "should have a min_lon attribute set from attributes" do
+      subject.min_lon.should eql(13.4)
+    end
 
-  it "should have a min_lat attribute set from attributes" do
-    changeset.min_lat.should eql(52.2)
-  end
+    it "should have a max_lat attribute set from attributes" do
+      subject.max_lat.should eql(52.3)
+    end
 
-  it "should have a min_lat attribute within xml representation" do
-    changeset.to_xml.should match /min_lat=\"52.2\"/
-  end
+    it "should have a max_lon attribute set from attributes" do
+      subject.max_lon.should eql(13.5)
+    end
 
-  it "should have a min_lon attribute set from attributes" do
-    changeset.min_lon.should eql(13.4)
-  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')
+    end
 
-  it "should have a min_lon attribute within xml representation" do
-    changeset.to_xml.should match /min_lon=\"13.4\"/
+    it "should have a comment attribute set from attributes" do
+      subject.tags['comment'].should eql 'A bloody comment'
+    end
   end
 
-  it "should have a max_lat attribute set from attributes" do
-    changeset.max_lat.should eql(52.3)
-  end
+  context 'xml representation' do
 
-  it "should have a max_lat attribute within xml representation" do
-    changeset.to_xml.should match /max_lat=\"52.3\"/
-  end
+    subject { changeset.to_xml }
 
-  it "should have a max_lon attribute set from attributes" do
-    changeset.max_lon.should eql(13.5)
-  end
+    it "should have an id attribute within xml representation" do
+      subject.should have_xml "//changeset[@id='123']"
+    end
 
-  it "should have a max_lon attribute within xml representation" do
-    changeset.to_xml.should match /max_lon=\"13.5\"/
-  end
+    it "should have a user attribute within xml representation" do
+      subject.should have_xml "//changeset[@user='fred']"
+    end
 
-  it "should have a created_at attribute set from attributes" do
-    changeset.created_at.should eql Time.parse('2008-11-08T19:07:39+01:00')
-  end
+    it "should have an uid attribute within xml representation" do
+      subject.should have_xml "//changeset[@uid='123']"
+    end
 
-  it "should have a created_at attribute within xml representation" do
-    changeset.to_xml.should match /created_at=\"/
-  end
+    it "should have an open attribute within xml representation" do
+      subject.should 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']"
+    end
 
+    it "should have a min_lon attribute within xml representation" do
+      subject.should 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']"
+    end
+
+    it "should have a max_lon attribute within xml representation" do
+      subject.should 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='2008-11-08 19:07:39 +0100']"
+    end
+
+    it "should have a comment tag within xml representation" do
+      subject.should have_xml "//tag[@k='comment'][@v='A bloody comment']"
+    end
+
+  end
 end

data/spec/models/node_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
-
-describe 'Rosemary::Node' do
+describe Rosemary
+describe Node do
 
   subject do
-    Rosemary::Node.new(:id         => "123",
+    Node.new(:id         => "123",
                             :lat        => "52.2",
                             :lon        => "13.4",
                             :changeset  => "12",

data/spec/models/relation_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
-
-describe 'Rosemary::Relation' do
+include Rosemary
+describe Relation do
 
   subject do
-    Rosemary::Relation.new(:id         => "123",
+    Relation.new(:id         => "123",
                                 :lat        => "52.2",
                                 :lon        => "13.4",
                                 :changeset  => "12",

data/spec/models/way_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
-
-describe 'Rosemary::Way' do
+include Rosemary
+describe Way do
 
   def valid_fake_way
     way=<<-EOF
@@ -24,7 +24,7 @@ describe 'Rosemary::Way' do
   end
 
   subject do
-    @way ||= Rosemary::Way.from_xml(valid_fake_way)
+    @way ||= Way.from_xml(valid_fake_way)
   end
 
   it "should have 4 nodes" do

data/spec/spec_helper.rb

@@ -1,3 +1,31 @@
 require 'webmock/rspec'
 require 'rosemary'
 
+require 'libxml'
+
+RSpec::Matchers.define :have_xml do |xpath, text|
+  match do |body|
+    parser = LibXML::XML::Parser.string body
+    doc = parser.parse
+    nodes = doc.find(xpath)
+    nodes.empty?.should be_false
+    if text
+      nodes.each do |node|
+        node.content.should == text
+      end
+    end
+    true
+  end
+
+  failure_message_for_should do |body|
+    "expected to find xml tag #{xpath} in:\n#{body}"
+  end
+
+  failure_message_for_should_not do |response|
+    "expected not to find xml tag #{xpath} in:\n#{body}"
+  end
+
+  description do
+    "have xml tag #{xpath}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70147855734540 !ruby/object:Gem::Requirement
+  requirement: &70283461963940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147855734540
+  version_requirements: *70283461963940
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
-  requirement: &70147855733880 !ruby/object:Gem::Requirement
+  requirement: &70283461963320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147855733880
+  version_requirements: *70283461963320
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70147855733360 !ruby/object:Gem::Requirement
+  requirement: &70283461962620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147855733360
+  version_requirements: *70283461962620
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70147855732860 !ruby/object:Gem::Requirement
+  requirement: &70283461961580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147855732860
+  version_requirements: *70283461961580
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70147855732360 !ruby/object:Gem::Requirement
+  requirement: &70283461961100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147855732360
+  version_requirements: *70283461961100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70147855731880 !ruby/object:Gem::Requirement
+  requirement: &70283461960400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147855731880
+  version_requirements: *70283461960400
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70147855731400 !ruby/object:Gem::Requirement
+  requirement: &70283461959920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147855731400
+  version_requirements: *70283461959920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70147855730900 !ruby/object:Gem::Requirement
+  requirement: &70283461959420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147855730900
+  version_requirements: *70283461959420
 description: OpenStreetMap API client for ruby
 email:
 - info@christophbuente.de
@@ -108,22 +108,6 @@ extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.md
-- lib/changeset_callbacks.rb
-- lib/hash.rb
-- lib/rosemary/api.rb
-- lib/rosemary/basic_auth_client.rb
-- lib/rosemary/changeset.rb
-- lib/rosemary/element.rb
-- lib/rosemary/errors.rb
-- lib/rosemary/member.rb
-- lib/rosemary/node.rb
-- lib/rosemary/oauth_client.rb
-- lib/rosemary/parser.rb
-- lib/rosemary/relation.rb
-- lib/rosemary/tags.rb
-- lib/rosemary/user.rb
-- lib/rosemary/way.rb
-- lib/rosemary.rb
 files:
 - .gitignore
 - .rbenv-version
@@ -136,7 +120,6 @@ files:
 - Manifest
 - README.md
 - Rakefile
-- lib/changeset_callbacks.rb
 - lib/hash.rb
 - lib/rosemary.rb
 - lib/rosemary/api.rb
@@ -183,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3755060652839665335
+      hash: 4264551617807260197
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/changeset_callbacks.rb

@@ -1,31 +0,0 @@
-# According to the OSM API any changes made to the date need an open changeset which belongs to the user
-# executing the changes.
-# To keep the code simple the before_save method is included which makes sure and open
-module ChangesetCallbacks
-
-  def self.included(into)
-    into.instance_methods(false).select{|method_name| [:save, :create, :update, :destroy].include?(method_name.to_sym)}.each do |m|
-      ChangesetCallbacks.before_write(into, m)
-    end
-
-    def into.method_added(m)
-      unless @adding
-        @adding = true
-        if [:save, :create, :update, :destroy].include?(m.to_sym)
-          ChangesetCallbacks.before_write(self, m)
-        end
-        @adding = false
-      end
-    end
-  end
-
-  def ChangesetCallbacks.before_write(klass, meth)
-    klass.class_eval do
-      alias_method "old_#{meth}", "#{meth}"
-      define_method(meth) do |*args|
-        find_or_create_open_changeset
-        self.send("old_#{meth}", *args)
-      end
-    end
-  end
-end