instagram 0.8.2 → 0.8.3

data/instagram.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 2.4')
   s.add_development_dependency('webmock', '~> 1.6')
   s.add_development_dependency('bluecloth', '~> 2.0.11')
-  s.add_runtime_dependency('faraday', '~> 0.5.4')
-  s.add_runtime_dependency('faraday_middleware', '~> 0.3.1')
+  s.add_runtime_dependency('faraday', '~> 0.7')
+  s.add_runtime_dependency('faraday_middleware', '~> 0.8')
   s.add_runtime_dependency('multi_json', '~> 1.0.3')
   s.add_runtime_dependency('hashie',  '>= 0.4.0')
   s.authors = ["Shayne Sweeney"]

data/lib/faraday/oauth2.rb

@@ -1,13 +1,14 @@
 require 'faraday'
 
 # @private
-module Faraday
+module FaradayMiddleware
   # @private
-  class Request::OAuth2 < Faraday::Middleware
+  class OAuth2 < Faraday::Middleware
     def call(env)
 
       if env[:method] == :get or env[:method] == :delete
         env[:url].query_values = {} if env[:url].query_values.nil?
+
         if @access_token and not env[:url].query_values["client_secret"]
           env[:url].query_values = env[:url].query_values.merge(:access_token => @access_token)
           env[:request_headers] = env[:request_headers].merge('Authorization' => "Token token=\"#{@access_token}\"")
@@ -24,6 +25,8 @@ module Faraday
         end
       end
 
+      env[:url].query_values = nil if env[:url].query_values == {}
+
       @app.call env
     end
 

data/lib/faraday/raise_http_exception.rb

@@ -0,0 +1,45 @@
+require 'faraday'
+
+# @private
+module FaradayMiddleware
+  # @private
+  class RaiseHttpException < Faraday::Middleware
+    def call(env)
+      @app.call(env).on_complete do |response|
+        case response[:status].to_i
+        when 400
+          raise Instagram::BadRequest, error_message_400(response)
+        when 404
+          raise Instagram::NotFound, error_message_400(response)
+        when 500
+          raise Instagram::InternalServerError, error_message_500(response, "Something is technically wrong.")
+        when 503
+          raise Instagram::ServiceUnavailable, error_message_500(response, "Instagram is rate limiting your requests.")
+        end
+      end
+    end
+
+    def initialize(app)
+      super app
+      @parser = nil
+    end
+
+    private
+
+    def error_message_400(response)
+      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{error_body(response[:body])}"
+    end
+
+    def error_body(body)
+      if body.nil?
+        nil
+      elsif body['meta'] and body['meta']['error_message'] and not body['meta']['error_message'].empty?
+        ": #{body['meta']['error_message']}"
+      end
+    end
+
+    def error_message_500(response, body=nil)
+      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{[response[:status].to_s + ':', body].compact.join(' ')}"
+    end
+  end
+end

data/lib/instagram/client/subscriptions.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'multi_json'
 
 module Instagram
   class Client

data/lib/instagram/connection.rb

@@ -15,16 +15,16 @@ module Instagram
       }
 
       Faraday::Connection.new(options) do |connection|
-        connection.use Faraday::Request::OAuth2, client_id, access_token
+        connection.use FaradayMiddleware::OAuth2, client_id, access_token
+        connection.use Faraday::Request::UrlEncoded
         connection.adapter(adapter)
-        connection.use Faraday::Response::RaiseHttp5xx
+        connection.use FaradayMiddleware::Mashify unless raw
         unless raw
           case format.to_s.downcase
           when 'json' then connection.use Faraday::Response::ParseJson
           end
         end
-        connection.use Faraday::Response::RaiseHttp4xx
-        connection.use Faraday::Response::Mashify unless raw
+        connection.use FaradayMiddleware::RaiseHttpException
       end
     end
   end

data/lib/instagram/version.rb

@@ -1,3 +1,3 @@
 module Instagram
-  VERSION = '0.8.2'.freeze unless defined?(::Instagram::VERSION)
+  VERSION = '0.8.3'.freeze unless defined?(::Instagram::VERSION)
 end

data/spec/instagram/client_spec.rb

@@ -5,7 +5,7 @@ describe Instagram::Client do
     client = Instagram::Client.new
     endpoint = URI.parse(client.endpoint)
     connection = client.send(:connection).build_url(nil).to_s
-    connection.should == endpoint.to_s
+    (connection + '/').should == endpoint.to_s
   end
 
   it "should not cache the user account across clients" do

data/spec/instagram_spec.rb

@@ -14,8 +14,7 @@ describe Instagram do
 
      it "should get the correct resource" do
        Instagram.user_media_feed()
-       a_get("users/self/feed.json").
-         should have_been_made
+       a_get("users/self/feed.json").should have_been_made
      end
 
      it "should return the same results as a client" do
@@ -94,4 +93,4 @@ describe Instagram do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instagram
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000Z
+date: 2012-02-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70334758094220 !ruby/object:Gem::Requirement
+  requirement: &70311601093360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70334758094220
+  version_requirements: *70311601093360
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70334758093000 !ruby/object:Gem::Requirement
+  requirement: &70311601092260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70334758093000
+  version_requirements: *70311601092260
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70334758091900 !ruby/object:Gem::Requirement
+  requirement: &70311601091380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,32 +43,32 @@ dependencies:
         version: 2.0.11
   type: :development
   prerelease: false
-  version_requirements: *70334758091900
+  version_requirements: *70311601091380
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70334758090960 !ruby/object:Gem::Requirement
+  requirement: &70311601090160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70334758090960
+  version_requirements: *70311601090160
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70334758088740 !ruby/object:Gem::Requirement
+  requirement: &70311601089040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70334758088740
+  version_requirements: *70311601089040
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70334758086720 !ruby/object:Gem::Requirement
+  requirement: &70311601087820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70334758086720
+  version_requirements: *70311601087820
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70334758084100 !ruby/object:Gem::Requirement
+  requirement: &70311601086700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334758084100
+  version_requirements: *70311601086700
 description: A Ruby wrapper for the Instagram REST and Search APIs
 email:
 - shayne@instagr.am
@@ -104,8 +104,7 @@ files:
 - Rakefile
 - instagram.gemspec
 - lib/faraday/oauth2.rb
-- lib/faraday/raise_http_4xx.rb
-- lib/faraday/raise_http_5xx.rb
+- lib/faraday/raise_http_exception.rb
 - lib/instagram.rb
 - lib/instagram/api.rb
 - lib/instagram/client.rb
@@ -190,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1332548355430204884
+      hash: -68303577616785186
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/faraday/raise_http_4xx.rb

@@ -1,37 +0,0 @@
-require 'faraday'
-
-# @private
-module Faraday
-  # @private
-  class Response::RaiseHttp4xx < Response::Middleware
-    def self.register_on_complete(env)
-      env[:response].on_complete do |response|
-        case response[:status].to_i
-        when 400
-          raise Instagram::BadRequest, error_message(response)
-        when 404
-          raise Instagram::NotFound, error_message(response)
-        end
-      end
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-
-    private
-
-    def self.error_message(response)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{error_body(response[:body])}"
-    end
-
-    def self.error_body(body)
-      if body.nil?
-        nil
-      elsif body['meta'] and body['meta']['error_message'] and not body['meta']['error_message'].empty?
-        ": #{body['meta']['error_message']}"
-      end
-    end
-  end
-end

data/lib/faraday/raise_http_5xx.rb

@@ -1,29 +0,0 @@
-require 'faraday'
-
-# @private
-module Faraday
-  # @private
-  class Response::RaiseHttp5xx < Response::Middleware
-    def self.register_on_complete(env)
-      env[:response].on_complete do |response|
-        case response[:status].to_i
-        when 500
-          raise Instagram::InternalServerError, error_message(response, "Something is technically wrong.")
-        when 503
-          raise Instagram::ServiceUnavailable, error_message(response, "Instagram is rate limiting your requests.")
-        end
-      end
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-
-    private
-
-    def self.error_message(response, body=nil)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{[response[:status].to_s + ':', body].compact.join(' ')}"
-    end
-  end
-end