rainmaker 0.1.1 → 0.1.3

data/.gitignore

@@ -48,4 +48,6 @@ pkg
 #*.rbc
 
 .idea/
-*.lock
+*.lock
+
+*.gem

data/lib/faraday/response/rainmaker_errors.rb

@@ -0,0 +1,33 @@
+module Faraday
+  class Response::RainmakerErrors < Response::Middleware
+      def on_complete(env)
+	   case env[:status]
+			when 400
+			raise Rainmaker::BadRequest.new(error_message(env), env[:response_headers])
+		  when 401
+			raise Rainmaker::Unauthorized.new(error_message(env), env[:response_headers])
+		  when 403
+			raise Rainmaker::Forbidden.new(error_message(env), env[:response_headers])
+		  when 404
+			raise Rainmaker::NotFound.new(error_message(env), env[:response_headers])
+		  when 422
+			raise Rainmaker::Invalid.new(error_message(env), env[:response_headers])
+ 		when 500
+        raise Rainmaker::InternalServerError.new(error_message(env), env[:response_headers])
+      when 502
+        raise Rainmaker::BadGateway.new(error_message(env), env[:response_headers])
+      when 503
+        raise Rainmaker::ServiceUnavailable.new(error_message(env), env[:response_headers])
+      end
+		   end
+
+	 def error_message(env)
+      "#{env[:method].to_s.upcase} #{env[:url].to_s}: #{env[:status]}"
+    end
+
+    def initialize(app)
+      super
+      @parser = nil
+    end
+  end
+end

data/lib/rainmaker/connection.rb

@@ -1,7 +1,7 @@
 require 'faraday_middleware'
 require 'faraday/request/gateway'
-require 'faraday/response/raise_http_4xx'
-require 'faraday/response/raise_http_5xx'
+require 'faraday/response/rainmaker_errors'
+
 
 module Rainmaker
   # @private
@@ -17,10 +17,8 @@ module Rainmaker
       }
 
       Faraday.new(options) do |builder|
-        builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::UrlEncoded
         builder.use Faraday::Request::Gateway, gateway if gateway
-        builder.use Faraday::Response::RaiseHttp4xx
         builder.use Faraday::Response::Rashify unless raw
         unless raw
           case format.to_s.downcase
@@ -30,8 +28,8 @@ module Rainmaker
             builder.use Faraday::Response::ParseXml
           end
         end
-        builder.use Faraday::Response::RaiseHttp5xx
-        builder.adapter(adapter)
+        builder.use Faraday::Response::RainmakerErrors
+        builder.adapter Faraday.default_adapter
       end
     end
   end

data/lib/rainmaker/error.rb

@@ -7,10 +7,6 @@ module Rainmaker
       @http_headers = Hash[http_headers]
       super message
     end
-
-    def retry_after
-      [(ratelimit_reset - Time.now).ceil, 0].max
-    end
   end
 
   # Raised when Rainmaker returns the HTTP status code 400

data/lib/rainmaker/request.rb

@@ -11,10 +11,12 @@ module Rainmaker
     # Perform an HTTP request
     def request(method, path, options, raw=false)
 		options[:apiKey] = Rainmaker.options[:api_key]
-      	response = connection(raw).send(method) do |request|
-        request.url(formatted_path(path), options)
-      end
-      raw ? response : response.body
+
+		response = connection(raw).send(method) do |request|
+			request.url(formatted_path(path), options)
+      	end
+
+		raw ? response : response.body
     end
 
     def formatted_path(path)

data/lib/rainmaker/version.rb

@@ -1,3 +1,3 @@
 module Rainmaker
-	VERSION = "0.1.1"
+	VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainmaker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-31 00:00:00.000000000 -06:00
-default_executable: 
+date: 2011-06-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &11143680 !ruby/object:Gem::Requirement
+  requirement: &11016096 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *11143680
+  version_requirements: *11016096
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &11143380 !ruby/object:Gem::Requirement
+  requirement: &11015796 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *11143380
+  version_requirements: *11015796
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11143104 !ruby/object:Gem::Requirement
+  requirement: &11015520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *11143104
+  version_requirements: *11015520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11142828 !ruby/object:Gem::Requirement
+  requirement: &11015244 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *11142828
+  version_requirements: *11015244
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &11175660 !ruby/object:Gem::Requirement
+  requirement: &11014968 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *11175660
+  version_requirements: *11014968
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &11175384 !ruby/object:Gem::Requirement
+  requirement: &11014692 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *11175384
+  version_requirements: *11014692
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &11175108 !ruby/object:Gem::Requirement
+  requirement: &11014416 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +87,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *11175108
+  version_requirements: *11014416
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &11174832 !ruby/object:Gem::Requirement
+  requirement: &11014140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11174832
+  version_requirements: *11014140
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &11174556 !ruby/object:Gem::Requirement
+  requirement: &11040648 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +109,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *11174556
+  version_requirements: *11040648
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &11174280 !ruby/object:Gem::Requirement
+  requirement: &11040372 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +120,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *11174280
+  version_requirements: *11040372
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &11174004 !ruby/object:Gem::Requirement
+  requirement: &11040096 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +131,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11174004
+  version_requirements: *11040096
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &11173728 !ruby/object:Gem::Requirement
+  requirement: &11039820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +142,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *11173728
+  version_requirements: *11039820
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &11173452 !ruby/object:Gem::Requirement
+  requirement: &11039544 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,7 +153,7 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *11173452
+  version_requirements: *11039544
 description: A Ruby wrapper for the Rainmaker API
 email:
 - brawest@gmail.com
@@ -171,6 +170,7 @@ files:
 - Rakefile
 - VERSION
 - lib/faraday/request/gateway.rb
+- lib/faraday/response/rainmaker_errors.rb
 - lib/faraday/response/raise_http_4xx.rb
 - lib/faraday/response/raise_http_5xx.rb
 - lib/rainmaker.rb
@@ -213,7 +213,6 @@ files:
 - vendor/cache/syntax-1.0.0.gem
 - vendor/cache/webmock-1.6.4.gem
 - vendor/cache/yard-0.7.1.gem
-has_rdoc: true
 homepage: https://github.com/brandonmwest/rainmaker
 licenses: []
 post_install_message: ! '
@@ -243,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Rainmaker API