instagram 0.10.0 → 0.11.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzdmODUyMDg3MTBkNjYzM2Q1MjY4YjBkOTUxNTcwN2FmOWMxZGNmMg==
+  data.tar.gz: !binary |-
+    OWFiZGIxNjU2MThhMjZmMmFiYzU5ZDk4MTQ5MTIyNTc4Nzc4YjE3Ng==
+SHA512:
+  metadata.gz: !binary |-
+    MjAyNjQwNGYxNzEyYThiM2JjM2I0YjhkYjYyYjVhODczMzVkNjgxNzBhZDc5
+    ODYxOTYyYjk1YjQ2OGVjOTk2ZmIyNzg0N2ViMzJhYTVjMjQwMzAzNWMyOTZi
+    Yzg2ODg5NTZkNzM0NWFkZDAwNDJiMmIyYWRkNmM0ODFmMTYwOTQ=
+  data.tar.gz: !binary |-
+    NDM1Zjk4MGQ4MjBkMjQ3MmQyZDljN2Q5OTI4ZjQ0YTQ2NTc1NGMxYTc3MTVl
+    NjgzYWIzYjUwZDI2ODEwNDY0MzIwYWYwOWU5OTgyMjQ1Y2QwOWFhNTAzN2U2
+    NDcwMGYwMTFkYTUzNmEzNDAxM2FiMTFlMWI2MGI3OWQxY2VmZWM=

data/README.md

@@ -26,85 +26,88 @@ Add it to the [apps](http://github.com/Instagram/instagram-ruby-gem/wiki/apps) w
 
 Sample Application
 ------------------
-	require "sinatra"
-	require "instagram"
 
-	enable :sessions
+```ruby
+require "sinatra"
+require "instagram"
 
-	CALLBACK_URL = "http://localhost:4567/oauth/callback"
+enable :sessions
 
-	Instagram.configure do |config|
-	  config.client_id = "YOUR_CLIENT_ID"
-	  config.client_secret = "YOUR_CLIENT_SECRET"
-	end
+CALLBACK_URL = "http://localhost:4567/oauth/callback"
 
-	get "/" do
-	  '<a href="/oauth/connect">Connect with Instagram</a>'
-	end
+Instagram.configure do |config|
+  config.client_id = "YOUR_CLIENT_ID"
+  config.client_secret = "YOUR_CLIENT_SECRET"
+end
 
-	get "/oauth/connect" do
-	  redirect Instagram.authorize_url(:redirect_uri => CALLBACK_URL)
-	end
+get "/" do
+  '<a href="/oauth/connect">Connect with Instagram</a>'
+end
 
-	get "/oauth/callback" do
-	  response = Instagram.get_access_token(params[:code], :redirect_uri => CALLBACK_URL)
-	  session[:access_token] = response.access_token
-	  redirect "/feed"
-	end
+get "/oauth/connect" do
+  redirect Instagram.authorize_url(:redirect_uri => CALLBACK_URL)
+end
 
-	get "/feed" do
-	  client = Instagram.client(:access_token => session[:access_token])
-	  user = client.user
+get "/oauth/callback" do
+  response = Instagram.get_access_token(params[:code], :redirect_uri => CALLBACK_URL)
+  session[:access_token] = response.access_token
+  redirect "/feed"
+end
 
-	  html = "<h1>#{user.username}'s recent photos</h1>"
-	  for media_item in client.user_recent_media
-	    html << "<img src='#{media_item.images.thumbnail.url}'>"
-	  end
-	  html
-	end
+get "/feed" do
+  client = Instagram.client(:access_token => session[:access_token])
+  user = client.user
 
+  html = "<h1>#{user.username}'s recent photos</h1>"
+  for media_item in client.user_recent_media
+    html << "<img src='#{media_item.images.thumbnail.url}'>"
+  end
+  html
+end
+```
 
 API Usage Examples
 ------------------
-    require "rubygems"
-    require "instagram"
-    
-    # All methods require authentication (either by client ID or access token).
-	# To get your Instagram OAuth credentials, register an app at http://instagr.am/oauth/client/register/
-    Instagram.configure do |config|
-      config.client_id = YOUR_CLIENT_KEY
-      config.access_token = YOUR_ACCESS_TOKEN
-    end
+```ruby
+require "rubygems"
+require "instagram"
 
-    # Get a list of a user's most recent media
-    puts Instagram.user_recent_media(777)
+# All methods require authentication (either by client ID or access token).
+# To get your Instagram OAuth credentials, register an app at http://instagr.am/oauth/client/register/
+Instagram.configure do |config|
+  config.client_id = YOUR_CLIENT_KEY
+  config.access_token = YOUR_ACCESS_TOKEN
+end
 
-    # Use pagination data from a response to get the next page
-    page_1 = Instagram.user_recent_media(777)
-    page_2_max_id = page_1.pagination.next_max_id
-    page_2 = Instagram.user_recent_media(777, :max_id => page_2_max_id ) unless page_2_max_id.nil?
+# Get a list of a user's most recent media
+puts Instagram.user_recent_media(777)
 
-    # Get the currently authenticated user's media feed
-    puts Instagram.user_media_feed
+# Use pagination data from a response to get the next page
+page_1 = Instagram.user_recent_media(777)
+page_2_max_id = page_1.pagination.next_max_id
+page_2 = Instagram.user_recent_media(777, :max_id => page_2_max_id ) unless page_2_max_id.nil?
 
-    # Get a list of recent media at a given location, in this case, the Instagram office
-    puts Instagram.location_recent_media(514276)
+# Get the currently authenticated user's media feed
+puts Instagram.user_media_feed
 
-    # Get a list of media close to a given latitude and longitude
-    puts Instagram.media_search("37.7808851","-122.3948632")
+# Get a list of recent media at a given location, in this case, the Instagram office
+puts Instagram.location_recent_media(514276)
 
-	# Get a list of the overall most popular media items
-	puts Instagram.media_popular
+# Get a list of media close to a given latitude and longitude
+puts Instagram.media_search("37.7808851","-122.3948632")
 
-	# Search for users on instagram, by name or username
-	puts Instagram.user_search("shayne sweeney")
+# Get a list of the overall most popular media items
+puts Instagram.media_popular
 
-	# Search for a location by lat/lng
-	puts Instagram.location_search("37.7808851","-122.3948632")
+# Search for users on instagram, by name or username
+puts Instagram.user_search("shayne sweeney")
 
-	# Search for a location by Fousquare ID (v2)
-	puts Instagram.location_search("3fd66200f964a520c5f11ee3")
+# Search for a location by lat/lng
+puts Instagram.location_search("37.7808851","-122.3948632")
 
+# Search for a location by Fousquare ID (v2)
+puts Instagram.location_search("3fd66200f964a520c5f11ee3")
+```
 	
 
 
@@ -129,7 +132,7 @@ Submitting an Issue
 -------------------
 We use the [GitHub issue tracker](http://github.com/Instagram/instagram-ruby-gem/issues) to track bugs and
 features. Before submitting a bug report or feature request, check to make sure it hasn't already
-been submitted. You can indicate support for an existing issuse by voting it up. When submitting a
+been submitted. You can indicate support for an existing issue by voting it up. When submitting a
 bug report, please include a [Gist](http://gist.github.com/) that includes a stack trace and any
 details that may be necessary to reproduce the bug, including your gem version, Ruby version, and
 operating system. Ideally, a bug report should include a pull request with failing specs.

data/lib/instagram/client/comments.rb

@@ -50,7 +50,7 @@ module Instagram
       # @format :json
       # @authenticated true
       #
-      #   In order to remove a comment, you must be either the owner comment or the media item (or both).
+      #   In order to remove a comment, you must be the owner of the comment, the media item, or both.
       # @rate_limited true
       # @see TODO:docs url
       def delete_media_comment(media_id, comment_id, options={})

data/lib/instagram/client/tags.rb

@@ -21,7 +21,7 @@ module Instagram
       # Returns a list of recent media items for a given Instagram tag
       #
       # @overload tag_recent_media(tag, options={})
-      #   @param user [String] An Instagram tag name.
+      #   @param id [String] An Instagram tag name.
       #   @param options [Hash] A customizable set of options.
       #   @option options [Integer] :max_id (nil) Returns results with an ID less than (that is, older than) or equal to the specified ID.
       #   @option options [Integer] :count (nil) Limits the number of results returned per page.

data/lib/instagram/client/users.rb

@@ -16,8 +16,9 @@ module Instagram
       # @rate_limited true
       # @see TODO:docs url
       def user(*args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
         id = args.first || 'self'
-        response = get("users/#{id}")
+        response = get("users/#{id}", options)
         response
       end
 

data/lib/instagram/configuration.rb

@@ -9,6 +9,7 @@ module Instagram
       :adapter,
       :client_id,
       :client_secret,
+      :scope,
       :access_token,
       :endpoint,
       :format,
@@ -39,6 +40,9 @@ module Instagram
     # By default, don't set a user access token
     DEFAULT_ACCESS_TOKEN = nil
 
+    # By default, don't set a user scope
+    DEFAULT_SCOPE = nil
+
     # The endpoint that will be used to connect if none is set
     #
     # @note There is no reason to use any other endpoint at this time
@@ -80,6 +84,7 @@ module Instagram
       self.adapter        = DEFAULT_ADAPTER
       self.client_id      = DEFAULT_CLIENT_ID
       self.client_secret  = DEFAULT_CLIENT_SECRET
+      self.scope          = DEFAULT_SCOPE
       self.access_token   = DEFAULT_ACCESS_TOKEN
       self.endpoint       = DEFAULT_ENDPOINT
       self.format         = DEFAULT_FORMAT

data/lib/instagram/connection.rb

@@ -10,7 +10,6 @@ module Instagram
       options = {
         :headers => {'Accept' => "application/#{format}; charset=utf-8", 'User-Agent' => user_agent},
         :proxy => proxy,
-        :ssl => {:verify => false},
         :url => endpoint,
       }
 

data/lib/instagram/oauth.rb

@@ -4,6 +4,7 @@ module Instagram
     # Return URL for OAuth authorization
     def authorize_url(options={})
       options[:response_type] ||= "code"
+      options[:scope] ||= scope if !scope.nil? && !scope.empty?
       params = authorization_params.merge(options)
       connection.build_url("/oauth/authorize/", params).to_s
     end

data/lib/instagram/version.rb

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

data/spec/instagram/api_spec.rb

@@ -32,6 +32,7 @@ describe Instagram::API do
         @configuration = {
           :client_id => 'CID',
           :client_secret => 'CS',
+          :scope => 'comments relationships',
           :access_token => 'AT',
           :adapter => :typhoeus,
           :endpoint => 'http://tumblr.com/',
@@ -93,6 +94,24 @@ describe Instagram::API do
       url = client.authorize_url(:redirect_uri => redirect_uri)
       url.should_not include("client_secret")
     end
+
+    describe "scope param" do
+      it "should include the scope if there is one set" do
+        params = { :scope => "comments likes" }
+        client = Instagram::Client.new(params)
+        redirect_uri = 'http://localhost:4567/oauth/callback'
+        url = client.authorize_url(:redirect_uri => redirect_uri)
+        url.should include("scope")
+      end
+
+      it "should not include the scope if the scope is blank" do
+        params = { :scope => "" }
+        client = Instagram::Client.new(params)
+        redirect_uri = 'http://localhost:4567/oauth/callback'
+        url = client.authorize_url(:redirect_uri => redirect_uri)
+        url.should_not include("scope")
+      end
+    end
   end
 
   describe ".get_access_token" do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: instagram
 version: !ruby/object:Gem::Version
-  version: 0.10.0
-  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
 - Shayne Sweeney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -73,7 +65,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,7 +75,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -92,7 +82,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,7 +89,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,7 +99,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -122,7 +109,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -130,7 +116,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -227,6 +212,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/Instagram/instagram-ruby-gem
 licenses: []
+metadata: {}
 post_install_message: ! "********************************************************************************\n\n
   \ Follow @instagramapi 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"
@@ -234,25 +220,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4446393396504694126
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: instagram
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby wrapper for the Instagram API
 test_files:
 - spec/faraday/response_spec.rb
@@ -308,3 +289,4 @@ test_files:
 - spec/instagram/client_spec.rb
 - spec/instagram_spec.rb
 - spec/spec_helper.rb
+has_rdoc: