facebooker 1.0.29 → 1.0.30

data/test/facebooker/rails_integration_test.rb

@@ -1,17 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../rails_test_helper')
 
-ActionController::Routing::Routes.draw do |map|
-  map.connect '', :controller=>"facebook",:conditions=>{:canvas=>true}
-  map.connect '', :controller=>"plain_old_rails"
-  map.resources :comments, :controller=>"plain_old_rails"
-  map.connect 'require_auth/:action', :controller => "controller_which_requires_facebook_authentication"
-  map.connect 'require_install/:action', :controller => "controller_which_requires_application_installation"
-  map.connect ':controller/:action/:id', :controller => "plain_old_rails"
-end  
-
 module FBConnectTestHelpers
   def setup_fb_connect_cookies(params=cookie_hash_for_auth)
-    params.each {|k,v| @request.cookies[ENV['FACEBOOK_API_KEY']+k] = CGI::Cookie.new(ENV['FACEBOOK_API_KEY']+k,v)} 
+    params.each {|k,v| @request.cookies[ENV['FACEBOOK_API_KEY']+k] = CGI::Cookie.new(ENV['FACEBOOK_API_KEY']+k,v)}
   end
 
   def expired_cookie_hash_for_auth
@@ -193,7 +184,7 @@ class RailsIntegrationTestForNonFacebookControllers < Test::Unit::TestCase
 
   def test_url_for_links_to_callback_if_canvas_is_false_and_in_canvas
     get :link_test
-    assert_match /test.host/,@response.body
+    assert_match(/test.host/, @response.body)
   end
   
   def test_named_route_doesnt_include_canvas_path_when_not_in_canvas
@@ -444,33 +435,33 @@ class RailsIntegrationTest < Test::Unit::TestCase
     assert_match "http-equiv", @response.body
     assert_match "http://www.facebook.com/login.php?api_key=1234567&v=1.0".to_json, @response.body
     assert_match "http://www.facebook.com/login.php?api_key=1234567&amp;v=1.0", @response.body
-  end  
-  
+  end
+
   def test_url_for_links_to_canvas_if_canvas_is_true_and_not_in_canvas
     get :link_test, facebook_params(:fb_sig_in_canvas=>0,:canvas=>true)
-    assert_match /apps.facebook.com/,@response.body
+    assert_match(/apps.facebook.com/, @response.body)
   end
-  
+
   def test_includes_relative_url_root_when_linked_to_canvas
     get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>true)
-    assert_match /root/,@response.body
+    assert_match(/root/,@response.body)
   end
 
   def test_url_for_links_to_callback_if_canvas_is_false_and_in_canvas
     get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>false)
-    assert_match /test.host/,@response.body
+    assert_match(/test.host/,@response.body)
   end
 
   def test_url_for_doesnt_include_url_root_when_not_linked_to_canvas
     get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>false)
     assert !@response.body.match(/root/)
   end
-  
+
   def test_url_for_links_to_canvas_if_canvas_is_not_set
     get :link_test,facebook_params
-    assert_match /apps.facebook.com/,@response.body
+    assert_match(/apps.facebook.com/,@response.body)
   end
-  
+
   def test_image_tag
     get :image_test, facebook_params
     assert_equal "<img alt=\"Image\" src=\"http://root.example.com/images/image.png\" />",@response.body
@@ -660,35 +651,35 @@ class RailsHelperTest < Test::Unit::TestCase
     assert_equal "<fb:add-section-button section=\"info\" />",@h.fb_add_info_section
   end
 
-  def test_fb_name_with_invalid_key
+  def test_fb_name_with_invalid_key_sizee
     assert_raises(ArgumentError) {@h.fb_name(1234, :sizee => false)}
   end
 
   def test_fb_name
     assert_equal "<fb:name uid=\"1234\"></fb:name>",@h.fb_name("1234")
   end
-    
+
   def test_fb_name_with_transformed_key
     assert_equal "<fb:name uid=\"1234\" useyou=\"true\"></fb:name>", @h.fb_name(1234, :use_you => true)
   end
-  
+
   def test_fb_name_with_user_responding_to_facebook_id
     user = flexmock("user", :facebook_id => "5678")
     assert_equal "<fb:name uid=\"5678\"></fb:name>", @h.fb_name(user)
   end
-  
-  def test_fb_name_with_invalid_key
+
+  def test_fb_name_with_invalid_key_linkd
     assert_raises(ArgumentError) {@h.fb_name(1234, :linkd => false)}
   end
-  
+
   def test_fb_tabs
     assert_equal "<fb:tabs></fb:tabs>", @h.fb_tabs{}
   end
-  
+
   def test_fb_tab_item
     assert_equal "<fb:tab-item href=\"http://www.google.com\" title=\"Google\" />", @h.fb_tab_item("Google", "http://www.google.com")
   end
-  
+
   def test_fb_tab_item_raises_exception_for_invalid_option
     assert_raises(ArgumentError) {@h.fb_tab_item("Google", "http://www.google.com", :alignn => :right)}
   end
@@ -708,10 +699,6 @@ class RailsHelperTest < Test::Unit::TestCase
     assert_equal "<fb:multi-friend-selector actiontext=\"This is a message\" exclude_ids=\"1,2\" max=\"20\" showborder=\"false\" />", @h.fb_multi_friend_selector("This is a message",:exclude_ids=>"1,2")
   end
 
-  def test_fb_comments
-    assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"7\" showform=\"true\" xid=\"a:1\" />", @h.fb_comments("a:1",true,false,7,:showform=>true)
-  end
-  
   def test_fb_title
     assert_equal "<fb:title>This is the canvas page window title</fb:title>", @h.fb_title("This is the canvas page window title")
   end
@@ -919,9 +906,15 @@ class RailsHelperTest < Test::Unit::TestCase
   def test_fb_create_button
     assert_equal "<fb:create-button href=\"/growingpets/invite\">Invite Friends</fb:create-button>", @h.fb_create_button('Invite Friends', '/growingpets/invite')
   end
-  def test_fb_comments
-    assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"4\" optional=\"false\" xid=\"xxx\"></fb:comments>", @h.fb_comments("xxx",true,false,4,:optional=>false) 
+
+  def test_fb_comments_a_1
+    assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"7\" showform=\"true\" xid=\"a:1\"></fb:comments>", @h.fb_comments("a:1",true,false,7,:showform=>true)
   end
+
+  def test_fb_comments_xxx
+    assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"4\" optional=\"false\" xid=\"xxx\"></fb:comments>", @h.fb_comments("xxx",true,false,4,:optional=>false)
+  end
+
   def test_fb_comments_with_title
     assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"4\" optional=\"false\" xid=\"xxx\"><fb:title>TITLE</fb:title></fb:comments>", @h.fb_comments("xxx",true,false,4,:optional=>false, :title => "TITLE") 
   end
@@ -971,6 +964,8 @@ class RailsHelperTest < Test::Unit::TestCase
   def test_init_fb_connect_with_features_and_body
     @h.expects(:capture).returns("Body Content")
     
+    __in_erb_template = true
+
     @h.init_fb_connect("XFBML") do
     end
     assert @h.output_buffer =~ /Body Content/
@@ -1001,13 +996,15 @@ class RailsHelperTest < Test::Unit::TestCase
     action = Facebooker::Rails::Publisher::UserAction.new
     assert_equal @h.fb_user_action(action,"message","prompt"),"FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", \"message\");"
   end
-  
-  
+
+
   def test_fb_connect_javascript_tag
-    assert_equal "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php\" type=\"text/javascript\"></script>",
-      @h.fb_connect_javascript_tag
+    silence_warnings do
+      assert_equal "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php\" type=\"text/javascript\"></script>",
+        @h.fb_connect_javascript_tag
+    end
   end
-  
+
   def test_fb_container
     @h.expects(:capture).returns("Inner Stuff")
     @h.fb_container(:condition=>"somejs") do
@@ -1155,19 +1152,23 @@ class RailsPrettyErrorsTest < Test::Unit::TestCase
     post :pass, facebook_params
     assert_response 200
   end
-  
+
   def test_pretty_errors_disabled_error
     Facebooker.apply_configuration('api_key'=>"1234", 'secret_key'=>"34278",'canvas_page_name'=>'mike','pretty_errors'=>false)
-    post :fail, facebook_params
+    silence_warnings do
+      post :fail, facebook_params
+    end
     assert_response :error
   end
-  
+
   def test_pretty_errors_enabled_success
     post :pass, facebook_params
     assert_response 200
   end
   def test_pretty_errors_enabled_error
-    post :fail, facebook_params
+    silence_warnings do
+      post :fail, facebook_params
+    end
     assert_response 200
   end
 end

data/test/facebooker/session_test.rb

@@ -14,19 +14,19 @@ class Facebooker::SessionTest < Test::Unit::TestCase
 
   def teardown
     Facebooker::Session.configuration_file_path = nil
-    super    
+    super
   end
-  
+
   def test_install_url_escapes_optional_next_parameter
     session = Facebooker::CanvasSession.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
     assert_equal("http://www.facebook.com/install.php?api_key=1234567&v=1.0&next=next_url%3Fa%3D1%26b%3D2", session.install_url(:next => "next_url?a=1&b=2"))
   end
-  
+
   def test_can_get_api_and_secret_key_from_environment
     assert_equal('1234567', Facebooker::Session.api_key)
-    assert_equal('7654321', Facebooker::Session.secret_key)    
+    assert_equal('7654321', Facebooker::Session.secret_key)
   end
-  
+
   def test_if_keys_are_not_available_via_environment_then_they_are_gotten_from_a_file
     ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'] = nil
     flexmock(File).should_receive(:read).with(File.expand_path("~/.facebookerrc")).once.and_return('{:api => "foo"}')

data/test/rack/facebook_test.rb

@@ -1,8 +1,7 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require 'rack/facebook'
 require 'rack/lint'
 require 'rack/mock'
-require 'ruby-debug'
 
 class Rack::FacebookTest < Test::Unit::TestCase
   
@@ -59,4 +58,4 @@ class Rack::FacebookTest < Test::Unit::TestCase
     assert_equal 400, response.status
   end
 
-end
+end

data/test/rails_test_helper.rb

@@ -1,8 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
+tmp = $-w
+$-w = nil
 require 'action_controller'
 require 'action_controller/test_process'
 require 'active_record'
+$-w = tmp
 gem 'rails'
 require 'initializer'
 require File.dirname(__FILE__)+'/../init'
@@ -11,3 +14,14 @@ require 'facebooker/rails/helpers/fb_connect'
 require 'facebooker/rails/helpers'
 require 'facebooker/rails/publisher'
 require 'facebooker/rails/facebook_form_builder'
+
+ActionController::Routing::Routes.draw do |map|
+  map.connect '', :controller=>"facebook",:conditions=>{:canvas=>true}
+  map.connect '', :controller=>"plain_old_rails"
+  map.resources :comments, :controller=>"plain_old_rails"
+  map.connect 'require_auth/:action', :controller => "controller_which_requires_facebook_authentication"
+  map.connect 'require_install/:action', :controller => "controller_which_requires_application_installation"
+  silence_warnings do
+    map.connect ':controller/:action/:id', :controller => "plain_old_rails"
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'rubygems'
+
 begin
   require 'multi_rails_init'
 rescue LoadError
@@ -24,16 +25,16 @@ require 'facebooker/rails/test_helpers'
 
 class Test::Unit::TestCase
   include Facebooker::Rails::TestHelpers
-    
+
   private
-  
+
   def expect_http_posts_with_responses(*responses_xml)
     mock_http = establish_session
     responses_xml.each do |xml_string|
       mock_http.should_receive(:post_form).and_return(xml_string).once.ordered(:posts)
-    end   
+    end
   end
-  
+
   def establish_session(session = @session)
     mock = flexmock(Net::HTTP).should_receive(:post_form).and_return(example_auth_token_xml).once.ordered(:posts)
     mock.should_receive(:post_form).and_return(example_get_session_xml).once.ordered(:posts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors: 
 - Chad Fowler
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -04:00
+date: 2009-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,26 +34,36 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.11.0
+        version: 1.12.1
     version: 
-description: "Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:  * Idiomatic Ruby * No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem) * Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available * Well tested"
+description: |-
+  Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:
+  
+  * Idiomatic Ruby
+  * No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem)
+  * Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available
+  * Well tested
 email: mmangino@elevatedrails.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
+- Manifest.txt
 - CHANGELOG.rdoc
 - COPYING.rdoc
 - README.rdoc
 - TODO.rdoc
 files: 
-- COPYING.rdoc
+- .autotest
 - CHANGELOG.rdoc
+- COPYING.rdoc
+- Manifest.txt
 - README.rdoc
 - Rakefile
 - TODO.rdoc
-- generators/publisher/publisher_generator.rb
+- examples/desktop_login.rb
+- facebooker.gemspec
 - generators/facebook/facebook_generator.rb
 - generators/facebook/templates/config/facebooker.yml
 - generators/facebook/templates/public/javascripts/facebooker.js
@@ -84,10 +94,12 @@ files:
 - generators/facebook_scaffold/templates/view_new.html.erb
 - generators/facebook_scaffold/templates/view_show.fbml.erb
 - generators/facebook_scaffold/templates/view_show.html.erb
-- generators/xd_receiver/xd_receiver_generator.rb
+- generators/publisher/publisher_generator.rb
 - generators/xd_receiver/templates/xd_receiver.html
+- generators/xd_receiver/xd_receiver_generator.rb
 - init.rb
 - install.rb
+- lib/facebooker.rb
 - lib/facebooker/adapters/adapter_base.rb
 - lib/facebooker/adapters/bebo_adapter.rb
 - lib/facebooker/adapters/facebook_adapter.rb
@@ -121,8 +133,8 @@ files:
 - lib/facebooker/models/work_info.rb
 - lib/facebooker/parser.rb
 - lib/facebooker/rails/controller.rb
-- lib/facebooker/rails/cucumber/world.rb
 - lib/facebooker/rails/cucumber.rb
+- lib/facebooker/rails/cucumber/world.rb
 - lib/facebooker/rails/extensions/action_controller.rb
 - lib/facebooker/rails/extensions/rack_setup.rb
 - lib/facebooker/rails/extensions/routing.rb
@@ -132,8 +144,8 @@ files:
 - lib/facebooker/rails/facebook_session_handling.rb
 - lib/facebooker/rails/facebook_url_helper.rb
 - lib/facebooker/rails/facebook_url_rewriting.rb
-- lib/facebooker/rails/helpers/fb_connect.rb
 - lib/facebooker/rails/helpers.rb
+- lib/facebooker/rails/helpers/fb_connect.rb
 - lib/facebooker/rails/integration_session.rb
 - lib/facebooker/rails/profile_publisher_extensions.rb
 - lib/facebooker/rails/publisher.rb
@@ -144,7 +156,6 @@ files:
 - lib/facebooker/service.rb
 - lib/facebooker/session.rb
 - lib/facebooker/version.rb
-- lib/facebooker.rb
 - lib/net/http_multipart_post.rb
 - lib/rack/facebook.rb
 - lib/tasks/facebooker.rake
@@ -157,6 +168,7 @@ files:
 - test/facebooker/batch_request_test.rb
 - test/facebooker/data_test.rb
 - test/facebooker/logging_test.rb
+- test/facebooker/mobile_test.rb
 - test/facebooker/model_test.rb
 - test/facebooker/models/event_test.rb
 - test/facebooker/models/user_test.rb
@@ -169,11 +181,13 @@ files:
 - test/fixtures/multipart_post_body_with_single_file.txt
 - test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt
 - test/net/http_multipart_post_test.rb
+- test/rack/facebook_test.rb
 - test/rails_test_helper.rb
 - test/test_helper.rb
-- test/facebooker/mobile_test.rb
 has_rdoc: true
 homepage: http://facebooker.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -195,12 +209,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: facebooker
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API]
 test_files: 
-- test/facebooker_test.rb
 - test/facebooker/adapters_test.rb
 - test/facebooker/admin_test.rb
 - test/facebooker/batch_request_test.rb
@@ -208,11 +221,12 @@ test_files:
 - test/facebooker/logging_test.rb
 - test/facebooker/mobile_test.rb
 - test/facebooker/model_test.rb
-- test/facebooker/rails_integration_test.rb
-- test/facebooker/server_cache_test.rb
-- test/facebooker/session_test.rb
 - test/facebooker/models/event_test.rb
 - test/facebooker/models/user_test.rb
 - test/facebooker/rails/publisher_test.rb
+- test/facebooker/rails_integration_test.rb
+- test/facebooker/server_cache_test.rb
+- test/facebooker/session_test.rb
+- test/facebooker_test.rb
 - test/net/http_multipart_post_test.rb
 - test/rack/facebook_test.rb