instagram 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjMwYTJjMDZmZjY3NmM4M2UzN2Q2MTZiMmIzMjJkMDQ3YWY2NThmMQ==
+    M2Y3MDRiMGZmYTMzMzk1MDVkYTc3MGRjYTBjNWM5ZjFhMjY5NDA4Zg==
   data.tar.gz: !binary |-
-    NjVhMWE1ZjRiNDVhODI5ZTQ1MzhlOTg1NjQyZDRkZTgyMzMxMjFmZg==
+    ZTY4N2RkYzBmYTdkNWZlM2ExNTgzN2FjNzhmYWQ5OGU3YjA0M2JiYg==
 SHA512:
   metadata.gz: !binary |-
-    NmRmYzc4Y2FkYjMxYTEzNTkxYzViNmQxNTUwOWZlZjMwNmVmNDU1MmI3NzE0
-    ODg1Y2M2Y2YyNGM5NTY1M2I1MDAxM2Y3NThlMTAyYjQxNjIxY2ZlMTgwYzhk
-    NzRlMTk4NDJkY2JkMWQ4YmY4MTUyNDJkMmQyMjliODNkMGMxOGM=
+    NjY2Nzg2MjM1YmIwYTM5MDVjYzRiMmZlNDdlNDY1YWFlYzZhN2ExMWE2NDZm
+    NTI0NzIxNDkxMTNiMWIxYWMyZGMzZjE1ZGYxOWM2YWQ1MGQ3ZWEwMzJmZWU3
+    NjJmMGEzMWY5YTUyZGQwOGIxZGIyOWZmNDk0ZjhiMDU3N2QwYjY=
   data.tar.gz: !binary |-
-    ODRmODMzZjY3Y2JjNWE4OGJhOTEzMzQxNGRmN2VhNDJjNGNkZGM1YWNmOGVh
-    NmZkMWZiYTM1MTc4MWE1MzRlMzllNzJjZTg5OTUyMzQ3NmU5YTI5ZGQ5MDAx
-    YmI2MmU1OWM3YWI2ZDNiNjkzNzA0ODIxMDRjZDIwYTkxMWRjMTM=
+    ZmZhOTBhYTRiODQ1ZjE5ODZjM2RlN2IwYzBjMWM5NDUxMGQwYmM5MmQ3YWEx
+    YjQ5YzRjMTFjODUxOTVmNGE0ZGMyMDNjNzVlMWY0NmNlYTAzYjM2MzBhY2Vi
+    ODE3YTljY2ViYjdiZmZlNzRjNGM0YmUwMmRhZWE3MTAzYTcwYjc=

data/README.md

@@ -250,5 +250,5 @@ Complete your CLA here: [https://code.facebook.com/cla](https://code.facebook.co
 Copyright
 ---------
 Copyright (c) 2014, Facebook, Inc. All rights reserved.
-By contributing to Instgram Ruby Gem, you agree that your contributions will be licensed under its BSD license.
+By contributing to Instagram Ruby Gem, you agree that your contributions will be licensed under its BSD license.
 See [LICENSE](https://github.com/Instagram/instagram-ruby-gem/blob/master/LICENSE.md) for details.

data/instagram.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake', '~> 0.9.2.2')
   s.add_development_dependency('rspec', '~> 2.4')
   s.add_development_dependency('webmock', '~> 1.6')
-  s.add_development_dependency('bluecloth', '~> 2.0.11')
+  s.add_development_dependency('bluecloth', '~> 2.2.0')
   s.add_runtime_dependency('faraday', ['>= 0.7', '< 0.10'])
   s.add_runtime_dependency('faraday_middleware', ['>= 0.8', '< 0.10'])
   s.add_runtime_dependency('multi_json', '>= 1.0.3', '~> 1.0')

data/lib/instagram/client/locations.rb

@@ -23,6 +23,7 @@ module Instagram
       # @overload location_recent_media(id, options={})
       #   @param user [Integer] An Instagram location ID.
       #   @param options [Hash] A customizable set of options.
+      #   @option options [Integer] :max_timestamp (nil) Return media before this UNIX timestamp
       #   @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.
       #   @return [Hashie::Mash]

data/lib/instagram/client/media.rb

@@ -21,6 +21,25 @@ module Instagram
         response
       end
 
+      # Returns extended information of a given media item
+      #
+      # @overload media_shortcode(shortcode)
+      #   @param shortcode [String] An Instagram media item shortcode
+      #   @return [Hashie::Mash] The requested media item.
+      #   @example Return extended information for media item with shortcode 'D'
+      #     Instagram.media_shortcode('D')
+      # @format none
+      # @authenticated false unless requesting media from a protected user
+      #
+      #   If getting this data of a protected user, you must authenticate (and be allowed to see that user).
+      # @rate_limited true
+      # @see http://instagram.com/developer/endpoints/media/#get_media_by_shortcode
+      def media_shortcode(*args)
+        shortcode = args.first
+        response = get("media/shortcode/#{shortcode}", {}, false, false, true)
+        response
+      end
+
       # Returns a list of the overall most popular media
       #
       # @overload media_popular(options={})

data/lib/instagram/client/subscriptions.rb

@@ -126,7 +126,7 @@ module Instagram
       end
 
       # Public: As a security measure, all updates from Instagram are signed using
-      # X-Hub-Signature: sha1=XXXX where XXX is the sha1 of the json payload
+      # X-Hub-Signature: XXXX where XXX is the sha1 of the json payload
       # using your application secret as the key.
       #
       # Example:
@@ -143,9 +143,7 @@ module Instagram
           raise ArgumentError, "client_secret must be set during configure"
         end
 
-        if request_signature = headers['X-Hub-Signature'] || headers['HTTP_X_HUB_SIGNATURE'] and
-           signature_parts = request_signature.split('sha1=')
-          request_signature = signature_parts[1]
+        if request_signature = headers['X-Hub-Signature'] || headers['HTTP_X_HUB_SIGNATURE']
           calculated_signature = OpenSSL::HMAC.hexdigest('sha1', client_secret, body)
           calculated_signature == request_signature
         end

data/lib/instagram/client/tags.rb

@@ -23,12 +23,12 @@ module Instagram
       # @overload tag_recent_media(tag, options={})
       #   @param tag-name [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] :min_id (nil) Returns results with an ID greater than (that is, newer than) or equal to the specified ID.
+      #   @option options [Integer] :max_tag_id (nil) Returns results with an ID less than (that is, older than) or equal to the specified ID. The value can be retrieved from the returned response via pagination.max_tag_id.
+      #   @option options [Integer] :min_tag_id (nil) Returns results with an ID greater than (that is, newer than) or equal to the specified ID. The value can be retrieved from the returned response via pagination.min_tag_id.
       #   @return [Hashie::Mash]
       #   @example Return a list of the most recent media items tagged "cat"
       #     Instagram.tag_recent_media('cat')
-      # @see http://instagram.com/developer/endpoints/tags/#get_tags_media_recent
+      # @see https://instagram.com/developer/endpoints/tags/#get_tags_media_recent
       # @format :json
       # @authenticated false
       # @rate_limited true

data/lib/instagram/request.rb

@@ -5,22 +5,22 @@ module Instagram
   # Defines HTTP request methods
   module Request
     # Perform an HTTP GET request
-    def get(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper)
+    def get(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper())
       request(:get, path, options, signature, raw, unformatted, no_response_wrapper)
     end
 
     # Perform an HTTP POST request
-    def post(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper)
+    def post(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper())
       request(:post, path, options, signature, raw, unformatted, no_response_wrapper)
     end
 
     # Perform an HTTP PUT request
-    def put(path, options={},  signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper)
+    def put(path, options={},  signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper())
       request(:put, path, options, signature, raw, unformatted, no_response_wrapper)
     end
 
     # Perform an HTTP DELETE request
-    def delete(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper)
+    def delete(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper())
       request(:delete, path, options, signature, raw, unformatted, no_response_wrapper)
     end
 
@@ -43,7 +43,8 @@ module Instagram
       end
       return response if raw
       return response.body if no_response_wrapper
-      return Response.create( response.body )
+      return Response.create( response.body, {:limit => response.headers['x-ratelimit-limit'].to_i,
+                                              :remaining => response.headers['x-ratelimit-remaining'].to_i} )
     end
 
     def formatted_path(path)

data/lib/instagram/response.rb

@@ -1,16 +1,21 @@
 module Instagram
   module Response
-    def self.create( response_hash )
+    def self.create( response_hash, ratelimit_hash )
       data = response_hash.data.dup rescue response_hash
       data.extend( self )
       data.instance_exec do
-        @pagination = response_hash.pagination
-        @meta = response_hash.meta
+        %w{pagination meta}.each do |k|
+          response_hash.public_send(k).tap do |v|
+            instance_variable_set("@#{k}", v) if v
+          end
+        end
+        ratelimit = ::Hashie::Mash.new(ratelimit_hash)
       end
       data
     end
 
     attr_reader :pagination
     attr_reader :meta
+    attr_reader :ratelimit
   end
 end

data/lib/instagram/version.rb

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

data/spec/fixtures/media_shortcode.json

@@ -0,0 +1 @@
+{"meta":{"code":200},"data":{"attribution":null,"tags":["youknowitslate"],"type":"image","location":null,"comments":{"count":3,"data":[{"created_time":"1295535132","text":"Nice","from":{"username":"newyorkcity","profile_picture":"http:\/\/images.ak.instagram.com\/profiles\/profile_1483611_75sq_1391632115.jpg","id":"1483611","full_name":"newyorkcity"},"id":"20808205"},{"created_time":"1295549402","text":"I hope you guys got some good work done :)","from":{"username":"abelnation","profile_picture":"http:\/\/images.ak.instagram.com\/profiles\/profile_5315_75sq_1391467051.jpg","id":"5315","full_name":"Abel Allison"},"id":"20873301"},{"created_time":"1295556861","text":"Hey do you follow @docpop ?Him, and his friend, made a pretty awesome Instagram Scarf.","from":{"username":"jasonsposa","profile_picture":"http:\/\/photos-c.ak.instagram.com\/hphotos-ak-xaf1\/10616446_1460074390927282_1108706618_a.jpg","id":"102516","full_name":"jason"},"id":"20900554"}]},"filter":"X-Pro II","created_time":"1295525094","link":"http:\/\/instagram.com\/p\/BG9It\/","likes":{"count":52,"data":[{"username":"bailey","profile_picture":"http:\/\/images.ak.instagram.com\/profiles\/profile_120_75sq_1328690799.jpg","id":"120","full_name":"Bailey Siewert"},{"username":"bill","profile_picture":"http:\/\/photos-h.ak.instagram.com\/hphotos-ak-xfa1\/10597268_695384913848791_1949499102_a.jpg","id":"34","full_name":"Bill Bogenschutz"},{"username":"juss0445","profile_picture":"http:\/\/images.ak.instagram.com\/profiles\/profile_1416773_75sq_1296220025.jpg","id":"1416773","full_name":"juss0445"},{"username":"mimidea","profile_picture":"http:\/\/images.ak.instagram.com\/profiles\/profile_1133519_75sq_1361436617.jpg","id":"1133519","full_name":"mimi\ud83d\udc95"}]},"images":{"low_resolution":{"url":"http:\/\/scontent-a.cdninstagram.com\/hphotos-xfa1\/outbound-distillery\/t0.0-17\/OBPTH\/media\/2011\/01\/20\/6248835b0acd48d39d7ee606937ae9f7_6.jpg","width":306,"height":306},"thumbnail":{"url":"http:\/\/scontent-a.cdninstagram.com\/hphotos-xfa1\/outbound-distillery\/t0.0-17\/OBPTH\/media\/2011\/01\/20\/6248835b0acd48d39d7ee606937ae9f7_5.jpg","width":150,"height":150},"standard_resolution":{"url":"http:\/\/scontent-a.cdninstagram.com\/hphotos-xfa1\/outbound-distillery\/t0.0-17\/OBPTH\/media\/2011\/01\/20\/6248835b0acd48d39d7ee606937ae9f7_7.jpg","width":612,"height":612}},"users_in_photo":[],"caption":{"created_time":"1295525094","text":"#youknowitslate when the cab driver wishes you good morning","from":{"username":"mikeyk","profile_picture":"http:\/\/images.ak.instagram.com\/profiles\/profile_4_75sq_1374110869.jpg","id":"4","full_name":"Mike Krieger"},"id":"20757161"},"user_has_liked":false,"id":"18600493_4","user":{"username":"mikeyk","website":"","profile_picture":"http:\/\/images.ak.instagram.com\/profiles\/profile_4_75sq_1374110869.jpg","full_name":"Mike Krieger","bio":"","id":"4"}}}

data/spec/instagram/client/media_spec.rb

@@ -28,6 +28,27 @@ describe Instagram::Client do
         end
       end
 
+      describe ".media_shortcode" do
+
+        before do
+          stub_get('media/shortcode/BG9It').
+            with(:query => {:access_token => @client.access_token}).
+            to_return(:body => fixture("media_shortcode.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+        end
+
+        it "should get the correct resource" do
+          @client.media_shortcode('BG9It')
+          a_get('media/shortcode/BG9It').
+            with(:query => {:access_token => @client.access_token}).
+            should have_been_made
+        end
+
+        it "should return extended information of a given media item" do
+          media = @client.media_shortcode('BG9It')
+          media.user.username.should == 'mikeyk'
+        end
+      end
+
       describe ".media_popular" do
 
         before do

data/spec/instagram/client/subscriptions_spec.rb

@@ -67,6 +67,29 @@ describe Instagram::Client do
         end
       end
 
+      describe ".validate_update" do
+
+        subject { @client.validate_update(body, headers) }
+
+        context "when calculated signature matches request signature" do
+
+          let(:body) { {foo: "bar"}.to_json }
+          let(:request_signature) { OpenSSL::HMAC.hexdigest('sha1', @client.client_secret, body) }
+          let(:headers) { {"X-Hub-Signature" => request_signature} }
+
+          it { expect(subject).to be_true }
+        end
+
+        context "when calculated signature does not match request signature" do
+
+          let(:body) { {foo: "bar"}.to_json }
+          let(:request_signature) { "going to fail" }
+          let(:headers) { {"X-Hub-Signature" => request_signature} }
+
+          it { expect(subject).to be_false }
+        end
+      end
+
       describe ".process_subscriptions" do
 
         context "without a callbacks block" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instagram
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Shayne Sweeney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - spec/fixtures/media_likes.json
 - spec/fixtures/media_popular.json
 - spec/fixtures/media_search.json
+- spec/fixtures/media_shortcode.json
 - spec/fixtures/media_unliked.json
 - spec/fixtures/mikeyk.json
 - spec/fixtures/oembed.json
@@ -322,6 +323,7 @@ test_files:
 - spec/fixtures/media_likes.json
 - spec/fixtures/media_popular.json
 - spec/fixtures/media_search.json
+- spec/fixtures/media_shortcode.json
 - spec/fixtures/media_unliked.json
 - spec/fixtures/mikeyk.json
 - spec/fixtures/oembed.json