carrot-facebook 0.0.2 → 0.9.0

data/lib/carrot-facebook/middleware.rb

@@ -21,6 +21,7 @@ module Carrot
               begin
                 path_override                  = Yajl::Parser.parse(env[:facebook_data][:app_data], symbolize_keys: true) 
                 env['PATH_INFO']               = path_override[:path] if path_override[:path]
+                env['QUERY_STRING']            = path_override[:params].map { |params| params.join('=') }.join('&') if path_override[:params]
                 env[:facebook_data][:app_data] = path_override
               rescue => e
                 env[:facebook_data][:app_data] = env[:facebook_data][:app_data]

data/lib/carrot-facebook/version.rb

@@ -1,5 +1,5 @@
 module Carrot
   module Facebook
-    VERSION = "0.0.2"
+    VERSION = "0.9.0"
   end
 end

data/spec/middleware_spec.rb

@@ -100,7 +100,7 @@ describe Carrot::Facebook::Middleware do
 
   context "when is a canvas app and sends a valid signed_request" do
     before(:all) do
-      @signed_request = 'signed_request=kUbujwbyaKAS3EMLSolZki1mJtuzY5-XUrchNN3MVyI.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImlzc3VlZF9hdCI6MTMzMTY2NTg5NCwicGFnZSI6eyJpZCI6IjEzNzczOTk4Mjk0MjI3NCIsImxpa2VkIjpmYWxzZSwiYWRtaW4iOnRydWV9LCJ1c2VyIjp7ImNvdW50cnkiOiJ1cyIsImxvY2FsZSI6ImVuX1VTIiwiYWdlIjp7Im1pbiI6MjF9fX0'
+      @signed_request = "signed_request=#{encode_signed_request(@valid_facebook_data)}"
       @request        = Rack::MockRequest.env_for('/', lint: true, fatal: true,  method: 'POST', input: @signed_request)
       @response       = Carrot::Facebook::Middleware.new(@app).call(@request)
     end
@@ -128,7 +128,8 @@ describe Carrot::Facebook::Middleware do
 
   context "when is a canvas app and sends a valid signed_request with app_data" do
     before(:all) do
-      @signed_request = 'signed_request=PGQuysjAoFJBxu2Me_HizoVv8BdiPdm5wBhkcdHZaR0.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImFwcF9kYXRhIjoie1wicGF0aFwiOlwiXC9wYWdlXC90ZXJtc1wifSIsImlzc3VlZF9hdCI6MTMzMTY2OTE4NSwicGFnZSI6eyJpZCI6IjEzNzczOTk4Mjk0MjI3NCIsImxpa2VkIjpmYWxzZSwiYWRtaW4iOnRydWV9LCJ1c2VyIjp7ImNvdW50cnkiOiJ1cyIsImxvY2FsZSI6ImVuX1VTIiwiYWdlIjp7Im1pbiI6MjF9fX0'
+      @data           = @valid_facebook_data.merge({ issued_at: 1331669185, app_data: { path: '/page/terms' } })
+      @signed_request = "signed_request=#{encode_signed_request(@data)}"
       @request        = Rack::MockRequest.env_for('/', lint: true, fatal: true,  method: 'POST', input: @signed_request)
       @response       = Carrot::Facebook::Middleware.new(@app).call(@request)
     end
@@ -150,7 +151,41 @@ describe Carrot::Facebook::Middleware do
     end
 
     it 'should correctly set :facebook_data' do
-      expect(@request[:facebook_data]).to eq @valid_facebook_data.merge({ issued_at: 1331669185, app_data: { path: '/page/terms' } })
+      expect(@request[:facebook_data]).to eq @data
+    end
+  end
+
+  context "when sending a parameter in the request with app_data" do
+    before(:all) do
+      @data           = @valid_facebook_data.merge({ issued_at: 1331669185, app_data: { path: '/page/terms', params: { foo: 'bar' } } })
+      @signed_request = "signed_request=#{encode_signed_request(@data)}"
+      @request        = Rack::MockRequest.env_for('/', lint: true, fatal: true,  method: 'POST', input: @signed_request)
+      @response       = Carrot::Facebook::Middleware.new(@app).call(@request)
+    end
+
+    it 'should properly set parameters passed to app_data on the signed request' do
+      expect(@request[:facebook_data]).to eq @data
+    end
+    
+    it 'should recognize the params object within app_data' do
+      @request[:facebook_data][:app_data][:params].should == {foo: 'bar'}
+    end
+  end
+  
+  context "when sending multiple parameters in the request with app_data" do
+    before(:all) do
+      @data           = @valid_facebook_data.merge({ issued_at: 1331669185, app_data: { path: '/page/terms', params: { foo: 'bar', bar: 'baz', bee: 'bop' } } })
+      @signed_request = "signed_request=#{encode_signed_request(@data)}"
+      @request        = Rack::MockRequest.env_for('/', lint: true, fatal: true,  method: 'POST', input: @signed_request)
+      @response       = Carrot::Facebook::Middleware.new(@app).call(@request)
+    end
+
+    it 'should properly set parameters passed to app_data on the signed request' do
+      expect(@request[:facebook_data]).to eq @data
+    end
+    
+    it 'should recognize the params object within app_data' do
+      @request[:facebook_data][:app_data][:params].should == {foo: 'bar', bar: 'baz', bee: 'bop'}
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,23 @@
 require "rails/all"
+require "json"
+require "base64"
+require "openssl"
 require "carrot-facebook"
 
+module Helpers
+  def encode_signed_request(options)
+    encoded_data      = Base64.urlsafe_encode64( options.to_json ).tr('=', '')
+    digestor          = OpenSSL::Digest::Digest.new('sha256')
+    signature         = OpenSSL::HMAC.digest( digestor, '', encoded_data )
+    encoded_signature = Base64.strict_encode64( signature ).tr("+/", "-_")
+    encoded_signature = encoded_signature.tr('=', '')
+
+    "#{encoded_signature}.#{encoded_data}"
+  end
+end
+
 RSpec.configure do |config|
   config.color_enabled = true
   config.formatter = :documentation
-end
+  config.include Helpers
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrot-facebook
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70332661964060 !ruby/object:Gem::Requirement
+  requirement: &70105908695560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332661964060
+  version_requirements: *70105908695560
 - !ruby/object:Gem::Dependency
   name: p3p
-  requirement: &70332661957000 !ruby/object:Gem::Requirement
+  requirement: &70105908694960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332661957000
+  version_requirements: *70105908694960
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70332661956300 !ruby/object:Gem::Requirement
+  requirement: &70105908694280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332661956300
+  version_requirements: *70105908694280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70332661955860 !ruby/object:Gem::Requirement
+  requirement: &70105908693640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332661955860
+  version_requirements: *70105908693640
 description: Facebook view helpers and signed request handling.
 email:
 - tmilewski@gmail.com