instagram 0.7 → 0.8

data/lib/instagram/client/locations.rb

@@ -35,7 +35,7 @@ module Instagram
       def location_recent_media(id, *args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         response = get("locations/#{id}/media/recent", options)
-        response["data"]
+        response
       end
 
       # Returns Instagram locations within proximity of given lat,lng
@@ -56,4 +56,4 @@ module Instagram
       end
     end
   end
-end
+end

data/lib/instagram/client/media.rb

@@ -56,8 +56,8 @@ module Instagram
       # @rate_limited true
       def media_search(lat, lng, options={})
         response = get('media/search', options.merge(:lat => lat, :lng => lng))
-        response["data"]
+        response
       end
     end
   end
-end
+end

data/lib/instagram/client/tags.rb

@@ -35,7 +35,7 @@ module Instagram
       def tag_recent_media(id, *args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         response = get("tags/#{id}/media/recent", options)
-        response["data"]
+        response
       end
 
       # Returns a list of tags starting with the given search query
@@ -56,4 +56,4 @@ module Instagram
       end
     end
   end
-end
+end

data/lib/instagram/client/users.rb

@@ -120,18 +120,19 @@ module Instagram
     # @overload user_media_feed(options={})
     #   @param options [Hash] A customizable set of options.
     #   @option options [Integer] :max_id Returns results with an ID less than (that is, older than) or equal to the specified ID.
-    #   @option optionsc [Integer] :count Specifies the number of records to retrieve, per page.
+    #   @option options [Integer] :min_id Return media later than this min_id
+    #   @option options [Integer] :count Specifies the number of records to retrieve, per page.
     #   @return [Array]
     #   @example Return most recent media images that would appear on @shayne's feed
     #     Instagram.user_media_feed() # assuming @shayne is the authorized user
     # @format :json
     # @authenticated true
     # @rate_limited true
-    # @see TODO:docs URL
+    # @see http://instagram.com/developer/endpoints/users/#get_users_feed
     def user_media_feed(*args)
       options = args.first.is_a?(Hash) ? args.pop : {}
       response = get('users/self/feed', options)
-      response["data"]
+      response
     end
 
     # Returns a list of recent media items for a given user
@@ -161,7 +162,7 @@ module Instagram
       response = get("users/#{id}/media/recent", options)
       response["data"]
     end
-    
+
     # Returns a list of media items liked by the current user
     #
     # @overload user_liked_media(options={})
@@ -177,9 +178,9 @@ module Instagram
     # @rate_limited true
     def user_liked_media(options={})
       response = get("users/self/media/liked", options)
-      response["data"]
+      response
     end
-    
+
     # Returns information about the current user's relationship (follow/following/etc) to another user
     #
     # @overload user_relationship(id, options={})
@@ -196,7 +197,7 @@ module Instagram
       response = get("users/#{id}/relationship", options)
       response["data"]
     end
-    
+
     # Create a follows relationship between the current user and the target user
     #
     # @overload follow_user(id, options={})
@@ -214,7 +215,7 @@ module Instagram
       response = post("users/#{id}/relationship", options)
       response["data"]
     end
-    
+
     # Destroy a follows relationship between the current user and the target user
     #
     # @overload unfollow_user(id, options={})
@@ -232,7 +233,7 @@ module Instagram
       response = post("users/#{id}/relationship", options)
       response["data"]
     end
-    
+
     # Block a relationship between the current user and the target user
     #
     # @overload unfollow_user(id, options={})
@@ -250,7 +251,7 @@ module Instagram
       response = post("users/#{id}/relationship", options)
       response["data"]
     end
-    
+
     # Remove a relationship block between the current user and the target user
     #
     # @overload unblock_user(id, options={})
@@ -268,7 +269,7 @@ module Instagram
       response = post("users/#{id}/relationship", options)
       response["data"]
     end
-    
+
     # Approve a relationship request between the current user and the target user
     #
     # @overload approve_user(id, options={})
@@ -286,7 +287,7 @@ module Instagram
       response = post("users/#{id}/relationship", options)
       response["data"]
     end
-    
+
     # Deny a relationship request between the current user and the target user
     #
     # @overload deny_user(id, options={})

data/lib/instagram/version.rb

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

data/spec/instagram/client/locations_spec.rb

@@ -45,8 +45,8 @@ describe Instagram::Client do
 
         it "should return a list of media taken at a given location" do
           media = @client.location_recent_media(514276)
-          media.should be_a Array
-          media.first.user.username.should == "josh"
+          media.data.should be_a Array
+          media.data.first.user.username.should == "josh"
         end
       end
 
@@ -75,4 +75,4 @@ describe Instagram::Client do
       end
     end
   end
-end
+end

data/spec/instagram/client/media_spec.rb

@@ -68,11 +68,11 @@ describe Instagram::Client do
         end
 
         it "should return an array of user search results" do
-          user_search = @client.media_search("37.7808851", "-122.3948632")
-          user_search.should be_a Array
-          user_search.first.user.username.should == "mikeyk"
+          media_search = @client.media_search("37.7808851", "-122.3948632")
+          media_search.data.should be_a Array
+          media_search.data.first.user.username.should == "mikeyk"
         end
       end
     end
   end
-end
+end

data/spec/instagram/client/tags_spec.rb

@@ -45,8 +45,8 @@ describe Instagram::Client do
 
         it "should return a list of media taken at a given location" do
           media = @client.tag_recent_media('cat')
-          media.should be_a Array
-          media.first.user.username.should == "amandavan"
+          media.data.should be_a Array
+          media.data.first.user.username.should == "amandavan"
         end
       end
 
@@ -75,4 +75,4 @@ describe Instagram::Client do
       end
     end
   end
-end
+end

metadata

@@ -1,134 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: instagram
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  version: "0.7"
+version: !ruby/object:Gem::Version
+  version: '0.8'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Shayne Sweeney
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-02 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70315025028760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70315025028760
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70315025028260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70315025028260
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &70315025027800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 11
+      - !ruby/object:Gem::Version
         version: 2.0.11
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70315025027800
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70315025027340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.5.4
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70315025027340
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: &70315025026880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70315025026880
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70315025026420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hashie
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70315025026420
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &70315025057420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70315025057420
 description: A Ruby wrapper for the Instagram REST and Search APIs
-email: 
+email:
 - shayne@instagr.am
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .yardopts
@@ -208,51 +174,33 @@ files:
 - spec/instagram/client_spec.rb
 - spec/instagram_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/Instagram/instagramrb
 licenses: []
-
-post_install_message: |
-  ********************************************************************************
-  
-    Follow @instagram on Twitter for announcements, updates, and news.
-    https://twitter.com/instagramapi
-  
-    Join the mailing list!
-    https://groups.google.com/group/instagram-ruby-gem
-  
-  ********************************************************************************
-
+post_install_message: ! "********************************************************************************\n\n
+  \ Follow @instagram on Twitter for announcements, updates, and news.\n  https://twitter.com/instagramapi\n\n
+  \ Join the mailing list!\n  https://groups.google.com/group/instagram-ruby-gem\n\n********************************************************************************\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: instagram
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Instagram API
-test_files: 
+test_files:
 - spec/faraday/response_spec.rb
 - spec/fixtures/access_token.json
 - spec/fixtures/approve_user.json