instagram 0.8.3 → 0.8.4

data/lib/faraday/raise_http_exception.rb

@@ -31,6 +31,12 @@ module FaradayMiddleware
     end
 
     def error_body(body)
+      # body gets passed as a string, not sure if it is passed as something else from other spots?
+      if not body.nil? and not body.empty? and body.kind_of?(String)
+        # removed multi_json thanks to wesnolte's commit
+        body = ::JSON.parse(body)
+      end
+
       if body.nil?
         nil
       elsif body['meta'] and body['meta']['error_message'] and not body['meta']['error_message'].empty?

data/lib/instagram/version.rb

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

data/spec/faraday/response_spec.rb

@@ -23,6 +23,20 @@ describe Faraday::Response do
           @client.user_media_feed()
         end.should raise_error(exception)
       end
+
+    end
+  end
+
+  context "when a 400 is raised" do
+    before do
+      stub_get('users/self/feed.json').
+        to_return(:body => '{"meta":{"error_message": "Bad words are bad."}}', :status => 400)
+    end
+
+    it "should return the body error message" do
+      expect do
+        @client.user_media_feed()
+      end.should raise_error(Instagram::BadRequest, /Bad words are bad./)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instagram
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000Z
+date: 2012-05-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70311601093360 !ruby/object:Gem::Requirement
+  requirement: &70234824417720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70311601093360
+  version_requirements: *70234824417720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70311601092260 !ruby/object:Gem::Requirement
+  requirement: &70234824416580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70311601092260
+  version_requirements: *70234824416580
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70311601091380 !ruby/object:Gem::Requirement
+  requirement: &70234824415400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.11
   type: :development
   prerelease: false
-  version_requirements: *70311601091380
+  version_requirements: *70234824415400
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70311601090160 !ruby/object:Gem::Requirement
+  requirement: &70234824414280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70311601090160
+  version_requirements: *70234824414280
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70311601089040 !ruby/object:Gem::Requirement
+  requirement: &70234824413220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70311601089040
+  version_requirements: *70234824413220
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70311601087820 !ruby/object:Gem::Requirement
+  requirement: &70234824411780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70311601087820
+  version_requirements: *70234824411780
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70311601086700 !ruby/object:Gem::Requirement
+  requirement: &70234824410420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70311601086700
+  version_requirements: *70234824410420
 description: A Ruby wrapper for the Instagram REST and Search APIs
 email:
 - shayne@instagr.am
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -68303577616785186
+      hash: 794823889550936591
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: