fb_rails 0.2.0 → 0.3.0

data/README.rdoc

@@ -18,6 +18,16 @@ or
   config.facebook.app_id = 'my_app_id'
   config.facebook.secret = 'my_app_secret'
 
+Getting the user logged in is out of the scope of this gem. That's what
+FBML and the Facebook Javascript API are for. Here's an example:
+
+  <div id="fb-root"></div>
+  <script src="http://connect.facebook.net/en_US/all.js"></script>
+  <script>
+    FB.init({appId: '<%= fb.app_id ?>', status: true, cookie: true, xfbml: true});
+  </script>
+  <%= fbml 'login-button' %>
+
 
 == API
 
@@ -36,6 +46,10 @@ Make a request to the Facebook Graph:
   <% result = fb.graph.get '/me' %>
   my name is <%= result['first_name'] %>
 
+Retrieve your Facebook application app_id or secret:
+  fb.app_id
+  fb.secret
+
 
 == Persisting the Facebook User:
 
@@ -46,6 +60,7 @@ This user is accessed with 'fb.user':
 
 For this to work, FbRails assumes there is a model called 'User' with a column 'fb_uid'.
 If your user model name is different than 'User', it can be configured:
+
   config.facebook.user_class_name = 'Author'
 
 If the fb_uid for the current user is not in the database, fb.user is an unsaved instance.
@@ -68,3 +83,4 @@ connections. This is done with FbRails::Mock:
     mock.add 'me', 'first_name' => 'Matt', 'last_name' => 'Higgins'
   end
 
+  Now, a call to 'fb.graph.get 'me' returns the above response.

data/lib/fb_rails.rb

@@ -2,18 +2,12 @@ module FbRails
   extend ActiveSupport::Autoload
 
   autoload :Config
+  autoload :Cookie
   autoload :Connect
   autoload :Graph
   autoload :Fb
   autoload :Mock
   autoload :Integration
-
-  def self.cookie(uid = 42, access_token = 'abc')
-    param_string = "uid=#{uid}&access_token=#{access_token}"
-    payload = "access_token=#{access_token}uid=#{uid}"
-    sig = Digest::MD5.hexdigest("#{payload}#{FbRails::Config.secret}")
-    {FbRails::Connect.cookie_name => "\"#{param_string}&sig=#{sig}\""}
-  end
 end
 
 require 'fb_rails/railtie'

data/lib/fb_rails/connect.rb

@@ -1,5 +1,3 @@
-require 'digest/md5'
-
 module FbRails
   class Connect
     class << self
@@ -16,20 +14,7 @@ module FbRails
     end
 
     def cookie
-      return if (cookie_string = cookies[self.class.cookie_name]).blank?
-
-      hash = Rack::Utils::parse_query(cookie_string.gsub(/^\"|\"$/, ''))
-      sorted_pairs = hash.sort
-  
-      payload = ''
-      sorted_pairs.each do |key, value|
-        payload += "#{key}=#{value}" if key != 'sig'
-      end
-  
-      md5 = Digest::MD5.hexdigest("#{payload}#{FbRails::Config.secret}")
-      if md5 == hash['sig']
-        hash
-      end
+      FbRails::Cookie.decode(cookies[self.class.cookie_name], FbRails::Config.secret)
     end
     memoize :cookie
 

data/lib/fb_rails/cookie.rb

@@ -0,0 +1,32 @@
+require 'digest/md5'
+
+module FbRails
+  class Cookie
+    class << self
+      def decode(cookie_string, secret)
+        return if cookie_string.blank?
+        cookie_string = Rack::Utils.unescape(cookie_string)
+
+        hash = Rack::Utils.parse_query(cookie_string.gsub(/^\"|\"$/, ''))
+
+        payload = ''
+        hash.sort.each do |key, value|
+          payload += "#{key}=#{value}" if key != 'sig'
+        end
+
+        md5 = Digest::MD5.hexdigest("#{payload}#{secret}")
+        if md5 == hash['sig']
+          hash
+        end
+      end
+
+      def encode(attributes, secret)
+        sorted_pairs = attributes.sort.map { |key, value| "#{key}=#{value}" }
+        param_string = sorted_pairs.join('&')
+        payload = sorted_pairs.join('')
+        sig = Digest::MD5.hexdigest("#{payload}#{secret}")
+        "\"#{param_string}&sig=#{sig}\""
+      end
+    end
+  end
+end

data/lib/fb_rails/integration/action_view.rb

@@ -1,8 +1,13 @@
 module FbRails
   module Integration
     module ActionView
-      def fbml(tag, options = nil)
-        content_tag("fb:#{tag}", '', options)
+      def fbml(tag, content = '', options = {})
+        if content.is_a?(Hash)
+          options = content
+          content = ''
+        end
+
+        content_tag("fb:#{tag}", content, options)
       end
     end
   end

data/test/cookie_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class FbRails::CookieTest < ActiveSupport::TestCase
+  test 'decode' do
+    assert_equal(
+      {'a' => '1', 'b' => '2', 'sig' => '25a7f94742b4134695b80f78d4804e35'},
+      FbRails::Cookie.decode("\"a=1&b=2&sig=25a7f94742b4134695b80f78d4804e35\"", 'sekrit')
+    )
+  end
+
+  test 'decode invalid' do
+    assert_nil FbRails::Cookie.decode("\"a=1&b=2&sig=invalid\"", 'sekrit')
+  end
+
+  test 'encode' do
+    assert_equal(
+      "\"a=1&b=2&sig=25a7f94742b4134695b80f78d4804e35\"",
+      FbRails::Cookie.encode({:a => 1, :b => 2}, 'sekrit')
+    )
+  end
+end

data/test/integration/action_view_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class FbRails::Integration::ActionViewTest < ActiveSupport::TestCase
+  include ActionView::Helpers::TagHelper
+  include FbRails::Integration::ActionView
+
+  test 'fbml' do
+    assert_equal '<fb:foo></fb:foo>', fbml('foo')
+    assert_equal '<fb:foo>bar</fb:foo>', fbml('foo', 'bar')
+    assert_equal '<fb:foo faz="baz"></fb:foo>', fbml('foo', 'faz' => 'baz')
+    assert_equal '<fb:foo faz="baz">bar</fb:foo>', fbml('foo', 'bar', 'faz' => 'baz')
+  end
+end

data/test/test_helper.rb

@@ -10,4 +10,9 @@ require 'sample/test_controller'
 FbRails::Config.app_id = 'foo'
 FbRails::Config.secret = 'bar'
 
-
+FbRails.class_eval do
+  def self.cookie(uid = 42, access_token = 'abc')
+    value = FbRails::Cookie.encode({:uid => uid, :access_token => access_token}, FbRails::Config.secret)
+    {FbRails::Connect.cookie_name => value}
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - README.rdoc
 - lib/fb_rails/config.rb
 - lib/fb_rails/connect.rb
+- lib/fb_rails/cookie.rb
 - lib/fb_rails/fb.rb
 - lib/fb_rails/graph.rb
 - lib/fb_rails/integration/action_controller.rb
@@ -57,9 +58,11 @@ files:
 - lib/fb_rails.rb
 - test/config_test.rb
 - test/connect_test.rb
+- test/cookie_test.rb
 - test/fb_test.rb
 - test/graph_test.rb
 - test/helpers/action_controller_test.rb
+- test/integration/action_view_test.rb
 - test/log_subscriber_test.rb
 - test/mock_test.rb
 - test/sample/test_controller.rb