mmangino-facebooker 1.0.16 → 1.0.19

data/Manifest.txt

@@ -49,6 +49,7 @@ 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
@@ -69,14 +70,15 @@ lib/facebooker/models/page.rb
 lib/facebooker/models/photo.rb
 lib/facebooker/models/tag.rb
 lib/facebooker/models/user.rb
-lib/facebooker/models/user.rb.orig
-lib/facebooker/models/user.rb.rej
 lib/facebooker/models/video.rb
 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/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
@@ -94,11 +96,10 @@ lib/facebooker/rails/utilities.rb
 lib/facebooker/server_cache.rb
 lib/facebooker/service.rb
 lib/facebooker/session.rb
-lib/facebooker/session.rb.orig
-lib/facebooker/session.rb.rej
 lib/facebooker/version.rb
 lib/facebooker.rb
 lib/net/http_multipart_post.rb
+lib/rack/facebook.rb
 lib/tasks/facebooker.rake
 lib/tasks/tunnel.rake
 rails/init.rb
@@ -123,3 +124,4 @@ test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt
 test/net/http_multipart_post_test.rb
 test/rails_test_helper.rb
 test/test_helper.rb
+test/facebooker/mobile_test.rb

data/README

@@ -42,5 +42,5 @@ I'm not saying it meets its goals fully yet.  Please help.  I'm especially inter
 
 == Contribute
 
-Please visit the {RubyForge project page}[http://rubyforge.org/projects/facebooker] to get the latest source via svn, write some tests, add/fix features, and submit a patch via the tracker.  If you submit a good patch, it's likely that I'll add you to the project for commit access if you want to be added.
+Please visit the {GitHub page}[http://github.com/mmangino/facebooker/tree/] to get the latest source via svn, write some tests, add/fix features, and submit a patch via the tracker.  If you submit a good patch, it's likely that I'll add you to the project for commit access if you want to be added. 
 

data/README.txt

@@ -22,6 +22,7 @@ Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[h
 == SYNOPSIS:
 
 View David Clements' {excellent tutorial}[http://apps.facebook.com/facebooker_tutorial] at {http://apps.facebook.com/facebooker_tutorial/}[http://apps.facebook.com/facebooker_tutorial] or check out {Developing Facebook Platform Applications with Rails}[http://www.pragprog.com/titles/mmfacer].
+{Join the Mailing List}:[groups.google.com/group/facebooker]
 
 == REQUIREMENTS:
 

data/Rakefile

@@ -3,6 +3,12 @@
 require 'rubygems'
 ENV['RUBY_FLAGS']="-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
 require 'hoe'
+begin
+  require 'load_multi_rails_rake_tasks'
+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'
 
@@ -29,9 +35,10 @@ namespace :test do
   desc 'Aggregate code coverage for unit, functional and integration tests'
   Rcov::RcovTask.new(:coverage) do |t|
     t.libs << "test"
-    t.test_files = FileList["test/*.rb"]
+    t.test_files = FileList["test/**/*_test.rb"]
     t.output_dir = "coverage/"
     t.verbose = true
+    t.rcov_opts = ['--exclude', 'test,/usr/lib/ruby,/Library/Ruby,/System/Library', '--sort', 'coverage']
   end
 end
 

data/init.rb

@@ -9,64 +9,15 @@ FACEBOOKER = Facebooker.load_configuration(facebook_config)
 Facebooker.logger = RAILS_DEFAULT_LOGGER if Object.const_defined? :RAILS_DEFAULT_LOGGER
 
 require 'net/http_multipart_post'
-require 'facebooker/rails/controller'
-require 'facebooker/rails/facebook_url_rewriting'
-require 'facebooker/rails/facebook_session_handling'
-require 'facebooker/rails/facebook_request_fix'
-require 'facebooker/rails/routing'
-require 'facebooker/rails/facebook_pretty_errors' rescue nil
-require 'facebooker/rails/facebook_url_helper'
-module ::ActionController
-  class Base
-    def self.inherited_with_facebooker(subclass)
-      inherited_without_facebooker(subclass)
-      if subclass.to_s == "ApplicationController"
-        subclass.send(:include,Facebooker::Rails::Controller) 
-        subclass.helper Facebooker::Rails::Helpers
-      end
-    end
-    class << self
-      alias_method_chain :inherited, :facebooker
-    end
-  end
-end
-
-class ActionController::Routing::Route
-  def recognition_conditions_with_facebooker
-    defaults = recognition_conditions_without_facebooker 
-    defaults << " env[:canvas] == conditions[:canvas] " if conditions[:canvas]
-    defaults
-  end
-  alias_method_chain :recognition_conditions, :facebooker
-end
-
-# When making get requests, Facebook sends fb_sig parameters both in the query string
-# and also in the post body. We want to ignore the query string ones because they are one
-# request out of date
-# We only do thise when there are POST parameters so that IFrame linkage still works
-class ActionController::AbstractRequest
-  def query_parameters_with_facebooker
-    if request_parameters.blank?
-      query_parameters_without_facebooker
-    else
-      (query_parameters_without_facebooker||{}).reject {|key,value| key.to_s =~ /^fb_sig/}
-    end
-  end
-  
-  alias_method_chain :query_parameters, :facebooker
-end
-
-# We turn off route optimization to make named routes use our code for figuring out if they should go to the session
-# If this fails, it means we're on rails 1.2, we can ignore it
-begin
-  ActionController::Base::optimise_named_routes = false 
-rescue NoMethodError=>e
-  nil
-end
-
-# pull :canvas=> into env in routing to allow for conditions
-ActionController::Routing::RouteSet.send :include,  Facebooker::Rails::Routing::RouteSetExtensions
-ActionController::Routing::RouteSet::Mapper.send :include, Facebooker::Rails::Routing::MapperExtensions
-
-Mime::Type.register_alias "text/html", :fbml
-Mime::Type.register_alias "text/javascript", :fbjs
+if defined? Rails
+  require 'facebooker/rails/controller'
+  require 'facebooker/rails/facebook_url_rewriting'
+  require 'facebooker/rails/facebook_session_handling' if Rails.version < '2.3'
+  require 'facebooker/rails/facebook_request_fix' if Rails.version < '2.3'
+  require 'facebooker/rails/routing'
+  require 'facebooker/rails/facebook_pretty_errors' rescue nil
+  require 'facebooker/rails/facebook_url_helper'
+  require 'facebooker/rails/extensions/rack_setup' if Rails.version > '2.3'
+  require 'facebooker/rails/extensions/action_controller'
+  require 'facebooker/rails/extensions/routing'
+end

data/lib/facebooker/admin.rb

@@ -15,7 +15,7 @@ module Facebooker
     # +properties+: Hash of properties you want to view.
     def get_app_properties(*properties)
       json = @session.post('facebook.admin.getAppProperties', :properties => properties.to_json)
-      hash = JSON.parse(CGI.unescapeHTML(json))
+      hash = Facebooker.json_decode(CGI.unescapeHTML(json))
       @properties = ApplicationProperties.from_hash(hash)
     end
     
@@ -29,7 +29,7 @@ module Facebooker
     # ** BETA ***
     def get_restriction_info(*restrictions)
       json = @session.post('facebook.admin.getRestrictionInfo')
-      hash = JSON.parse(CGI.unescapeHTML(json))
+      hash = Facebooker.json_decode(CGI.unescapeHTML(json))
       @restrictions = ApplicationRestrictions.from_hash(hash)
     end
   

data/lib/facebooker/mobile.rb

@@ -0,0 +1,20 @@
+module Facebooker
+  class Mobile
+    def initialize(session)
+      @session = session
+    end
+  
+    # Used to determine whether the user identified by "uid" has enabled SMS for this application.
+    def can_send(user)
+      @session.post('facebook.sms.canSend', :uid => User.cast_to_facebook_id(user))
+    end
+    
+    # Send the given message to the user.
+    # See http://wiki.developers.facebook.com/index.php/Mobile
+    def send(user, message)
+      @session.post('facebook.sms.send', 
+        {:uid => User.cast_to_facebook_id(user), 
+        :message => message}, false)
+    end
+  end
+end

data/lib/facebooker/models/user.rb

@@ -245,17 +245,17 @@ module Facebooker
     #
     # This does not set profile actions, that should be done with profile_action=
     def profile_fbml=(markup)
-      set_profile_fbml(markup, nil, nil)
+      set_profile_fbml(markup, nil, nil, nil)
     end
     
     ##
     # Set the mobile profile FBML
     def mobile_fbml=(markup)
-      set_profile_fbml(nil, markup, nil)
+      set_profile_fbml(nil, markup, nil,nil)
     end
     
     def profile_action=(markup)
-      set_profile_fbml(nil, nil, markup)
+      set_profile_fbml(nil, nil, markup,nil)
     end
     
     def profile_main=(markup)

data/lib/facebooker/parser.rb

@@ -462,6 +462,18 @@ module Facebooker
     end
   end  
 
+  class SmsSend < Parser#:nodoc:
+    def self.process(data)
+      element('sms_send_response', data).text_value == '0'
+    end
+  end
+  
+  class SmsCanSend < Parser#:nodoc:
+    def self.process(data)
+      element('sms_canSend_response', data).text_value
+    end
+  end
+
   class Errors < Parser#:nodoc:
     EXCEPTIONS = {
       1 	=> Facebooker::Session::UnknownError,
@@ -569,7 +581,9 @@ module Facebooker
       'facebook.notifications.sendEmail' => NotificationsSendEmail,
       'facebook.data.getUserPreference' => GetPreference,
       'facebook.data.setUserPreference' => SetPreference,
-      'facebook.video.upload' => UploadVideo
+      'facebook.video.upload' => UploadVideo,
+      'facebook.sms.send' => SmsSend,
+      'facebook.sms.canSend' => SmsCanSend
     }
   end
 end

data/lib/facebooker/rails/controller.rb

@@ -104,8 +104,7 @@ module Facebooker
  
           #returning gracefully if the cookies aren't set or have expired
           return unless parsed['session_key'] && parsed['user'] && parsed['expires'] && parsed['ss'] 
-          return unless Time.at(parsed['expires'].to_f) > Time.now || (parsed['expires'] == "0")
-          
+          return unless Time.at(parsed['expires'].to_s.to_f) > Time.now || (parsed['expires'] == "0")          
           #if we have the unexpired cookies, we'll throw an exception if the sig doesn't verify
           verify_signature(parsed,cookies[Facebooker.api_key])
           

data/lib/facebooker/rails/cucumber.rb

@@ -4,13 +4,6 @@ require 'facebooker/mock/service'
 
 Facebooker::MockService.fixture_path = File.join(RAILS_ROOT, 'features', 'support', 'facebook')
 
-Facebooker::Session.current = Facebooker::MockSession.create
-class ApplicationController
-  def facebook_session
-    Facebooker::Session.current
-  end
-end
-
 module Facebooker
   class << self
     # prevent Facebooker from adding canvas name as prefix to URLs
@@ -25,6 +18,11 @@ module Facebooker
       def redirect_to(*args)
         super
       end
+      
+      # Return the mock session
+      def new_facebook_session
+        Facebooker::MockSession.create
+      end
     end
   end
 end

data/lib/facebooker/rails/extensions/action_controller.rb

@@ -0,0 +1,48 @@
+module ::ActionController
+  class Base
+    def self.inherited_with_facebooker(subclass)
+      inherited_without_facebooker(subclass)
+      if subclass.to_s == "ApplicationController"
+        subclass.send(:include,Facebooker::Rails::Controller) 
+        subclass.helper Facebooker::Rails::Helpers
+      end
+    end
+    class << self
+      alias_method_chain :inherited, :facebooker
+    end
+  end
+end
+
+
+# When making get requests, Facebook sends fb_sig parameters both in the query string
+# and also in the post body. We want to ignore the query string ones because they are one
+# request out of date
+# We only do thise when there are POST parameters so that IFrame linkage still works
+if Rails.version < '2.3'
+  class ActionController::AbstractRequest
+    def query_parameters_with_facebooker
+      if request_parameters.blank?
+        query_parameters_without_facebooker
+      else
+        (query_parameters_without_facebooker||{}).reject {|key,value| key.to_s =~ /^fb_sig/}
+      end
+    end
+  
+    alias_method_chain :query_parameters, :facebooker
+  end
+else
+  class ActionController::Request
+    def query_parameters_with_facebooker
+      if request_parameters.blank?
+        query_parameters_without_facebooker
+      else
+        (query_parameters_without_facebooker||{}).reject {|key,value| key.to_s =~ /^fb_sig/}
+      end
+    end
+  
+    alias_method_chain :query_parameters, :facebooker
+  end
+end
+
+Mime::Type.register_alias "text/html", :fbml
+Mime::Type.register_alias "text/javascript", :fbjs

data/lib/facebooker/rails/extensions/rack_setup.rb

@@ -0,0 +1,2 @@
+require 'rack/facebook'
+ActionController::Dispatcher.middleware.insert_after 'ActionController::Failsafe',Rack::Facebook, Facebooker.secret_key

data/lib/facebooker/rails/extensions/routing.rb

@@ -0,0 +1,15 @@
+class ActionController::Routing::Route
+  def recognition_conditions_with_facebooker
+    defaults = recognition_conditions_without_facebooker 
+    defaults << " env[:canvas] == conditions[:canvas] " if conditions[:canvas]
+    defaults
+  end
+  alias_method_chain :recognition_conditions, :facebooker
+end
+
+# We turn off route optimization to make named routes use our code for figuring out if they should go to the session
+ActionController::Base::optimise_named_routes = false 
+
+# pull :canvas=> into env in routing to allow for conditions
+ActionController::Routing::RouteSet.send :include,  Facebooker::Rails::Routing::RouteSetExtensions
+ActionController::Routing::RouteSet::Mapper.send :include, Facebooker::Rails::Routing::MapperExtensions

data/lib/facebooker/rails/facebook_pretty_errors.rb

@@ -1,14 +1,22 @@
-if Facebooker.facebooker_config['pretty_errors'] || (Facebooker.facebooker_config['pretty_errors'].nil? && RAILS_ENV=="development")
-  class ActionController::Base
-    def rescues_path_with_facebooker(template_name)
-      t="#{RAILS_ROOT}/vendor/plugins/facebooker/templates/#{template_name}.erb"
-      File.exist?(t) ? t : rescues_path_without_facebooker(template_name)
+class ActionController::Base
+  def rescues_path_with_facebooker(template_name)
+    t = "#{RAILS_ROOT}/vendor/plugins/facebooker/templates/#{template_name}.erb"
+    if pretty_facebook_errors? && File.exist?(t)
+      t
+    else
+      rescues_path_without_facebooker(template_name)
     end
+  end
+  alias_method_chain :rescues_path, :facebooker
 
-    alias_method_chain :rescues_path,:facebooker
-
-    def response_code_for_rescue(exception)
-      200
-    end
+  def response_code_for_rescue_with_facebooker(exception)
+    pretty_facebook_errors? ? 200 : response_code_for_rescue_without_facebooker(exception)
+  end
+  alias_method_chain :response_code_for_rescue, :facebooker
+  
+  
+  def pretty_facebook_errors?
+    Facebooker.facebooker_config['pretty_errors'] ||
+      (Facebooker.facebooker_config['pretty_errors'].nil? && RAILS_ENV=="development")
   end
-end
+end

data/lib/facebooker/rails/facebook_url_rewriting.rb

@@ -1,8 +1,16 @@
 module ::ActionController
-  class AbstractRequest                         
-    def relative_url_root
-      Facebooker.path_prefix
-    end                                         
+  if Rails.version < '2.3'
+    class AbstractRequest                         
+      def relative_url_root
+        Facebooker.path_prefix
+      end                                         
+    end
+  else
+    class Request                         
+      def relative_url_root
+        Facebooker.path_prefix
+      end                                         
+    end
   end
   
   class Base

data/lib/facebooker/rails/integration_session.rb

@@ -17,24 +17,22 @@ class Facebooker::Rails::IntegrationSession < ActionController::Integration::Ses
     super
   end
   
-  def get_with_canvas(path, parameters = nil, headers = nil)
+  def get(path, parameters = nil, headers = nil)
     if canvas
       post path, (parameters || {}).merge('fb_sig_request_method' => 'GET'), headers
     else
-      get_without_canvas path, parameters, headers
+      super path, parameters, headers
     end
   end
-  alias_method_chain :get, :canvas
   
   %w(put delete).each do |method|
-    define_method "#{method}_with_canvas" do |*args|
+    define_method method do |*args|
       if canvas
         path, parameters, headers = *args
         post path, (parameters || {}).merge('_method' => method.upcase), headers
       else
-        send "#{method}_without_canvas", *args
+        super *args
       end
     end
-    alias_method_chain method, :canvas
   end
 end

data/lib/facebooker/rails/publisher.rb

@@ -224,6 +224,7 @@ module Facebooker
         attr_accessor :template_id
         attr_accessor :template_name
         attr_accessor :story_size
+        
         def target_ids=(val)
           @target_ids = val.is_a?(Array) ? val.join(",") : val
         end
@@ -320,7 +321,7 @@ module Facebooker
           self.href=href
         end
 
-        def to_json
+        def to_json(*args)
           "{\"src\":#{src.to_json}, \"href\":#{href.to_json}}"
         end
       end
@@ -404,7 +405,10 @@ module Facebooker
         #only do this on Rails 2.1
 	      if ActionController::Base.respond_to?(:append_view_path)
   	      # only add the view path once
-	        ActionController::Base.append_view_path(controller_root) unless ActionController::Base.view_paths.include?(controller_root)
+  	      unless ActionController::Base.view_paths.include?(controller_root)
+	          ActionController::Base.append_view_path(controller_root) 
+	          ActionController::Base.append_view_path(controller_root+"/..") 
+	        end
 	      end
         returning ActionView::Base.new([template_root,controller_root], assigns, self) do |template|
           template.controller=self
@@ -471,7 +475,7 @@ module Facebooker
           case publisher._body
           when UserAction
             publisher._body.template_name = method
-            publisher._body.template_id = FacebookTemplate.bundle_id_for_class_and_method(self,method)
+            publisher._body.template_id ||= FacebookTemplate.bundle_id_for_class_and_method(self,method)
           end
           
           should_send ? publisher.send_message(method) : publisher._body

data/lib/facebooker/session.rb

@@ -273,6 +273,10 @@ module Facebooker
       Facebooker::Admin.new(self)
     end
     
+    def mobile
+      Facebooker::Mobile.new(self)
+    end
+    
     #
     # Given an array like:
     # [[userid, otheruserid], [yetanotherid, andanotherid]]
@@ -512,7 +516,7 @@ module Facebooker
       base = params.delete(:base)
       Logging.log_fb_api(method, params) do
         add_facebook_params(params, method)
-        @session_key && params[:session_key] ||= @session_key
+        @session_key && params[:session_key] ||= @session_key unless params[:uid]
         service.post_file(params.merge(:base => base, :sig => signature_for(params.reject{|key, value| key.nil?})))
       end
     end

data/lib/facebooker/version.rb

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

data/lib/facebooker.rb

@@ -147,6 +147,7 @@ require 'facebooker/service'
 require 'facebooker/server_cache'
 require 'facebooker/data'
 require 'facebooker/admin'
+require 'facebooker/mobile'
 require 'facebooker/session'
 require 'facebooker/version'
 require 'facebooker/models/location'
@@ -166,8 +167,8 @@ require 'facebooker/models/tag'
 require 'facebooker/models/user'
 require 'facebooker/models/info_item'
 require 'facebooker/models/info_section'
+require 'facebooker/models/friend_list'
+require 'facebooker/models/video'
 require 'facebooker/adapters/adapter_base'
 require 'facebooker/adapters/facebook_adapter'
 require 'facebooker/adapters/bebo_adapter'
-require 'facebooker/models/friend_list'
-require 'facebooker/models/video'

data/lib/rack/facebook.rb

@@ -0,0 +1,76 @@
+module Rack
+  # This Rack middleware checks the signature of Facebook params, and
+  # converts them to Ruby objects when appropiate. Also, it converts
+  # the request method from the Facebook POST to the original HTTP
+  # method used by the client.
+  #
+  # If the signature is wrong, it returns a "400 Invalid Facebook Signature".
+  # 
+  # Optionally, it can take a block that receives the Rack environment
+  # and returns a value that evaluates to true when we want the middleware to
+  # be executed for the specific request.
+  #
+  # == Usage
+  #
+  # In your config.ru:
+  #
+  #   require 'rack/facebook'
+  #   use Rack::Facebook, "my_facebook_secret_key"
+  #
+  # Using a block condition:
+  #
+  #   use Rack::Facebook, "my_facebook_secret_key" do |env|
+  #     env['REQUEST_URI'] =~ /^\/facebook_only/
+  #   end
+  #
+  class Facebook
+    def initialize(app, secret_key, &condition)
+      @app = app
+      @secret_key = secret_key
+      @condition = condition
+    end
+    
+    def call(env)
+      if @condition.nil? || @condition.call(env)
+        request = Rack::Request.new(env)
+        fb_params = extract_fb_sig_params(request.POST)
+        unless fb_params.empty?
+          unless signature_is_valid?(fb_params, request.POST['fb_sig'])
+            return Rack::Response.new(["Invalid Facebook signature"], 400).finish
+          end
+          env['REQUEST_METHOD'] = fb_params["request_method"] if fb_params["request_method"]
+          convert_parameters!(request.POST)
+        end
+      end
+      @app.call(env)
+    end
+    
+    private
+
+    def extract_fb_sig_params(params)
+      params.inject({}) do |collection, (param, value)|
+        collection[param.sub(/^fb_sig_/, '')] = value if param[0,7] == 'fb_sig_'
+        collection
+      end
+    end
+    
+    def signature_is_valid?(fb_params, actual_sig)
+      raw_string = fb_params.map{ |*args| args.join('=') }.sort.join
+      expected_signature = Digest::MD5.hexdigest([raw_string, @secret_key].join)
+      actual_sig == expected_signature
+    end
+    
+    def convert_parameters!(params)
+      params.each do |key, value|
+        case key
+        when 'fb_sig_added', 'fb_sig_in_canvas', 'fb_sig_in_new_facebook', 'fb_sig_position_fix'
+          params[key] = value == "1"
+        when 'fb_sig_expires', 'fb_sig_profile_update_time', 'fb_sig_time'
+          params[key] = value == "0" ? nil : Time.at(value.to_f)
+        when 'fb_sig_friends'
+          params[key] = value.split(',')
+        end
+      end
+    end
+  end
+end

data/test/facebooker/mobile_test.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+class Facebooker::MobileTest < Test::Unit::TestCase
+  def setup
+    @session = Facebooker::Session.create('apikey', 'secretkey')
+    @user = Facebooker::User.new(1234, @session)
+    Facebooker.use_curl=false
+  end
+  
+  def test_can_send
+    expect_http_posts_with_responses(example_can_send_xml)
+    assert(@session.mobile.can_send(@user))
+  end
+
+  def test_send
+    expect_http_posts_with_responses(example_send_xml)
+    assert(@session.mobile.send(@user, "Some sort of message"))    
+  end
+
+private
+  def example_can_send_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <sms_canSend_response
+      xmlns="http://api.facebook.com/1.0/"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://api.facebook.com/1.0/http://api.facebook.com/1.0/facebook.xsd">
+      0
+    </sms_canSend_response>
+    XML
+  end
+  
+  def example_send_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <sms_send_response
+      xmlns="http://api.facebook.com/1.0/"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://api.facebook.com/1.0/http://api.facebook.com/1.0/facebook.xsd">
+      0
+    </sms_send_response>
+    XML
+  end
+  
+end

data/test/facebooker/models/user_test.rb

@@ -76,15 +76,15 @@ class Facebooker::UserTest < Test::Unit::TestCase
   end
   
   def test_can_set_mobile_fbml
-    @user.expects(:set_profile_fbml).with(nil,"test",nil)
+    @user.expects(:set_profile_fbml).with(nil,"test",nil,nil)
     @user.mobile_fbml="test"
   end
   def test_can_set_profile_action
-    @user.expects(:set_profile_fbml).with(nil,nil,"test")
+    @user.expects(:set_profile_fbml).with(nil,nil,"test",nil)
     @user.profile_action="test"
   end
   def test_can_set_profile_fbml
-    @user.expects(:set_profile_fbml).with("test",nil,nil)
+    @user.expects(:set_profile_fbml).with("test",nil,nil,nil)
     @user.profile_fbml="test"
   end
   

data/test/facebooker/rails/publisher_test.rb

@@ -108,6 +108,13 @@ class TestPublisher < Facebooker::Rails::Publisher
     from user
     data :friend=>"Mike"
   end
+  
+  def user_action_with_template_id(user)
+    send_as :user_action
+    from user
+    data :friend=>"Mike"  
+    template_id 4
+  end
   def user_action_with_story_size(user)
     send_as :user_action
     from user
@@ -335,6 +342,15 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     ua = TestPublisher.create_user_action(@from_user)
     assert_equal "user_action", ua.template_name
   end
+  def test_create_user_action_with_template_id
+    @from_user = Facebooker::User.new
+    @session = Facebooker::Session.new("","")
+    @from_user.stubs(:session).returns(@session)
+    Facebooker::Rails::Publisher::FacebookTemplate.expects(:bundle_id_for_class_and_method).
+                                                   with(TestPublisher,'user_action').never
+    ua = TestPublisher.create_user_action_with_template_id(@from_user)
+    assert_equal 4,ua.template_id
+  end
   
   def test_publisher_user_action
     @from_user = Facebooker::User.new

data/test/facebooker/rails_integration_test.rb

@@ -1,220 +1,220 @@
 require File.expand_path(File.dirname(__FILE__) + '/../rails_test_helper')
-begin
-  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)} 
-    end
-  
-    def expired_cookie_hash_for_auth
-      {"_ss" => "not_used", "_session_key"=> "whatever", "_user"=>"77777", "_expires"=>"#{1.day.ago.to_i}"}
-    end
 
-    def cookie_hash_for_auth
-      {"_ss" => "not_used", "_session_key"=> "whatever", "_user"=>"77777", "_expires"=>"#{1.day.from_now.to_i}"}
-    end
+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)} 
   end
-  class NoisyController < ActionController::Base
-    include Facebooker::Rails::Controller
-    def rescue_action(e) raise e end
+
+  def expired_cookie_hash_for_auth
+    {"_ss" => "not_used", "_session_key"=> "whatever", "_user"=>"77777", "_expires"=>"#{1.day.ago.to_i}"}
   end
-  
-  
-  class ControllerWhichRequiresExtendedPermissions< NoisyController
-    ensure_authenticated_to_facebook
-    before_filter :ensure_has_status_update
-    before_filter :ensure_has_photo_upload
-    before_filter :ensure_has_video_upload
-    before_filter :ensure_has_create_listing
-    def index
-      render :text => 'score!'
-    end
+
+  def cookie_hash_for_auth
+    {"_ss" => "not_used", "_session_key"=> "whatever", "_user"=>"77777", "_expires"=>"#{1.day.from_now.to_i}"}
+  end
+end
+class NoisyController < ActionController::Base
+  include Facebooker::Rails::Controller
+  def rescue_action(e) raise e end
+end
+
+
+class ControllerWhichRequiresExtendedPermissions< NoisyController
+  ensure_authenticated_to_facebook
+  before_filter :ensure_has_status_update
+  before_filter :ensure_has_photo_upload
+  before_filter :ensure_has_video_upload
+  before_filter :ensure_has_create_listing
+  def index
+    render :text => 'score!'
+  end
+end
+
+class FBConnectController < NoisyController
+  before_filter :create_facebook_session
+  def index
+    render :text => 'score!'
+  end
+end
+
+class ControllerWhichRequiresFacebookAuthentication < NoisyController
+  ensure_authenticated_to_facebook
+  def index
+    render :text => 'score!'
+  end
+  def link_test
+    options = {}
+    options[:canvas] = true if params[:canvas] == true
+    options[:canvas] = false if params[:canvas] == false
+    render :text=>url_for(options)
   end
   
-  class FBConnectController < NoisyController
-    before_filter :create_facebook_session
-    def index
-      render :text => 'score!'
-    end
+   def named_route_test
+    render :text=>comments_url()
   end
   
-  class ControllerWhichRequiresFacebookAuthentication < NoisyController
-    ensure_authenticated_to_facebook
-    def index
-      render :text => 'score!'
-    end
-    def link_test
-      options = {}
-      options[:canvas] = true if params[:canvas] == true
-      options[:canvas] = false if params[:canvas] == false
-      render :text=>url_for(options)
-    end
-    
-     def named_route_test
-      render :text=>comments_url()
-    end
-    
-    def image_test
-      render :inline=>"<%=image_tag 'image.png'%>"
-    end
-    
-    def fb_params_test
-      render :text=>facebook_params['user']
-    end
-    
-    def publisher_test
-      if wants_interface?
-        render :text=>"interface"
-      else
-        render :text=>"not interface"
-      end
-    end
-    
-    def publisher_test_interface
-      render_publisher_interface("This is a test",false,true)
-    end
-    
-    def publisher_test_response
-      ua=Facebooker::Rails::Publisher::UserAction.new
-      ua.data = {:params=>true}
-      ua.template_name = "template_name"
-      ua.template_id =  1234
-      render_publisher_response(ua)
-    end
-    
-    def publisher_test_error
-      render_publisher_error("Title","Body")
-    end
-    
+  def image_test
+    render :inline=>"<%=image_tag 'image.png'%>"
   end
-  class ControllerWhichRequiresApplicationInstallation < NoisyController
-    ensure_application_is_installed_by_facebook_user
-    def index
-      render :text => 'installed!'
-    end    
+  
+  def fb_params_test
+    render :text=>facebook_params['user']
   end
-  class FacebookController < ActionController::Base
-    def index
+  
+  def publisher_test
+    if wants_interface?
+      render :text=>"interface"
+    else
+      render :text=>"not interface"
     end
   end
   
-  class PlainOldRailsController < ActionController::Base
-    def index
-    end
-    def link_test
-      options = {}
-      options[:canvas] = true if params[:canvas] == true
-      options[:canvas] = false if params[:canvas] == false
-      render :text => url_for(options)
-    end
-    
-    def named_route_test
-      render :text=>comments_url()
-    end
-    def canvas_false_test
-      render :text=>comments_url(:canvas=>false)
-    end
-    def canvas_true_test
-      render :text=>comments_url(:canvas=>true)
-    end
+  def publisher_test_interface
+    render_publisher_interface("This is a test",false,true)
   end
   
-  class ControllerWhichFails < ActionController::Base
-    def pass
-      render :text=>''
-    end
-    def fail
-      raise "I'm failing"
-    end
+  def publisher_test_response
+    ua=Facebooker::Rails::Publisher::UserAction.new
+    ua.data = {:params=>true}
+    ua.template_name = "template_name"
+    ua.template_id =  1234
+    render_publisher_response(ua)
   end
   
-  class Test::Unit::TestCase
-    include Facebooker::Rails::TestHelpers
+  def publisher_test_error
+    render_publisher_error("Title","Body")
   end
   
+end
+class ControllerWhichRequiresApplicationInstallation < NoisyController
+  ensure_application_is_installed_by_facebook_user
+  def index
+    render :text => 'installed!'
+  end    
+end
+class FacebookController < ActionController::Base
+  def index
+  end
+end
+
+class PlainOldRailsController < ActionController::Base
+  def index
+  end
+  def link_test
+    options = {}
+    options[:canvas] = true if params[:canvas] == true
+    options[:canvas] = false if params[:canvas] == false
+    render :text => url_for(options)
+  end
   
-  # you can't use asset_recognize, because it can't pass parameters in to the requests
-  class UrlRecognitionTests < Test::Unit::TestCase
-    def test_detects_in_canvas
+  def named_route_test
+    render :text=>comments_url()
+  end
+  def canvas_false_test
+    render :text=>comments_url(:canvas=>false)
+  end
+  def canvas_true_test
+    render :text=>comments_url(:canvas=>true)
+  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
+  def test_detects_in_canvas
+    if Rails.version < '2.3'
       request = ActionController::TestRequest.new({"fb_sig_in_canvas"=>"1"}, {}, nil)
-      request.path   = "/"
-      ActionController::Routing::Routes.recognize(request)
-      assert_equal({"controller"=>"facebook","action"=>"index"},request.path_parameters)
+    else
+      request = ActionController::TestRequest.new
+      request.query_parameters[:fb_sig_in_canvas] = "1"
     end
-    
-    def test_routes_when_not_in_canvas
+    request.path   = "/"
+    ActionController::Routing::Routes.recognize(request)
+    assert_equal({"controller"=>"facebook","action"=>"index"},request.path_parameters)
+  end
+  
+  def test_routes_when_not_in_canvas
+    if Rails.version < '2.3'
       request = ActionController::TestRequest.new({}, {}, nil)
-      request.path   = "/"
-      ActionController::Routing::Routes.recognize(request)
-      assert_equal({"controller"=>"plain_old_rails","action"=>"index"},request.path_parameters)
+    else
+      request = ActionController::TestRequest.new
     end
+    request.path   = "/"
+    ActionController::Routing::Routes.recognize(request)
+    assert_equal({"controller"=>"plain_old_rails","action"=>"index"},request.path_parameters)
   end
+end
+
+class RailsIntegrationTestForFBConnect < Test::Unit::TestCase
+  include FBConnectTestHelpers
   
-  class RailsIntegrationTestForFBConnect < Test::Unit::TestCase
-    include FBConnectTestHelpers
-    
-    def setup
-      ENV['FACEBOOK_CANVAS_PATH'] ='facebook_app_name'
-      ENV['FACEBOOK_API_KEY'] = '1234567'
-      ENV['FACEBOOK_SECRET_KEY'] = '7654321'
-      @controller = FBConnectController.new
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new
-      @controller.stubs(:verify_signature).returns(true)
-              
-    end
-    
-    def test_doesnt_set_cookie_but_facebook_session_is_available
-      setup_fb_connect_cookies
-      get :index
-      assert_not_nil @controller.facebook_session
-      assert_nil @response.cookies[:facebook_session] 
-      
-    end
+  def setup
+    ENV['FACEBOOK_CANVAS_PATH'] ='facebook_app_name'
+    ENV['FACEBOOK_API_KEY'] = '1234567'
+    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    @controller = FBConnectController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @controller.stubs(:verify_signature).returns(true)
+            
   end
   
-  class RailsIntegrationTestForNonFacebookControllers < Test::Unit::TestCase
-    def setup
-      ENV['FACEBOOK_CANVAS_PATH'] ='facebook_app_name'
-      ENV['FACEBOOK_API_KEY'] = '1234567'
-      ENV['FACEBOOK_SECRET_KEY'] = '7654321'
-      @controller = PlainOldRailsController.new
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new        
-    end
-
-    def test_url_for_links_to_callback_if_canvas_is_false_and_in_canvas
-      get :link_test
-      assert_match /test.host/,@response.body
-    end
-    
-    def test_named_route_doesnt_include_canvas_path_when_not_in_canvas
-      get :named_route_test
-      assert_equal "http://test.host/comments",@response.body
-    end
-    def test_named_route_includes_canvas_path_when_in_canvas
-      get :named_route_test, facebook_params
-      assert_equal "http://apps.facebook.com/facebook_app_name/comments",@response.body
-    end
-   
-    def test_named_route_doesnt_include_canvas_path_when_in_canvas_with_canvas_equals_false
-      get :canvas_false_test, facebook_params
-      assert_equal "http://test.host/comments",@response.body
-    end
-    def test_named_route_does_include_canvas_path_when_not_in_canvas_with_canvas_equals_true
-      get :canvas_true_test
-      assert_equal "http://apps.facebook.com/facebook_app_name/comments",@response.body
-    end
+  def test_doesnt_set_cookie_but_facebook_session_is_available
+    setup_fb_connect_cookies
+    get :index
+    assert_not_nil @controller.facebook_session
+    assert_nil @response.cookies[:facebook_session] 
     
   end
+end
+
+class RailsIntegrationTestForNonFacebookControllers < Test::Unit::TestCase
+  def setup
+    ENV['FACEBOOK_CANVAS_PATH'] ='facebook_app_name'
+    ENV['FACEBOOK_API_KEY'] = '1234567'
+    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    @controller = PlainOldRailsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new        
+  end
+
+  def test_url_for_links_to_callback_if_canvas_is_false_and_in_canvas
+    get :link_test
+    assert_match /test.host/,@response.body
+  end
+  
+  def test_named_route_doesnt_include_canvas_path_when_not_in_canvas
+    get :named_route_test
+    assert_equal "http://test.host/comments",@response.body
+  end
+  def test_named_route_includes_canvas_path_when_in_canvas
+    get :named_route_test, facebook_params
+    assert_equal "http://apps.facebook.com/facebook_app_name/comments",@response.body
+  end
+ 
+  def test_named_route_doesnt_include_canvas_path_when_in_canvas_with_canvas_equals_false
+    get :canvas_false_test, facebook_params
+    assert_equal "http://test.host/comments",@response.body
+  end
+  def test_named_route_does_include_canvas_path_when_not_in_canvas_with_canvas_equals_true
+    get :canvas_true_test
+    assert_equal "http://apps.facebook.com/facebook_app_name/comments",@response.body
+  end
+  
+end
   
 class RailsIntegrationTestForExtendedPermissions < Test::Unit::TestCase
   def setup
@@ -478,17 +478,17 @@ class RailsIntegrationTest < Test::Unit::TestCase
   
   def test_publisher_test_error
     get :publisher_test_error, facebook_params
-    assert_equal JSON.parse("{\"errorCode\": 1, \"errorTitle\": \"Title\", \"errorMessage\": \"Body\"}"), JSON.parse(@response.body)
+    assert_equal Facebooker.json_decode("{\"errorCode\": 1, \"errorTitle\": \"Title\", \"errorMessage\": \"Body\"}"), Facebooker.json_decode(@response.body)
   end
   
   def test_publisher_test_interface
     get :publisher_test_interface, facebook_params
-    assert_equal JSON.parse("{\"method\": \"publisher_getInterface\", \"content\": {\"fbml\": \"This is a test\", \"publishEnabled\": false, \"commentEnabled\": true}}"), JSON.parse(@response.body)
+    assert_equal Facebooker.json_decode("{\"method\": \"publisher_getInterface\", \"content\": {\"fbml\": \"This is a test\", \"publishEnabled\": false, \"commentEnabled\": true}}"), Facebooker.json_decode(@response.body)
   end
   
   def test_publisher_test_reponse
     get :publisher_test_response, facebook_params
-    assert_equal JSON.parse("{\"method\": \"publisher_getFeedStory\", \"content\": {\"feed\": {\"template_data\": {\"params\": true}, \"template_id\": 1234}}}"), JSON.parse(@response.body)
+    assert_equal Facebooker.json_decode("{\"method\": \"publisher_getFeedStory\", \"content\": {\"feed\": {\"template_data\": {\"params\": true}, \"template_id\": 1234}}}"), Facebooker.json_decode(@response.body)
     
   end
   
@@ -1104,26 +1104,42 @@ class RailsFacebookFormbuilderTest < Test::Unit::TestCase
 end
 
 class RailsPrettyErrorsTest < Test::Unit::TestCase
+  class ControllerWhichFails < ActionController::Base
+    def pass
+      render :text=>''
+    end
+    def fail
+      raise "I'm failing"
+    end
+  end
+  
   def setup
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
     @controller = ControllerWhichFails.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @controller.stubs(:verify_signature).returns(true)
   end
   
-  def test_pretty_errors
-    Facebooker.facebooker_config.stubs(:pretty_errors).returns(false)
+  def test_pretty_errors_disabled_success
+    Facebooker.facebooker_config.stubs(:[]).with('pretty_errors').returns(false)
     post :pass, facebook_params
-    assert_response :success    
+    assert_response 200
+  end
+  
+  def test_pretty_errors_disabled_error
+    Facebooker.facebooker_config.stubs(:[]).with('pretty_errors').returns(false)
     post :fail, facebook_params
     assert_response :error
-    Facebooker.facebooker_config.stubs(:pretty_errors).returns(true)
+  end
+  
+  def test_pretty_errors_enabled_success
+    Facebooker.facebooker_config.stubs(:[]).with('pretty_errors').returns(true)
     post :pass, facebook_params
-    assert_response :success    
+    assert_response 200
+  end
+  def test_pretty_errors_enabled_error
+    Facebooker.facebooker_config.stubs(:[]).with('pretty_errors').returns(true)
     post :fail, facebook_params
-    assert_response :error
+    assert_response 200
   end
 end
 
@@ -1303,8 +1319,3 @@ class RailsRequestFormatTest < Test::Unit::TestCase
   end
   
 end
-
-# rescue LoadError
-#   $stderr.puts "Couldn't find action controller.  That's OK.  We'll skip it."
-end
-

data/test/rails_test_helper.rb

@@ -3,6 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require 'action_controller'
 require 'action_controller/test_process'
 require 'active_record'
+gem 'rails'
+require 'initializer'
 require File.dirname(__FILE__)+'/../init'
 require 'facebooker/rails/controller'
 require 'facebooker/rails/helpers/fb_connect'

data/test/test_helper.rb

@@ -1,5 +1,11 @@
 require 'test/unit'
 require 'rubygems'
+begin
+  require 'multi_rails_init'
+rescue LoadError
+  # multi rails not installed, test against newest supported version of Rails
+  gem 'rails', '2.2.2'
+end
 require 'flexmock/test_unit'
 require 'mocha'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mmangino-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.16
+  version: 1.0.19
 platform: ruby
 authors: 
 - Chad Fowler
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-13 00:00:00 -08:00
+date: 2009-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ files:
 - 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
@@ -112,14 +113,15 @@ files:
 - lib/facebooker/models/photo.rb
 - lib/facebooker/models/tag.rb
 - lib/facebooker/models/user.rb
-- lib/facebooker/models/user.rb.orig
-- lib/facebooker/models/user.rb.rej
 - lib/facebooker/models/video.rb
 - 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/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
@@ -137,11 +139,10 @@ files:
 - lib/facebooker/server_cache.rb
 - lib/facebooker/service.rb
 - lib/facebooker/session.rb
-- lib/facebooker/session.rb.orig
-- lib/facebooker/session.rb.rej
 - lib/facebooker/version.rb
 - lib/facebooker.rb
 - lib/net/http_multipart_post.rb
+- lib/rack/facebook.rb
 - lib/tasks/facebooker.rake
 - lib/tasks/tunnel.rake
 - rails/init.rb
@@ -166,6 +167,7 @@ files:
 - test/net/http_multipart_post_test.rb
 - test/rails_test_helper.rb
 - test/test_helper.rb
+- test/facebooker/mobile_test.rb
 has_rdoc: true
 homepage: 
 post_install_message: