roomorama_api 0.4.0 → 0.4.1

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 rvm:
   - "1.9.2"
   - "1.9.3"
+  - "2.0.0"
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
+  # - rbx-2.2.1
 # uncomment this line if your project needs to run something other than `rake`:
 script: bundle exec rake test

data/README.md

@@ -81,7 +81,7 @@ Currently this gem does not handle any oauth authentication yet. Host and Guest
 
 Turn on debug mode with
 
-	RoomoramaApi::Client = true
+	RoomoramaApi::Client.debug = true
 
 
 ### Can't find the API Call you want?

data/lib/roomorama_api.rb

@@ -8,6 +8,7 @@ require "roomorama_api/api/users"
 require "roomorama_api/api/host_properties"
 require "roomorama_api/api/host_availabilities"
 require "roomorama_api/api/host_inquiries"
+require "roomorama_api/api/errors"
 
 require "faraday"
 require "json"
@@ -24,6 +25,8 @@ module RoomoramaApi
     include RoomoramaApi::Api::HostAvailabilities
     include RoomoramaApi::Api::HostInquiries
 
+    include RoomoramaApi::Api::Errors
+
     def initialize(oauth_token=nil)
       @oauth_token = oauth_token
     end
@@ -63,7 +66,7 @@ module RoomoramaApi
     def connection(method_name, options, verb)
       conn = Faraday.new(:url => api_url) do |faraday|
         faraday.request  :url_encoded
-          #faraday.response(:logger) if self.class.debug
+          faraday.response(:logger) if self.class.debug
           faraday.adapter  Faraday.default_adapter
           faraday.headers['User-Agent'] = "RoomoramaApi gem v#{VERSION}"
           faraday.headers['Authorization'] = "Bearer " + @oauth_token if @oauth_token
@@ -79,31 +82,11 @@ module RoomoramaApi
 
 
     def raise_errors(response)
-      message = "(#{response.status})"
-
-      case response.status.to_i
-      when 400
-        raise BadRequest, message
-      when 401
-        raise Unauthorized, message
-      when 403
-        raise General, message
-      when 404
-        raise NotFound, message
-      when 500
-        raise InternalError, "An internal error is thrown."
-      when 502, 503
-        raise Unavailable, message
-      end
+      if e = HTTP_STATUS_ERRORS[response.status.to_i]
+        raise e
+      end  
     end
 
-  end
-
-  class BadRequest    < StandardError; end
-  class Unauthorized  < StandardError; end
-  class General       < StandardError; end
-  class Unavailable   < StandardError; end
-  class InternalError < StandardError; end
-  class NotFound      < StandardError; end
+  end # end class Client
 
-end
+end # end module RoomoramaApi

data/lib/roomorama_api/api/errors.rb

@@ -0,0 +1,72 @@
+module RoomoramaApi
+	module Api
+  	module Errors
+
+  		#According to https://www.roomorama.com/api/documentation
+
+  		class BadRequest < StandardError
+  			def initialize
+  				super("Bad Request")
+  			end	
+  		end
+		  
+		  class Unauthorized < StandardError
+  	   	def initialize
+  	   		super("You're not authorized to access this resource, make sure you're sending the right authorization header in your request")
+  	   	end	
+		  end
+		    
+		  class General < StandardError
+  	   	def initialize
+  	   		super("Generic error")
+  	   	end	
+		  end
+    
+		  class Unavailable < StandardError
+  	   	def initialize
+  	   		super("Unavailable")
+  	   	end	
+		  end
+    
+		  class UnprocessableEntity < StandardError
+  	   	def initialize
+  	   		super("Something went wrong while saving or updating your object, make sure the data you're sending in the request is correct")
+  	   	end	
+		  end
+    
+		  class InternalError < StandardError
+  	   	def initialize
+  	   		super("An error has occurred in Roomorama service")
+  	   	end	
+		  end
+    
+		  class NotFound  < StandardError
+  	   	def initialize
+  	   		super("The resource doesn't exist")
+  	   	end	
+		  end
+    
+		  class Conflict  < StandardError
+  	   	def initialize
+  	   		super("The request cannot be performed because of the state the resource is in")
+  	   	end	
+		  end
+    
+		  # HTTP code => error class mapping
+    
+  	  HTTP_STATUS_ERRORS = {
+  	  	400 => BadRequest,
+  	  	401 => Unauthorized,
+  	  	403 => General,
+  	  	404 => NotFound,
+  	  	409 => Conflict,
+  	  	422 => UnprocessableEntity,
+  	  	500 => InternalError,
+  	  	502 => Unavailable,
+  	  	503 => Unavailable
+  	  }
+
+  	end # end module Errors 
+  end # end module Api
+end # end module RoomoramaApi
+  			

data/lib/roomorama_api/version.rb

@@ -1,3 +1,3 @@
 module RoomoramaApi
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/roomorama_api_test.rb

@@ -179,6 +179,15 @@ class RoomoramaApiTest < MiniTest::Unit::TestCase
     assert_equal result["result"]["id"], 9999
   end
 
+  #### Errors
+
+  def test_raise_not_found_error
+    FakeWeb.register_uri(:get, "https://api.roomorama.com/v1.0/destinations", body: "Nothing found", status: ["404", "Not Found"])
+    assert_raises ::RoomoramaApi::Api::Errors::NotFound do
+      @client.destinations_all
+    end
+  end
+
   # def test_get_data_for_an_empty_property
   #   assert_raises RoomoramaApi::NotFound do
   #     result = @client.properties_get_data 500

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roomorama_api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -92,6 +92,7 @@ files:
 - Rakefile
 - lib/roomorama_api.rb
 - lib/roomorama_api/api/destinations.rb
+- lib/roomorama_api/api/errors.rb
 - lib/roomorama_api/api/favorites.rb
 - lib/roomorama_api/api/host_availabilities.rb
 - lib/roomorama_api/api/host_inquiries.rb