taweili-facebooker 1.0.45 → 1.0.47

data/Manifest.txt

@@ -38,6 +38,7 @@ 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/publisher/publisher_generator.rb
+generators/xd_receiver/templates/xd_receiver_ssl.html
 generators/xd_receiver/templates/xd_receiver.html
 generators/xd_receiver/xd_receiver_generator.rb
 init.rb

data/Rakefile

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-# 
+#
 require 'rubygems'
 require 'hoe'
 begin
@@ -8,19 +8,24 @@ rescue LoadError
   $stderr.puts "Install the multi_rails gem to run tests against multiple versions of Rails"
 end
 
-$: << File.dirname(__FILE__) + '/lib'
-require './lib/facebooker.rb'
+require 'lib/facebooker/version'
+
+HOE = Hoe.spec('facebooker') do
+  self.version = Facebooker::VERSION::STRING
+  self.rubyforge_name = 'facebooker'
+  developer 'Chad Fowler',    'chad@chadfowlwer.com'
+  developer 'Patrick Ewing',  ''
+  developer 'Mike Mangino',   ''
+  developer 'Shane Vitarana', ''
+  developer 'Corey Innis',    ''
+  developer 'Mike Mangino',   'mmangino@elevatedrails.com'
 
-HOE = Hoe.new('facebooker', Facebooker::VERSION::STRING) do |p|
-  p.rubyforge_name = 'facebooker'
-  p.author = ['Chad Fowler', 'Patrick Ewing', 'Mike Mangino', 'Shane Vitarana', 'Corey Innis']
-  p.email = 'mmangino@elevatedrails.com'
-  p.readme_file   = 'README.rdoc'
-  p.history_file  = 'CHANGELOG.rdoc'
-  p.remote_rdoc_dir = '' # Release to root
-  p.test_globs = 'test/**/*_test.rb'
-  p.extra_deps << ['json', '>= 1.0.0']
-  p.extra_rdoc_files  = FileList['*.rdoc']
+  self.readme_file   = 'README.rdoc'
+  self.history_file  = 'CHANGELOG.rdoc'
+  self.remote_rdoc_dir = '' # Release to root
+  self.test_globs = 'test/**/*_test.rb'
+  extra_deps << ['json', '>= 1.0.0']
+  self.extra_rdoc_files  = FileList['*.rdoc']
 end
 
 require 'rcov/rcovtask'

data/facebooker.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.45"
+  s.version = "1.0.47"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis"]
-  s.date = %q{2009-07-24}
+  s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis", "Mike Mangino"]
+  s.date = %q{2009-08-14}
   s.description = %q{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}
-  s.email = %q{mmangino@elevatedrails.com}
+  s.email = ["chad@chadfowlwer.com", "", "", "", "", "mmangino@elevatedrails.com"]
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "COPYING.rdoc", "README.rdoc", "TODO.rdoc"]
-  s.files = [".autotest", "CHANGELOG.rdoc", "COPYING.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "TODO.rdoc", "examples/desktop_login.rb", "facebooker.gemspec", "generators/facebook/facebook_generator.rb", "generators/facebook/templates/config/facebooker.yml", "generators/facebook/templates/public/javascripts/facebooker.js", "generators/facebook_controller/USAGE", "generators/facebook_controller/facebook_controller_generator.rb", "generators/facebook_controller/templates/controller.rb", "generators/facebook_controller/templates/functional_test.rb", "generators/facebook_controller/templates/helper.rb", "generators/facebook_controller/templates/view.fbml.erb", "generators/facebook_controller/templates/view.html.erb", "generators/facebook_publisher/facebook_publisher_generator.rb", "generators/facebook_publisher/templates/create_facebook_templates.rb", "generators/facebook_publisher/templates/publisher.rb", "generators/facebook_scaffold/USAGE", "generators/facebook_scaffold/facebook_scaffold_generator.rb", "generators/facebook_scaffold/templates/controller.rb", "generators/facebook_scaffold/templates/facebook_style.css", "generators/facebook_scaffold/templates/functional_test.rb", "generators/facebook_scaffold/templates/helper.rb", "generators/facebook_scaffold/templates/layout.fbml.erb", "generators/facebook_scaffold/templates/layout.html.erb", "generators/facebook_scaffold/templates/style.css", "generators/facebook_scaffold/templates/view_edit.fbml.erb", "generators/facebook_scaffold/templates/view_edit.html.erb", "generators/facebook_scaffold/templates/view_index.fbml.erb", "generators/facebook_scaffold/templates/view_index.html.erb", "generators/facebook_scaffold/templates/view_new.fbml.erb", "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/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", "lib/facebooker/admin.rb", "lib/facebooker/batch_request.rb", "lib/facebooker/data.rb", "lib/facebooker/feed.rb", "lib/facebooker/logging.rb", "lib/facebooker/mobile.rb", "lib/facebooker/mock/service.rb", "lib/facebooker/mock/session.rb", "lib/facebooker/model.rb", "lib/facebooker/models/affiliation.rb", "lib/facebooker/models/album.rb", "lib/facebooker/models/applicationproperties.rb", "lib/facebooker/models/applicationrestrictions.rb", "lib/facebooker/models/cookie.rb", "lib/facebooker/models/education_info.rb", "lib/facebooker/models/event.rb", "lib/facebooker/models/friend_list.rb", "lib/facebooker/models/group.rb", "lib/facebooker/models/info_item.rb", "lib/facebooker/models/info_section.rb", "lib/facebooker/models/location.rb", "lib/facebooker/models/notifications.rb", "lib/facebooker/models/page.rb", "lib/facebooker/models/photo.rb", "lib/facebooker/models/tag.rb", "lib/facebooker/models/user.rb", "lib/facebooker/models/video.rb", "lib/facebooker/models/work_info.rb", "lib/facebooker/parser.rb", "lib/facebooker/rails/backwards_compatible_param_checks.rb", "lib/facebooker/rails/controller.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", "lib/facebooker/rails/facebook_form_builder.rb", "lib/facebooker/rails/facebook_pretty_errors.rb", "lib/facebooker/rails/facebook_request_fix.rb", "lib/facebooker/rails/facebook_request_fix_2-3.rb", "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.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", "lib/facebooker/rails/routing.rb", "lib/facebooker/rails/test_helpers.rb", "lib/facebooker/rails/utilities.rb", "lib/facebooker/server_cache.rb", "lib/facebooker/service.rb", "lib/facebooker/service/base_service.rb", "lib/facebooker/service/curl_service.rb", "lib/facebooker/service/net_http_service.rb", "lib/facebooker/service/typhoeus_service.rb", "lib/facebooker/service/typhoeus_multi_service.rb", "lib/facebooker/session.rb", "lib/facebooker/version.rb", "lib/net/http_multipart_post.rb", "lib/rack/facebook.rb", "lib/tasks/facebooker.rake", "lib/tasks/tunnel.rake", "rails/init.rb", "setup.rb", "templates/layout.erb", "test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "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/page_test.rb", "test/facebooker/models/photo_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/rails/facebook_request_fix_2-3_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/fixtures/multipart_post_body_with_only_parameters.txt", "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/rails/facebook_url_rewriting_test.rb", "test/facebooker/rails/integration_session_test.rb", "test/facebooker/service_test.rb"]
+  s.files = [".autotest", "CHANGELOG.rdoc", "COPYING.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "TODO.rdoc", "examples/desktop_login.rb", "facebooker.gemspec", "generators/facebook/facebook_generator.rb", "generators/facebook/templates/config/facebooker.yml", "generators/facebook/templates/public/javascripts/facebooker.js", "generators/facebook_controller/USAGE", "generators/facebook_controller/facebook_controller_generator.rb", "generators/facebook_controller/templates/controller.rb", "generators/facebook_controller/templates/functional_test.rb", "generators/facebook_controller/templates/helper.rb", "generators/facebook_controller/templates/view.fbml.erb", "generators/facebook_controller/templates/view.html.erb", "generators/facebook_publisher/facebook_publisher_generator.rb", "generators/facebook_publisher/templates/create_facebook_templates.rb", "generators/facebook_publisher/templates/publisher.rb", "generators/facebook_scaffold/USAGE", "generators/facebook_scaffold/facebook_scaffold_generator.rb", "generators/facebook_scaffold/templates/controller.rb", "generators/facebook_scaffold/templates/facebook_style.css", "generators/facebook_scaffold/templates/functional_test.rb", "generators/facebook_scaffold/templates/helper.rb", "generators/facebook_scaffold/templates/layout.fbml.erb", "generators/facebook_scaffold/templates/layout.html.erb", "generators/facebook_scaffold/templates/style.css", "generators/facebook_scaffold/templates/view_edit.fbml.erb", "generators/facebook_scaffold/templates/view_edit.html.erb", "generators/facebook_scaffold/templates/view_index.fbml.erb", "generators/facebook_scaffold/templates/view_index.html.erb", "generators/facebook_scaffold/templates/view_new.fbml.erb", "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/publisher/publisher_generator.rb", "generators/xd_receiver/templates/xd_receiver_ssl.html", "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", "lib/facebooker/admin.rb", "lib/facebooker/batch_request.rb", "lib/facebooker/data.rb", "lib/facebooker/feed.rb", "lib/facebooker/logging.rb", "lib/facebooker/mobile.rb", "lib/facebooker/mock/service.rb", "lib/facebooker/mock/session.rb", "lib/facebooker/model.rb", "lib/facebooker/models/affiliation.rb", "lib/facebooker/models/album.rb", "lib/facebooker/models/applicationproperties.rb", "lib/facebooker/models/applicationrestrictions.rb", "lib/facebooker/models/cookie.rb", "lib/facebooker/models/education_info.rb", "lib/facebooker/models/event.rb", "lib/facebooker/models/friend_list.rb", "lib/facebooker/models/group.rb", "lib/facebooker/models/info_item.rb", "lib/facebooker/models/info_section.rb", "lib/facebooker/models/location.rb", "lib/facebooker/models/notifications.rb", "lib/facebooker/models/page.rb", "lib/facebooker/models/photo.rb", "lib/facebooker/models/tag.rb", "lib/facebooker/models/user.rb", "lib/facebooker/models/video.rb", "lib/facebooker/models/work_info.rb", "lib/facebooker/parser.rb", "lib/facebooker/rails/backwards_compatible_param_checks.rb", "lib/facebooker/rails/controller.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", "lib/facebooker/rails/facebook_form_builder.rb", "lib/facebooker/rails/facebook_pretty_errors.rb", "lib/facebooker/rails/facebook_request_fix.rb", "lib/facebooker/rails/facebook_request_fix_2-3.rb", "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.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", "lib/facebooker/rails/routing.rb", "lib/facebooker/rails/test_helpers.rb", "lib/facebooker/rails/utilities.rb", "lib/facebooker/server_cache.rb", "lib/facebooker/service.rb", "lib/facebooker/service/base_service.rb", "lib/facebooker/service/curl_service.rb", "lib/facebooker/service/net_http_service.rb", "lib/facebooker/service/typhoeus_service.rb", "lib/facebooker/service/typhoeus_multi_service.rb", "lib/facebooker/session.rb", "lib/facebooker/version.rb", "lib/net/http_multipart_post.rb", "lib/rack/facebook.rb", "lib/tasks/facebooker.rake", "lib/tasks/tunnel.rake", "rails/init.rb", "setup.rb", "templates/layout.erb", "test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "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/page_test.rb", "test/facebooker/models/photo_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/rails/facebook_request_fix_2-3_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/fixtures/multipart_post_body_with_only_parameters.txt", "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/rails/facebook_url_rewriting_test.rb", "test/facebooker/rails/integration_session_test.rb", "test/facebooker/service_test.rb"]
   s.homepage = %q{http://facebooker.rubyforge.org}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/generators/xd_receiver/templates/xd_receiver_ssl.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head>
+    <title>Cross-Domain Receiver Page</title>
+</head>
+<body>
+    <script src="https://www.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script>
+</body>
+</html>

data/lib/facebooker/batch_request.rb

@@ -1,6 +1,6 @@
 module Facebooker
   class BatchRequest
-    instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^respond_to\?$|^new$)/ }
+    instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^respond_to\?$|^new|object_id$)/ }
     attr_reader :uri
     attr_reader :method
     class UnexecutedRequest < StandardError; end

data/lib/facebooker/models/user.rb

@@ -104,6 +104,11 @@ module Facebooker
       @friends_hash[cache_key]
     end
 
+    def friend_ids
+      options = {:uid => self.id}
+      @session.post('facebook.friends.get', options, false)
+    end
+
     ###
     # Publish a post into the stream on the user's Wall and News Feed.  This
     # post also appears in the user's friend's streams.  The +publish_stream+
@@ -123,12 +128,16 @@ module Facebooker
     #     :href => 'http://tenderlovemaking.com/'
     #   ])
     def publish_to target, options = {}
+      
+      attachment = options[:attachment]
+      links = options[:action_links]
       @session.post('facebook.stream.publish',
-                    :uid        => self.id,
-                    :target_id  => target.id,
-                    :message    => options[:message],
-                    :attachment => Facebooker.json_encode(options[:attachment]),
-                    :action_links => Facebooker.json_encode(options[:action_links])
+                    { :uid        => self.id,
+                      :target_id  => target.id,
+                      :message    => options[:message],
+                      :attachment => attachment && Facebooker.json_encode(attachment),
+                      :action_links => links && Facebooker.json_encode(links) }, 
+                    false
                    )
     end
     
@@ -176,10 +185,14 @@ module Facebooker
     end
     
     def friends_with_this_app
-      @friends_with_this_app ||= session.post('facebook.friends.getAppUsers').map do |uid|
+      @friends_with_this_app ||= friend_ids_with_this_app.map do |uid|
         User.new(uid, session)
       end
     end
+
+    def friend_ids_with_this_app
+      @friend_ids_with_this_app ||= session.post('facebook.friends.getAppUsers')
+    end
     
     def groups(gids = [])
       args = gids.empty? ? {} : {:gids => gids}
@@ -361,7 +374,7 @@ module Facebooker
     ##
     # Checks to see if the user has enabled the given extended permission
     def has_permission?(ext_perm) # ext_perm = email, offline_access, status_update, photo_upload, create_listing, create_event, rsvp_event, sms
-      session.post('facebook.users.hasAppPermission',:ext_perm=>ext_perm) == "1"
+      session.post('facebook.users.hasAppPermission', {:ext_perm=>ext_perm, :uid => uid}, false) == "1"
     end    
     
     ##

data/lib/facebooker/parser.rb

@@ -59,14 +59,14 @@ module Facebooker
     def self.element(name, data)
       data = data.body rescue data # either data or an HTTP response
       begin
-        xml = Nokogiri::XML(data.strip).at(name)
+        xml = Nokogiri::XML(data.strip)
         if node = xml.at(name)
           return node
         end
         if xml.root.name == name
           return xml.root
         end
-      rescue # Can't parse with Nokogiri
+      rescue NameError # Can't parse with Nokogiri
         doc = REXML::Document.new(data)
         doc.elements.each(name) do |element|
           return element
@@ -414,18 +414,19 @@ module Facebooker
   class FqlMultiquery < Parser#nodoc
     def self.process(data)
       root = element('fql_multiquery_response', data)
-      root.elements.collect do |elm|
-        [
-         elm.elements[1].text,
-          if elm.elements[2].elements[1].nil?
-            [] 
+      root.children.reject { |child| child.text? }.map do |elm|
+        elm.children.reject { |child| child.text? }.map do |query|
+          if 'name' == query.name
+            query.text
           else
-            [
-             elm.elements[2].elements[1].name,
-             array_of_hashes(elm.elements[2], elm.elements[2].elements[1].name)
-            ]
+            list = query.children.reject { |child| child.text? }
+            if list.length == 0
+              []
+            else
+              [list.first.name, array_of_hashes(query, list.first.name)]
+            end
           end
-        ]
+        end
       end
     end
   end

data/lib/facebooker/rails/backwards_compatible_param_checks.rb

@@ -16,7 +16,7 @@ module Facebooker::Rails::BackwardsCompatibleParamChecks
     def zero_or_false( value )
       case value
         when String then
-          value == "0"
+          value.empty? || value == "0"
         when Numeric then
           value.to_f == 0.0
         when FalseClass then

data/lib/facebooker/rails/controller.rb

@@ -205,10 +205,6 @@ module Facebooker
           end
         end
       end
-            
-      def blank?(value)
-        (value == '0' || value.nil? || value == '')        
-      end
 
       def verified_facebook_params
         facebook_sig_params = params.inject({}) do |collection, pair|
@@ -229,12 +225,11 @@ module Facebooker
       
       def verify_signature(facebook_sig_params,expected_signature)
         # Don't verify the signature if rack has already done so.
-        if ::Rails.version >= "2.3"
-          return if ActionController::Dispatcher.middleware.include? Rack::Facebook
+        unless ::Rails.version >= "2.3" and ActionController::Dispatcher.middleware.include? Rack::Facebook
+          raw_string = facebook_sig_params.map{ |*args| args.join('=') }.sort.join
+          actual_sig = Digest::MD5.hexdigest([raw_string, Facebooker::Session.secret_key].join)
+          raise Facebooker::Session::IncorrectSignature if actual_sig != expected_signature
         end
-        raw_string = facebook_sig_params.map{ |*args| args.join('=') }.sort.join
-        actual_sig = Digest::MD5.hexdigest([raw_string, Facebooker::Session.secret_key].join)
-        raise Facebooker::Session::IncorrectSignature if actual_sig != expected_signature
         raise Facebooker::Session::SignatureTooOld if facebook_sig_params['time'] && Time.at(facebook_sig_params['time'].to_f) < earliest_valid_session
         true
       end
@@ -243,11 +238,11 @@ module Facebooker
         @facebook_parameter_conversions ||= Hash.new do |hash, key| 
           lambda{|value| value}
         end.merge(
-          'time' => lambda{|value| Time.at(value.to_f)},
-          'in_canvas' => lambda{|value| !blank?(value)},
-          'added' => lambda{|value| !blank?(value)},
-          'expires' => lambda{|value| blank?(value) ? nil : Time.at(value.to_f)},
-          'friends' => lambda{|value| value.split(/,/)}
+          'time'      => lambda{|value| Time.at(value.to_f)},
+          'in_canvas' => lambda{|value| one_or_true(value)},
+          'added'     => lambda{|value| one_or_true(value)},
+          'expires'   => lambda{|value| zero_or_false(value) ? nil : Time.at(value.to_f)},
+          'friends'   => lambda{|value| value.split(/,/)}
         )
       end
       

data/lib/facebooker/rails/helpers/fb_connect.rb

@@ -3,11 +3,13 @@ module Facebooker
     module Helpers
       module FbConnect
         
-        def fb_connect_javascript_tag
+        def fb_connect_javascript_tag(options = {})
+          lang = "/#{options[:lang]}" if options[:lang]
+          # dont use the javascript_include_tag helper since it adds a .js at the end
           if request.ssl?
-            javascript_include_tag "https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"
+            "<script src=\"https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php#{lang}\" type=\"text/javascript\"></script>"
           else
-            javascript_include_tag "http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"
+            "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php#{lang}\" type=\"text/javascript\"></script>"
           end
         end
         

data/lib/facebooker/rails/helpers.rb

@@ -739,6 +739,57 @@ module Facebooker
         tag "fb:time",stringify_vals({:t => time.to_i}.merge(options))
       end
       
+      # Renders a fb:intl element
+      #
+      # Example:
+      # <%= fb_intl('Age', :desc => 'Label for the age form field', :delimiters => '[]') %>
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:intl for
+      # more details
+      def fb_intl(text=nil, options={}, &proc)
+        raise ArgumentError, "Missing block or text" unless block_given? or text
+        content = block_given? ? capture(&proc) : text
+        content_tag("fb:intl", content, stringify_vals(options))
+      end
+
+      # Renders a fb:intl-token element
+      #
+      # Example:
+      # <%= fb_intl-token('number', 5) %>
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:intl-token for
+      # more details
+      def fb_intl_token(name, text=nil, &proc)
+        raise ArgumentError, "Missing block or text" unless block_given? or text
+        content = block_given? ? capture(&proc) : text
+        content_tag("fb:intl-token", content, stringify_vals({:name => name}))
+      end
+
+      # Renders a fb:date element
+      #
+      # Example:
+      # <%= fb_date(Time.now, :format => 'verbose', :tz => 'America/New York') %>
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:date for
+      # more details
+      def fb_date(time, options={})
+        tag "fb:date", stringify_vals({:t => time.to_i}.merge(options))
+      end
+
+      # Renders a fb:fbml-attribute element
+      #
+      # Example:
+      # <%= fb_fbml_attribute('title', Education) %>
+      #
+      # The options hash is passed to the fb:intl element that is generated inside this element
+      # and can have the keys available for the fb:intl element.
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:fbml-attribute for
+      # more details
+      def fb_fbml_attribute(name, text, options={})
+        content_tag("fb:fbml-attribute", fb_intl(text, options), stringify_vals({:name => name}))
+      end
+
       protected
       
       def cast_to_facebook_id(object)

data/lib/facebooker/rails/publisher.rb

@@ -101,10 +101,14 @@ module Facebooker
         @controller           = PublisherController.new(self)
       end
 
-      def default_url_options
+      def self.default_url_options
         {:host => Facebooker.canvas_server_base + Facebooker.facebook_path_prefix}
       end
 
+      def default_url_options
+        self.class.default_url_options
+      end
+
       # use facebook options everywhere
       def request_comes_from_facebook?
         true
@@ -130,6 +134,13 @@ module Facebooker
           end
         end
         
+        def deactivate
+          Facebooker::Session.create.deactivate_template_bundle_by_id(self.bundle_id)
+          return true
+        rescue Facebooker::Session::TemplateBundleInvalid => e
+          return false
+        end
+
         
         
         class << self
@@ -138,6 +149,7 @@ module Facebooker
             publisher = setup_publisher(klass,method)            
             template_id = Facebooker::Session.create.register_template_bundle(publisher.one_line_story_templates,publisher.short_story_templates,publisher.full_story_template,publisher.action_links)
             template = find_or_initialize_by_template_name(template_name(klass,method))
+            template.deactivate if template.bundle_id  # deactivate old templates to avoid exceeding templates/app limit
             template.bundle_id = template_id
             template.content_hash = hashed_content(klass,method) if template.respond_to?(:content_hash)
             template.save!
@@ -166,12 +178,8 @@ module Facebooker
           
           def find_in_db(klass,method)
             template = find_by_template_name(template_name(klass,method))
-            if template and template.template_changed?(hashed_content(klass,method))
-              template.destroy
-              template = nil
-            end
             
-            if template.nil?
+            if template.nil? || template.template_changed?(hashed_content(klass, method))
               template = register(klass,method)
             end
             template
@@ -465,7 +473,16 @@ module Facebooker
       end
       ActionController::Routing::Routes.named_routes.install(self.master_helper_module)
       include self.master_helper_module
+
       class << self
+
+        def register_all_templates_on_all_applications
+          Facebooker.with_all_applications do
+            puts "Registering templates for #{Facebooker.api_key}"
+            register_all_templates
+          end
+        end
+
         
         def register_all_templates
           all_templates = instance_methods.grep(/_template$/) - %w(short_story_template full_story_template one_line_story_template) 

data/lib/facebooker/service/base_service.rb

@@ -6,6 +6,7 @@ class Facebooker::Service::BaseService
   def post_params(params)
     post_params = {}
     params.each do |k,v|
+      k = k.to_s unless k.is_a?(String)
       if Array === v || Hash === v
         post_params[k] = Facebooker.json_encode(v)       
       else
@@ -15,4 +16,4 @@ class Facebooker::Service::BaseService
     post_params
   end
   
-end
+end

data/lib/facebooker/session.rb

@@ -100,11 +100,11 @@ module Facebooker
 
     def login_url(options={})
       options = default_login_url_options.merge(options)
-      "#{Facebooker.login_url_base(@api_key)}#{login_url_optional_parameters(options)}"
+      "#{Facebooker.login_url_base}#{login_url_optional_parameters(options)}"
     end
 
     def install_url(options={})
-      "#{Facebooker.install_url_base(@api_key)}#{install_url_optional_parameters(options)}"
+      "#{Facebooker.install_url_base}#{install_url_optional_parameters(options)}"
     end
 
     # The url to get user to approve extended permissions
@@ -414,6 +414,14 @@ module Facebooker
       post("facebook.feed.registerTemplateBundle", parameters, false)
     end
 
+    ##
+    # Deactivate a template bundle with Facebook.
+    # Returns true if a bundle with the specified id is active and owned by this app.
+    # Useful to avoid exceeding the 100 templates/app limit.
+    def deactivate_template_bundle_by_id(template_bundle_id)
+      post("facebook.feed.deactivateTemplateBundleByID", {:template_bundle_id => template_bundle_id.to_s}, false)
+    end
+
     ##
     # publish a previously rendered template bundle
     # see http://wiki.developers.facebook.com/index.php/Feed.publishUserAction

data/lib/facebooker/version.rb

@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 45
+    TINY  = 47
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/facebooker.rb

@@ -95,6 +95,24 @@ module Facebooker
       end
     end
 
+    def all_api_keys
+      [
+        @raw_facebooker_configuration['api_key']
+      ] + (
+        @raw_facebooker_configuration['alternative_keys'] ?
+        @raw_facebooker_configuration['alternative_keys'].keys :
+        []
+      )
+    end
+
+    def with_all_applications(&block)
+      all_api_keys.each do |current_api_key|
+        with_application(current_api_key) do
+          block.call
+        end
+      end
+    end
+
     def fetch_config_for(api_key)
       if @raw_facebooker_configuration['api_key'] == api_key
         return @raw_facebooker_configuration

data/test/facebooker/models/user_test.rb

@@ -137,7 +137,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   end
   def test_publish_to_converts_attachment_to_json
     @user = Facebooker::User.new(548871286, @session)
-    @user.session.expects(:post).with("facebook.stream.publish",has_entry(:attachment=>instance_of(String)))
+    @user.session.expects(:post).with("facebook.stream.publish",has_entry(:attachment=>instance_of(String)),false)
     @user.publish_to(@other_user, :message => 'i love you man',:attachment=>{:a=>"b"})
   end
 

data/test/facebooker/rails/facebook_url_rewriting_test.rb

@@ -11,7 +11,7 @@ class Facebooker::Rails::FacebookUrlRewritingTest < Test::Unit::TestCase
   def test_one_or_true_on_string_1
     assert @rewriter.one_or_true( "1" )
   end
-  
+
   def test_one_or_true_on_string_0
     assert !@rewriter.one_or_true( "0" )
   end
@@ -23,7 +23,7 @@ class Facebooker::Rails::FacebookUrlRewritingTest < Test::Unit::TestCase
   def test_one_or_true_on_float_1
     assert @rewriter.one_or_true( 1.0 )
   end
-  
+
   def test_one_or_true_on_true
     assert @rewriter.one_or_true( true )
   end
@@ -36,4 +36,41 @@ class Facebooker::Rails::FacebookUrlRewritingTest < Test::Unit::TestCase
     assert !@rewriter.one_or_true( nil )
   end
 
+
+  def test_zero_or_false_on_blank
+    assert @rewriter.zero_or_false( "" )
+  end
+
+  def test_zero_or_false_on_integer_0
+    assert @rewriter.zero_or_false( 0 )
+  end
+
+  def test_zero_or_false_on_float_0
+    assert @rewriter.zero_or_false( 0.0 )
+  end
+
+  def test_zero_or_false_on_string_0
+    assert @rewriter.zero_or_false( "0" )
+  end
+
+  def test_zero_or_false_on_false
+    assert @rewriter.zero_or_false( false )
+  end
+
+  def test_zero_or_false_on_nil
+    assert @rewriter.zero_or_false( nil )
+  end
+
+  def test_zero_or_false_on_string_1
+    assert !@rewriter.zero_or_false( "1" )
+  end
+
+  def test_zero_or_false_on_numeric_1
+    assert !@rewriter.zero_or_false( 1 )
+  end
+
+  def test_zero_or_false_on_true
+    assert !@rewriter.zero_or_false( true )
+  end
+
 end

data/test/facebooker/rails/integration_session_test.rb

@@ -1,10 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../rails_test_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../../../lib/facebooker/rails/integration_session')
+
 class Facebooker::Rails::IntegrationSessionTest < Test::Unit::TestCase 
+
   def test_include_api_key_in_default_request_params
     ENV['FACEBOOK_API_KEY'] = 'a key'
     integration_session = Facebooker::Rails::IntegrationSession.new
     integration_session.reset!
     assert_equal 'a key', integration_session.default_request_params[ :fb_sig_api_key ]
   end
+
 end

data/test/facebooker/rails/publisher_test.rb

@@ -141,7 +141,6 @@ end
 
 class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
   FacebookTemplate = Facebooker::Rails::Publisher::FacebookTemplate
-  include Facebooker::Rails::TestHelpers
 
   def setup
     super
@@ -187,14 +186,6 @@ class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
     FacebookTemplate.find_in_db(TestPublisher,"simple_user_action")
   end
 
-  def test_find_in_db_should_destroy_old_record_if_changed
-    FacebookTemplate.stubs(:find_by_template_name).returns(@template)
-    FacebookTemplate.stubs(:hashed_content).returns("MY CONTENT")
-    @template.stubs(:template_changed?).returns(true)
-    @template.expects(:destroy)
-    FacebookTemplate.find_in_db(TestPublisher,"simple_user_action")
-  end
-
   def test_find_in_db_should_re_register_if_changed
     FacebookTemplate.stubs(:find_by_template_name).with("1234567: TestPublisher::simple_user_action").returns(@template)
     FacebookTemplate.stubs(:hashed_content).returns("MY CONTENT")
@@ -203,6 +194,7 @@ class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
     FacebookTemplate.expects(:register).with(TestPublisher,"simple_user_action").returns(@template)
     FacebookTemplate.find_in_db(TestPublisher,"simple_user_action")
   end
+
 end
 
 class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
@@ -332,6 +324,20 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
    Facebooker::Rails::Publisher::FacebookTemplate.expects(:register)
     TestPublisher.register_user_action
   end
+
+  def test_register_should_deactivate_template_bundle_if_exists
+    @template = mock
+    @template.stubs(:bundle_id).returns(999)
+    @template.stubs(:bundle_id=)
+    @template.stubs(:save!)
+    @session = mock
+    @session.stubs(:register_template_bundle).returns(1000)
+    Facebooker::Session.stubs(:create).returns(@session)
+    Facebooker::Rails::Publisher::FacebookTemplate.stubs(:find_or_initialize_by_template_name).returns(@template)
+    @template.expects(:deactivate)
+    FacebookTemplate.register(TestPublisher, "simple_user_action")
+  end
+
   def test_register_user_action_with_action_links
     ActionController::Base.append_view_path("./test/../../app/views")
     Facebooker::Rails::Publisher::FacebookTemplate.expects(:register)

data/test/facebooker/rails_integration_test.rb

@@ -125,10 +125,6 @@ class PlainOldRailsController < ActionController::Base
   end
 end
 
-class Test::Unit::TestCase
-  include Facebooker::Rails::TestHelpers
-end
-
 
 # you can't use asset_recognize, because it can't pass parameters in to the requests
 class UrlRecognitionTests < Test::Unit::TestCase
@@ -332,6 +328,16 @@ class RailsIntegrationTest < Test::Unit::TestCase
     get :index, facebook_params('fb_sig_added' => "1")
     assert_equal(true, @controller.facebook_params['added'])
   end
+
+  def test_facebook_params_convert_added_to_boolean_false_when_already_false
+    get :index, facebook_params('fb_sig_added' => false)
+    assert_equal(false, @controller.facebook_params['added'])
+  end
+
+  def test_facebook_params_convert_added_to_boolean_true_when_already_true
+    get :index, facebook_params('fb_sig_added' => true)
+    assert_equal(true, @controller.facebook_params['added'])
+  end
   
   def test_facebook_params_convert_expirey_into_nil
     get :index, facebook_params(:fb_sig_expires => '0')
@@ -429,7 +435,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
     setup_fb_connect_cookies
     get :index
     assert_equal(77777, @controller.facebook_session.user.id)
-    end
+  end
   
   def test_session_does_NOT_secure_with_expired_cookies
     setup_fb_connect_cookies(expired_cookie_hash_for_auth)
@@ -547,6 +553,23 @@ class RailsSignatureTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new    
 
   end
+
+  if Rails.version < '2.3'
+  
+    def test_should_raise_on_bad_sig
+      begin
+        get :fb_params_test, facebook_params.merge('fb_sig' => 'incorrect')
+        fail "No IncorrectSignature raised"
+      rescue Facebooker::Session::IncorrectSignature=>e
+      end
+    end
+
+    def test_valid_signature
+      @controller.expects(:earliest_valid_session).returns(Time.at(1186588275.5988)-1)
+      get :fb_params_test, facebook_params 
+    end
+
+  end
   
   def test_should_raise_too_old_for_replayed_session
     begin
@@ -556,20 +579,6 @@ class RailsSignatureTest < Test::Unit::TestCase
     end
   end
   
-  def test_should_raise_on_bad_sig
-    begin
-      get :fb_params_test, facebook_params.merge('fb_sig' => 'incorrect')
-      fail "No IncorrectSignature raised"
-    rescue Facebooker::Session::IncorrectSignature=>e
-    end
-  end
-  
-  def test_valid_signature
-    @controller.expects(:earliest_valid_session).returns(Time.at(1186588275.5988)-1)
-    get :fb_params_test, facebook_params
-    
-  end
-  
 end
 class RailsHelperTest < Test::Unit::TestCase
   class HelperClass
@@ -1072,13 +1081,17 @@ class RailsHelperTest < Test::Unit::TestCase
   def test_fb_logout_link
     assert_equal @h.fb_logout_link("Logout","My URL"),"<a href=\"#\" onclick=\"FB.Connect.logoutAndRedirect(&quot;My URL&quot;);; return false;\">Logout</a>"
   end
+
   def test_fb_user_action_with_literal_callback
     action = Facebooker::Rails::Publisher::UserAction.new
-    assert_equal @h.fb_user_action(action,"message","prompt","function() {alert('hi')}"),"FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, function() {alert('hi')}, \"prompt\", {\"value\": \"message\"});"
+    assert_equal "FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, function() {alert('hi')}, \"prompt\", #{{"value" => "message"}.to_json});",
+                 @h.fb_user_action(action,"message","prompt","function() {alert('hi')}")
   end
+
   def test_fb_user_action_with_nil_callback
     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\", {\"value\": \"message\"});"
+    assert_equal "FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", #{{"value" => "message"}.to_json});",
+                 @h.fb_user_action(action,"message","prompt")
   end
 
 
@@ -1089,6 +1102,13 @@ class RailsHelperTest < Test::Unit::TestCase
     end
   end
 
+  def test_fb_connect_javascript_tag_with_language_option
+    silence_warnings do
+      assert_equal "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US\" type=\"text/javascript\"></script>",
+        @h.fb_connect_javascript_tag(:lang => "en_US")
+    end
+  end
+
   def test_fb_connect_javascript_tag_ssl
     @h.instance_eval do
       def request
@@ -1104,6 +1124,21 @@ class RailsHelperTest < Test::Unit::TestCase
     end
   end
 
+  def test_fb_connect_javascript_tag_ssl_with_language_option
+    @h.instance_eval do
+      def request
+        ssl_request = ActionController::TestRequest.new
+        ssl_request.stubs(:ssl?).returns(true)
+        ssl_request
+      end
+    end
+
+    silence_warnings do
+      assert_equal "<script src=\"https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US\" type=\"text/javascript\"></script>",
+        @h.fb_connect_javascript_tag(:lang => "en_US")
+    end
+  end
+
   def test_fb_container
     @h.expects(:capture).returns("Inner Stuff")
     @h.fb_container(:condition=>"somejs") do

data/test/facebooker/session_test.rb

@@ -245,6 +245,16 @@ class Facebooker::SessionTest < Test::Unit::TestCase
     @session.register_template_bundle(one_line, short_story, full_story)
   end
   
+  def test_can_deactivate_template_bundle_by_id
+    @session = Facebooker::Session.create(ENV['FACBEOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
+    @session.expects(:post).with(
+      'facebook.feed.deactivateTemplateBundleByID',
+      {:template_bundle_id => '999'},
+      false
+    )
+    @session.deactivate_template_bundle_by_id(999)
+  end
+
   def test_can_publish_user_action
     expect_http_posts_with_responses(publish_user_action_return_xml)
     @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])

data/test/rails_test_helper.rb

@@ -15,6 +15,14 @@ require 'facebooker/rails/helpers'
 require 'facebooker/rails/publisher'
 require 'facebooker/rails/facebook_form_builder'
 
+if Rails.version >= '2.3'
+  Test::Unit::TestCase.send :include, ActionController::TestCase::Assertions
+  Test::Unit::TestCase.send :include, ActionController::TestProcess
+  Test::Unit::TestCase.send :include, Facebooker::Rails::TestHelpers
+
+  ActionController::Base.session = { :key => "9hfwfl8slgh9", :secret => "db08fcba0378a9e066ce037bec4b72bc" }
+end
+
 ActionController::Routing::Routes.draw do |map|
   map.connect '', :controller=>"facebook",:conditions=>{:canvas=>true}
   map.connect '', :controller=>"plain_old_rails"

data/test/test_helper.rb

@@ -29,9 +29,9 @@ end
 require 'facebooker'
 require 'facebooker/rails/test_helpers'
 
-
 class Test::Unit::TestCase
-  include Facebooker::Rails::TestHelpers
+
+  include Facebooker::Rails::TestHelpers unless self.included_modules.include?( Facebooker::Rails::TestHelpers )
 
   private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taweili-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.45
+  version: 1.0.47
 platform: ruby
 authors: 
 - Chad Fowler
@@ -9,11 +9,12 @@ authors:
 - Mike Mangino
 - Shane Vitarana
 - Corey Innis
+- Mike Mangino
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 -07:00
+date: 2009-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +38,13 @@ dependencies:
         version: 2.3.2
     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"
-email: mmangino@elevatedrails.com
+email: 
+- chad@chadfowlwer.com
+- ""
+- ""
+- ""
+- ""
+- mmangino@elevatedrails.com
 executables: []
 
 extensions: []
@@ -89,6 +96,7 @@ files:
 - generators/facebook_scaffold/templates/view_show.fbml.erb
 - generators/facebook_scaffold/templates/view_show.html.erb
 - generators/publisher/publisher_generator.rb
+- generators/xd_receiver/templates/xd_receiver_ssl.html
 - generators/xd_receiver/templates/xd_receiver.html
 - generators/xd_receiver/xd_receiver_generator.rb
 - init.rb