fb_rails 1.0.0 → 1.1.0

data/README.rdoc

@@ -21,11 +21,7 @@ or
 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>
+  <%= include_facebook_javascript %>
   <%= fbml 'login-button' %>
 
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 desc 'Default: run unit tests.'
-task :default => :test
+task default: :test
 
 desc 'Test fb_rails.'
 Rake::TestTask.new(:test) do |t|

data/lib/fb_rails.rb

@@ -11,4 +11,4 @@ module FbRails
   autoload :TestHelper
 end
 
-require 'fb_rails/railtie'
+require 'fb_rails/engine'

data/lib/fb_rails/{railtie.rb → engine.rb}

@@ -1,5 +1,5 @@
 module FbRails
-  class Railtie < Rails::Railtie
+  class Railtie < Rails::Engine
     config.facebook = ActiveSupport::OrderedOptions.new
 
     initializer "fb_rails.set_configs" do |app|

data/lib/fb_rails/fb.rb

@@ -1,7 +1,7 @@
 module FbRails
   class Fb
-    delegate :app_id, :secret, :to => 'FbRails::Config'
-    delegate :connected?, :uid, :access_token, :user, :to => :connect
+    delegate :app_id, :secret, to: 'FbRails::Config'
+    delegate :connected?, :uid, :access_token, :user, to: :connect
 
     attr_reader :cookies
     def initialize(cookies)

data/lib/fb_rails/graph.rb

@@ -11,11 +11,11 @@ module FbRails
       end
 
       def get(path, params = {})
-        request(:get, "#{path}?#{build_param_string(params)}")
+        request(:get, "#{path}?#{params.to_param}")
       end
 
       def post(path, params = {})
-        request(:post, path, build_param_string(params))
+        request(:post, path, params.to_param)
       end
 
       private
@@ -35,10 +35,6 @@ module FbRails
           result
         end
 
-        def build_param_string(params)
-          params.map { |key, value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
-        end
-
         def configure_https(http)
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -51,11 +47,11 @@ module FbRails
     end
 
     def post(path, params = {})
-      self.class.post(path, params.merge(:access_token => access_token))
+      self.class.post(path, params.merge(access_token: access_token))
     end
 
     def get(path, params = {})
-      self.class.get(path, params.merge(:access_token => access_token))
+      self.class.get(path, params.merge(access_token: access_token))
     end
   end
 end

data/lib/fb_rails/integration/action_view.rb

@@ -1,6 +1,10 @@
 module FbRails
   module Integration
     module ActionView
+      def include_facebook_javascript(options = {})
+        render options[:async] ? 'fb/async_js' : 'fb/blocking_js'
+      end
+
       def fbml(tag, content = '', options = {})
         if content.is_a?(Hash)
           options = content

data/lib/fb_rails/test_helper.rb

@@ -1,7 +1,7 @@
 module FbRails
   module TestHelper
     def fb_cookie(uid = 42, access_token = 'abc')
-      value = FbRails::Cookie.encode({:uid => uid, :access_token => access_token}, FbRails::Config.secret)
+      value = FbRails::Cookie.encode({uid: uid, access_token: access_token}, FbRails::Config.secret)
       {FbRails::Connect.cookie_name => value}
     end
   end

data/test/cookie_test.rb

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

data/test/integration/action_view_test.rb

@@ -4,6 +4,16 @@ class FbRails::Integration::ActionViewTest < ActiveSupport::TestCase
   include ActionView::Helpers::TagHelper
   include FbRails::Integration::ActionView
 
+  test 'async include_facebook_javascript' do
+    expects(:render).with('fb/async_js')
+    include_facebook_javascript async: true
+  end
+  
+  test 'blocking include_facebook_javascript' do
+    expects(:render).with('fb/blocking_js')
+    include_facebook_javascript
+  end
+
   test 'fbml' do
     assert_equal '<fb:foo></fb:foo>', fbml('foo')
     assert_equal '<fb:foo>bar</fb:foo>', fbml('foo', 'bar')

metadata

@@ -1,44 +1,42 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fb_rails
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-15 00:00:00 -07:00
+date: 2011-06-20 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153045200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2153045200
 description: A Rails 3 gem for the latest facebook API
 email: developer@matthewhiggins.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
 - lib/fb_rails/config.rb
 - lib/fb_rails/connect.rb
 - lib/fb_rails/cookie.rb
+- lib/fb_rails/engine.rb
 - lib/fb_rails/fb.rb
 - lib/fb_rails/graph.rb
 - lib/fb_rails/integration/action_controller.rb
@@ -46,7 +44,6 @@ files:
 - lib/fb_rails/integration.rb
 - lib/fb_rails/log_subscriber.rb
 - lib/fb_rails/mock.rb
-- lib/fb_rails/railtie.rb
 - lib/fb_rails/test_helper.rb
 - lib/fb_rails.rb
 - test/config_test.rb
@@ -64,30 +61,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/matthuhiggins/fb_rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Facebook on Rails
 test_files: []
-