em-instagram 0.1.1 → 0.1.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2QyOTk3MTc1NjA0ODQ2MjljYzU2OWJhOTc2MjI5NGRkNTM1ZTkyMQ==
+  data.tar.gz: !binary |-
+    YmY5NDU1ODc3MzBlNGU5ZTA0ZWQ3MDA5YTUzMzllN2U5NDA0YTVlMA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MmYyMDY3MzFhNGRhY2NjYTYxNDFhNWNlMzdhYTAzNzM0MmYzM2E1MDI5Mzdl
+    ZjljYjYxM2E4NjcxZjkxMjM1Y2MxOWU4ZGE5Y2RhMDk2YzgyYTU0NDVmZDNi
+    MTAxMmU0NzJjYmMwYjA2MjY4NTQ1MDIxZGMxYzZhZjZlOTQ0OGU=
+  data.tar.gz: !binary |-
+    OWY3ODVlNThmZWJjMTNkZmJkN2I3ZDM4MmU5MmNmMjIxNWYxMjNmYjYwZDFi
+    NzQ1NjkyNWRhZTVhNzBjZWVmZjFlNGFmODA1NmJhOTgwNzNlNWFhMzBjMGI5
+    MjBhMzNmMTQyNjJhNTYxYmM3YmMyOGFlZjM3NDE5NmVkODRhN2Y=

data/lib/em-instagram/request.rb

@@ -10,11 +10,15 @@ module EventMachine
 
     protected
       def process_instagram_response(response)
-        case response.response_header.status
-        when 200
-          succeed JSON.parse(response.response)['data']
-        else
-          fail JSON.parse(response.response)['meta']['error_message']
+        begin
+          case response.response_header.status
+          when 200
+            succeed JSON.parse(response.response)['data']
+          else
+            fail JSON.parse(response.response)['meta']['error_message']
+          end
+        rescue JSON::ParserError
+          fail "Invalid JSON returned: #{response.response}"
         end
       end
     end

data/lib/em-instagram/server.rb

@@ -22,9 +22,19 @@ module EventMachine
           response.status = 200
           response.content = params['hub.challenge']
         when 'POST'
-          @updates.push(*JSON.load(@http_post_content))
-          response.status = 202
-          response.content = 'Accepted'
+          if valid_instagram_response?
+            begin
+              @updates.push(*JSON.load(@http_post_content))
+              response.status = 202
+              response.content = 'Accepted'
+            rescue JSON::ParserError
+              response.status = 400
+              response.content = "Invalid JSON"
+            end
+          else
+            response.status = 401
+            response.content = "Invalid Request"
+          end
         else
           response.status = 405
           response.content = 'Method Not Allowed'
@@ -34,7 +44,22 @@ module EventMachine
       end
 
       def process_update
-        @updates.pop { |data| subscriber.receive_notification data; EventMachine::next_tick { process_update } }
+        @updates.pop { |data| self.subscriber.receive_notification data; EventMachine::next_tick { process_update } }
+      end
+
+      def valid_instagram_response?
+        return false if @http_headers.to_s.size == 0
+        sig_arr = @http_headers.split("\x00").select do |header|
+          header.include?("X-Hub-Signature".downcase)
+        end
+        sig = if sig_arr.size > 0
+          sig_arr.first.split(":").last.strip
+        else
+          nil
+        end
+        digest = OpenSSL::Digest::Digest.new('sha1')
+        verify_signature = OpenSSL::HMAC.hexdigest(digest, self.subscriber.client_secret, @http_post_content)
+        sig && sig == verify_signature
       end
 
     end

data/lib/em-instagram/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Instagram
-    VERSION = '0.1.1'
+    VERSION = '0.1.3'
   end
 end

data/spec/request_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe EventMachine::Instagram::Request do
+
+  before :each do
+
+  end
+
+  it "should call the succeed callback passing the data as an argument with a valid request" do
+    body = "{\"data\":{\"mykey\":\"myvalue\"}}"
+    conn = double("connection")
+    conn.stub(:errback)
+    conn.stub(:callback)
+    response_header = double('rheader')
+    response_header.stub(:status => 200)
+    response = double('response')
+    response.stub(:response_header => response_header)
+    response.stub(:response => body)
+    req = EventMachine::Instagram::Request.new(conn)
+    req.should_receive(:succeed).with({"mykey" => "myvalue"})
+    req.send(:process_instagram_response, response)
+  end
+
+  it "should call the fail callback if it receives invalid JSON" do
+    body = "<html><body>There was an error</body></html>"
+    conn = double("connection")
+    conn.stub(:errback)
+    conn.stub(:callback)
+    response_header = double('rheader')
+    response_header.stub(:status => 500)
+    response = double('response')
+    response.stub(:response_header => response_header)
+    response.stub(:response => body)
+    req = EventMachine::Instagram::Request.new(conn)
+    req.should_receive(:fail).with("Invalid JSON returned")
+    req.send(:process_instagram_response, response)
+  end
+end

data/spec/server_spec.rb

@@ -49,6 +49,7 @@ describe EventMachine::Instagram::Server do
     @response.should_receive(:status=).with(202)
     @response.should_receive(:content=).with("Accepted")
     server = EventMachine::ServerStub.new
+    server.stub(:valid_instagram_response? => true)
     server.http_request_method = "POST"
     server.http_post_content = json.to_json
     server.updates = []

metadata

@@ -1,20 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: em-instagram
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Joe Pym
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNakNDQWhxZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREEvTVJBd0RnWURWUVFEREFkcWIy
+  VXUKY0hsdE1SWXdGQVlLQ1pJbWlaUHlMR1FCR1JZR2JXOXpZV2xqTVJNd0VR
+  WUtDWkltaVpQeUxHUUJHUllEWTI5dApNQjRYRFRFek1ETXdOVEU0TVRrME5G
+  b1hEVEUwTURNd05URTRNVGswTkZvd1B6RVFNQTRHQTFVRUF3d0hhbTlsCkxu
+  QjViVEVXTUJRR0NnbVNKb21UOGl4a0FSa1dCbTF2YzJGcFl6RVRNQkVHQ2dt
+  U0pvbVQ4aXhrQVJrV0EyTnYKYlRDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFB
+  RGdnRVBBRENDQVFvQ2dnRUJBUGFYbEVtd2JGY0czRnRLSGZOUApXdHpoZ2lJ
+  U0d0S1JnNkFubVdHNkFKcXNSZkNDaDBBUjhlUDRWMURBMFRWM29DRGJoamtp
+  Tjg0QXp0SUMzd1Q2ClpUMGdNWkwra2NwZUdVejFCT21rSmFjcC8zUE9jQUlr
+  VGp1dEFjTXg0N1B0WW5FSkpvd3FUYkJiYTZJYStLZEwKclVEZCtRQ2IzdS9i
+  MGZ4N3o5MmR2ZkZuRFdKY2lMdXlvY0dTT3pUMDBaNWRDSlV6WmNRZzA2eWFH
+  QlVCWlRlUAo4OTRoWXNTT2pwajJOdlpPNnBoVGlxaVZ0cm1hM0VPVVZuVDdL
+  cW5pZWt4QVV5Tk1BeUdhNzBRV243VURkRTNuCnpqb2xvV3NxTmI4bU85NTVj
+  cFdMbWFicTlEOS9XODhkYzNzUVZHK1FlcWNVTHpTTnNBSEt4MDhIZ1ZkdG03
+  a00KNkw4Q0F3RUFBYU01TURjd0NRWURWUjBUQkFJd0FEQWRCZ05WSFE0RUZn
+  UVVKbnZNNFdNcThPT3p5Q2hoSTYwTwpDdWtxQWtNd0N3WURWUjBQQkFRREFn
+  U3dNQTBHQ1NxR1NJYjNEUUVCQlFVQUE0SUJBUUFNalNNVk1uSVV2VVRFClJF
+  RFRYUjAyaGh3ancrb1Zzcks5Tk1YVkJZZDV5VzZ6d1RVa2l2KzI2aHllbk1S
+  dDdVQW85ZGF1WXlEQ2ZSVWcKTDkyK2J0NXZoYzkwRzVPeWREUUFPSCtFWnBH
+  Mkdlc1Fzcy9ya0ZvbTdlY3N6WWV3ZlZXSVhpeVRURWhTeXFyZQp3MGZBN1FZ
+  UmVVSHBlMEpiS1dmRW9CcG5QazRyL2tidHZobXZESklYdnM1TmZ6eVJyU25u
+  S29jRHI1T29RK2lPCldoa2ZabTFyOTgyWTRLWmg4eVI5aVp4QURQSjBVMDJn
+  cWkwT1ZqMjAvRCsvcjJxRkNqV2cwVjAzdTdGNDg2UkwKbkVBa3lXL3NaTjRX
+  Q29RbmpoeDF3MmYrd2FnVURBTzY4L0E1U0kxaUdyZVlRb3VvN1lRS0xNWC9p
+  WlFKYng2QwpzTERtRXdUcgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
 date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +47,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +54,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +61,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +68,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +75,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +82,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +89,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,36 +115,37 @@ files:
 - spec/api/media_spec.rb
 - spec/api/subscriptions_spec.rb
 - spec/em-instagram_spec.rb
+- spec/request_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - spec/api/media_spec.rb
 - spec/api/subscriptions_spec.rb
 - spec/em-instagram_spec.rb
+- spec/request_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
 has_rdoc: