instagram 0.8.4 → 0.8.5

data/.gitignore

@@ -10,3 +10,4 @@ coverage/*
 doc/*
 log/*
 pkg/*
+.idea/*

data/README.md

@@ -89,7 +89,7 @@ API Usage Examples
     puts Instagram.follows
 
     # Get a list of media close to a given latitude and longitude
-    puts Instagram.media_search("37.7808851,-122.3948632")
+    puts Instagram.media_search("37.7808851","-122.3948632")
 
 	# Get a list of the overall most popular media items
 	puts Instagram.media_popular

data/instagram.gemspec

@@ -5,9 +5,9 @@ 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.7')
+  s.add_runtime_dependency('faraday', ['>= 0.7', '< 0.9'])
   s.add_runtime_dependency('faraday_middleware', '~> 0.8')
-  s.add_runtime_dependency('multi_json', '~> 1.0.3')
+  s.add_runtime_dependency('multi_json', '>= 1.0.3', '~> 1.0')
   s.add_runtime_dependency('hashie',  '>= 0.4.0')
   s.authors = ["Shayne Sweeney"]
   s.description = %q{A Ruby wrapper for the Instagram REST and Search APIs}

data/lib/faraday/oauth2.rb

@@ -7,13 +7,17 @@ module FaradayMiddleware
     def call(env)
 
       if env[:method] == :get or env[:method] == :delete
-        env[:url].query_values = {} if env[:url].query_values.nil?
+        if env[:url].query.nil?
+          query = {}
+        else
+          query = Faraday::Utils.parse_query(env[:url].query)
+        end
 
-        if @access_token and not env[:url].query_values["client_secret"]
-          env[:url].query_values = env[:url].query_values.merge(:access_token => @access_token)
+        if @access_token and not query["client_secret"]
+          env[:url].query = Faraday::Utils.build_query(query.merge(:access_token => @access_token))
           env[:request_headers] = env[:request_headers].merge('Authorization' => "Token token=\"#{@access_token}\"")
         elsif @client_id
-          env[:url].query_values = env[:url].query_values.merge(:client_id => @client_id)
+          env[:url].query = Faraday::Utils.build_query(query.merge(:client_id => @client_id))
         end
       else
         if @access_token and not env[:body] && env[:body][:client_secret]
@@ -25,7 +29,6 @@ module FaradayMiddleware
         end
       end
 
-      env[:url].query_values = nil if env[:url].query_values == {}
 
       @app.call env
     end

data/lib/instagram/connection.rb

@@ -17,7 +17,6 @@ module Instagram
       Faraday::Connection.new(options) do |connection|
         connection.use FaradayMiddleware::OAuth2, client_id, access_token
         connection.use Faraday::Request::UrlEncoded
-        connection.adapter(adapter)
         connection.use FaradayMiddleware::Mashify unless raw
         unless raw
           case format.to_s.downcase
@@ -25,6 +24,7 @@ module Instagram
           end
         end
         connection.use FaradayMiddleware::RaiseHttpException
+        connection.adapter(adapter)
       end
     end
   end

data/lib/instagram/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instagram
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000Z
+date: 2012-07-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70234824417720 !ruby/object:Gem::Requirement
+  requirement: &70311845220480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70234824417720
+  version_requirements: *70311845220480
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70234824416580 !ruby/object:Gem::Requirement
+  requirement: &70311845218780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70234824416580
+  version_requirements: *70311845218780
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70234824415400 !ruby/object:Gem::Requirement
+  requirement: &70311845217920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,24 @@ dependencies:
         version: 2.0.11
   type: :development
   prerelease: false
-  version_requirements: *70234824415400
+  version_requirements: *70311845217920
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70234824414280 !ruby/object:Gem::Requirement
+  requirement: &70311845217080 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70234824414280
+  version_requirements: *70311845217080
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70234824413220 !ruby/object:Gem::Requirement
+  requirement: &70311845215700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +68,24 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70234824413220
+  version_requirements: *70311845215700
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70234824411780 !ruby/object:Gem::Requirement
+  requirement: &70311845214840 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234824411780
+  version_requirements: *70311845214840
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70234824410420 !ruby/object:Gem::Requirement
+  requirement: &70311845213800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +93,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70234824410420
+  version_requirements: *70311845213800
 description: A Ruby wrapper for the Instagram REST and Search APIs
 email:
 - shayne@instagr.am
@@ -189,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 794823889550936591
+      hash: -1111246945157108473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: