tropo_rest 0.0.5 → 0.1.0

data/lib/faraday/response/raise_http_errors.rb

@@ -1,40 +1,33 @@
 module Faraday
   class Response::RaiseHttpErrors < Response::Middleware
-    def self.register_on_complete(env)
-      env[:response].on_complete do |response|
-        case response[:status].to_i
-        when 400
-          raise TropoRest::BadRequest, error_message(response)
-        when 401
-          raise TropoRest::NotAuthorized, error_message(response)
-        when 403
-          raise TropoRest::AccessDenied, error_message(response)
-        when 404
-          raise TropoRest::NotFound, error_message(response)
-        when 405
-          raise TropoRest::MethodNotAllowed, error_message(response)
-        when 415
-          raise TropoRest::UnsupportedMediaType, error_message(response)
-        when 500
-          raise TropoRest::InternalServerError, error_message(response)
-        when 503
-          raise TropoRest::ServiceUnavailable, error_message(response)
-        end
+    def on_complete(env)
+      case env[:status].to_i
+      when 400
+        raise TropoRest::BadRequest, error_message(env)
+      when 401
+        raise TropoRest::NotAuthorized, error_message(env)
+      when 403
+        raise TropoRest::AccessDenied, error_message(env)
+      when 404
+        raise TropoRest::NotFound, error_message(env)
+      when 405
+        raise TropoRest::MethodNotAllowed, error_message(env)
+      when 415
+        raise TropoRest::UnsupportedMediaType, error_message(env)
+      when 500
+        raise TropoRest::InternalServerError, error_message(env)
+      when 503
+        raise TropoRest::ServiceUnavailable, error_message(env)
       end
     end
 
-    def initialize(app)
-      super
-      @parser = nil
-    end
-
-    private
+  private
 
-    def self.error_message(response)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{error_body(response[:body])}"
+    def error_message(env)
+      "#{env[:method].to_s.upcase} #{env[:url].to_s}: #{env[:status]}#{error_body(env[:body])}"
     end
 
-    def self.error_body(body)
+    def error_body(body)
       if body.nil?
         nil
       elsif body['error']

data/lib/faraday/response/resource.rb

@@ -1,25 +1,19 @@
 module Faraday
   class Response::Resource < Response::Middleware
-    class << self
-      attr_accessor :resource
-    end
-
-    def self.register_on_complete(env)
-      env[:response].on_complete do |response|
-        if resource
-          response_body = response[:body]
-          if response_body.is_a?(Hash)
-            response[:body] = resource.new(response_body)
-          elsif response_body.is_a?(Array)
-            response[:body] = response_body.map{|item| item.is_a?(Hash) ? resource.new(item) : item}
-          end
+    def on_complete(env)
+      if @resource
+        response_body = env[:body]
+        if response_body.is_a?(Hash)
+          env[:body] = @resource.new(response_body)
+        elsif response_body.is_a?(Array)
+          env[:body] = response_body.map{|item| item.is_a?(Hash) ? @resource.new(item) : item}
         end
       end
     end
 
     def initialize(app, resource=nil)
       super app
-      self.class.resource = resource
+      @resource = resource
       @parser = nil
     end
   end

data/lib/tropo_rest/connection.rb

@@ -14,14 +14,15 @@ module TropoRest
         :url => url
       }
 
-      Faraday::Connection.new(options) do |connection|
-        connection.use Faraday::Request::SerializeJson
-        connection.adapter(adapter)
-        connection.basic_auth(username, password)
-        connection.use Faraday::Response::ParseJson
-        connection.use Faraday::Response::Resource, resource
-        connection.use Faraday::Response::RaiseHttpErrors
+      connection = Faraday::Connection.new(options) do |builder|
+        builder.use Faraday::Request::SerializeJson
+        builder.use Faraday::Response::Resource, resource
+        builder.use Faraday::Response::ParseJson
+        builder.use Faraday::Response::RaiseHttpErrors
+        builder.adapter(adapter)
       end
+      connection.basic_auth(username, password)
+      connection
     end
   end
 end

data/lib/tropo_rest/version.rb

@@ -1,3 +1,3 @@
 module TropoRest
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/tropo_rest.rb

@@ -1,3 +1,4 @@
+require 'hashie/mash'
 require 'hashie/twash'
 
 require 'tropo_rest/resource/address'

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-Bundler.require
+require 'bundler/setup'
 require 'tropo_rest'
 require 'webmock/rspec'
 

data/tropo_rest.gemspec

@@ -37,10 +37,10 @@ Gem::Specification.new do |s|
     s.add_development_dependency "ruby-debug" unless defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
   end
 
-  s.add_runtime_dependency "faraday", "~> 0.5.3"
-  s.add_runtime_dependency "faraday_middleware", "~> 0.3.1"
-  s.add_runtime_dependency "multi_json", "~> 0.0.5"
-  s.add_runtime_dependency "hashie", "~> 0.4.0"
+  s.add_runtime_dependency "faraday", "~> 0.6.0"
+  s.add_runtime_dependency "faraday_middleware", "~> 0.6.0"
+  s.add_runtime_dependency "multi_json", "~> 1.0.0"
+  s.add_runtime_dependency "hashie", "~> 1.0.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -2,7 +2,7 @@
 name: tropo_rest
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Christopher Durtschi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 23:00:00 -07:00
+date: 2011-06-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.3
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: *id011
@@ -141,7 +141,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: *id012
@@ -152,7 +152,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id013
@@ -163,7 +163,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id014
@@ -231,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1958669569557374112
+      hash: -4002703830484713363
       segments: 
       - 0
       version: "0"