rosemary 0.2.7 → 0.2.8

data/lib/rosemary/api.rb

@@ -208,17 +208,19 @@ module Rosemary
     def check_response_codes(response)
       body = response.body
       case response.code.to_i
-        when 200 then return
-        when 400 then raise BadRequest.new(body)
-        when 401 then raise Unauthorized.new(body)
-        when 404 then raise NotFound.new(body)
-        when 405 then raise MethodNotAllowed.new(body)
-        when 409 then raise Conflict.new(body)
-        when 410 then raise Gone.new(body)
-        when 412 then raise Precondition.new(body)
-        when 500 then raise ServerError
-        when 503 then raise Unavailable.new('Service Unavailable')
-        else raise Error
+      when 200 then return
+      when 400 then raise BadRequest.new(body)
+      when 401 then raise Unauthorized.new(body)
+      when 403 then raise Forbidden.new(body)
+      when 404 then raise NotFound.new(body)
+      when 405 then raise MethodNotAllowed.new(body)
+      when 409 then raise Conflict.new(body)
+      when 410 then raise Gone.new(body)
+      when 412 then raise Precondition.new(body)
+#      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}")
       end
     end
 

data/lib/rosemary/errors.rb

@@ -25,6 +25,8 @@ module Rosemary
   # password for a write operation.
   class Unauthorized < Error; end # 401
 
+  class Forbidden < Error; end # 403
+
   # The object was not found (HTTP 404). Generally means that the object doesn't exist
   # and never has.
   class NotFound < Error; end # 404

data/lib/rosemary/version.rb

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

data/spec/integration/user_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Rosemary::User do
+
+  before do
+    WebMock.disable_net_connect!
+  end
+
+  let :consumer do
+    OAuth::Consumer.new(  'a_key', 'a_secret',
+                          {
+                            :site => 'http://www.openstreetmap.org',
+                            :request_token_path => '/oauth/request_token',
+                            :access_token_path => '/oauth/access_token',
+                            :authorize_path => '/oauth/authorize'
+                          }
+                        )
+  end
+
+  let :access_token do
+    OAuth::AccessToken.new(consumer, 'a_token', 'a_secret')
+  end
+
+  let :osm do
+    Rosemary::Api.new(Rosemary::OauthClient.new(access_token))
+  end
+
+  def valid_fake_user
+    way=<<-EOF
+    <osm version="0.6" generator="OpenStreetMap server">
+     <user display_name="Max Muster" account_created="2006-07-21T19:28:26Z" id="1234">
+       <home lat="49.4733718952806" lon="8.89285988577866" zoom="3"/>
+       <description>The description of your profile</description>
+       <languages>
+         <lang>de-DE</lang>
+         <lang>de</lang>
+         <lang>en-US</lang>
+         <lang>en</lang>
+       </languages>
+     </user>
+    </osm>
+    EOF
+  end
+
+  describe '#find:' 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
+    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
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   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: &70184620425620 !ruby/object:Gem::Requirement
+  requirement: &70147855734540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184620425620
+  version_requirements: *70147855734540
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
-  requirement: &70184620425100 !ruby/object:Gem::Requirement
+  requirement: &70147855733880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184620425100
+  version_requirements: *70147855733880
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70184620424440 !ruby/object:Gem::Requirement
+  requirement: &70147855733360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184620424440
+  version_requirements: *70147855733360
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70184620423940 !ruby/object:Gem::Requirement
+  requirement: &70147855732860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184620423940
+  version_requirements: *70147855732860
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70184620423460 !ruby/object:Gem::Requirement
+  requirement: &70147855732360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184620423460
+  version_requirements: *70147855732360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70184620422960 !ruby/object:Gem::Requirement
+  requirement: &70147855731880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184620422960
+  version_requirements: *70147855731880
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70184620422480 !ruby/object:Gem::Requirement
+  requirement: &70147855731400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184620422480
+  version_requirements: *70147855731400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70184620422000 !ruby/object:Gem::Requirement
+  requirement: &70147855730900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184620422000
+  version_requirements: *70147855730900
 description: OpenStreetMap API client for ruby
 email:
 - info@christophbuente.de
@@ -156,6 +156,7 @@ files:
 - rosemary.gemspec
 - spec/integration/changeset_spec.rb
 - spec/integration/node_spec.rb
+- spec/integration/user_spec.rb
 - spec/integration/way_spec.rb
 - spec/models/changeset_spec.rb
 - spec/models/node_spec.rb
@@ -182,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2422917750026557499
+      hash: -3755060652839665335
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,6 +199,7 @@ summary: OpenStreetMap API client for ruby
 test_files:
 - spec/integration/changeset_spec.rb
 - spec/integration/node_spec.rb
+- spec/integration/user_spec.rb
 - spec/integration/way_spec.rb
 - spec/models/changeset_spec.rb
 - spec/models/node_spec.rb