Merge commit 'mmangino/master'

mmangino · Aug 17, 2010 · d4f24b9 · d4f24b9
2 parents 7743ddb + 5b6ad81
commit d4f24b9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/lib/facebooker/attachment.rb b/lib/facebooker/attachment.rb
@@ -42,6 +42,14 @@ def add_flash(swfsource, imgsource, width=nil, height=nil, expanded_width=nil, e
     params[:expanded_height] = expanded_height unless expanded_height.nil?
     add_media(params)
   end
+
+
+  def add_property(key, value)
+    @storage[:properties] ||= {}
+    @storage[:properties][key] = value
+  end
+
+
 
   def to_hash
     @storage

diff --git a/lib/facebooker/rails/facebook_url_rewriting.rb b/lib/facebooker/rails/facebook_url_rewriting.rb
@@ -31,7 +31,7 @@ def link_to_new_canvas?
       one_or_true @request.parameters["fb_sig_in_new_facebook"]
     end
 
-    def link_to_canvas?(params, options)
+    def link_to_canvas?(options)
       option_override = options[:canvas]
       return false if option_override == false # important to check for false. nil should use default behavior
       option_override || (can_safely_access_request_parameters? && (one_or_true(@request.parameters["fb_sig_in_canvas"]) || one_or_true(@request.parameters[:fb_sig_in_canvas]) || one_or_true(@request.parameters["fb_sig_is_ajax"]) ))
@@ -44,7 +44,7 @@ def can_safely_access_request_parameters?
 
     def rewrite_url_with_facebooker(*args)
       options = args.first.is_a?(Hash) ? args.first : args.last
-      is_link_to_canvas = @request.env["REQUEST_METHOD"] == "POST" && link_to_canvas?(@request.request_parameters, options)
+      is_link_to_canvas = link_to_canvas?(options)
       if is_link_to_canvas && !options.has_key?(:host)
         options[:host] = Facebooker.canvas_server_base
       end 

diff --git a/lib/facebooker/version.rb b/lib/facebooker/version.rb
@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 71
+    TINY  = 74
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/lib/tasks/facebooker.rake b/lib/tasks/facebooker.rake
@@ -6,8 +6,8 @@ namespace :facebooker do
   task :setup => :environment do   
     facebook_config = File.join(RAILS_ROOT,"config","facebooker.yml")
     unless File.exist?(facebook_config)
-      plugin_root = File.join(RAILS_ROOT,"vendor","plugins")
-      facebook_config_tpl = File.join(plugin_root,"facebooker","generators","facebook","templates","config","facebooker.yml")
+      facebooker_root = File.expand_path(File.join(File.dirname(__FILE__),"..",".."))
+      facebook_config_tpl = File.join(facebooker_root,"generators","facebook","templates","config","facebooker.yml")
       FileUtils.cp facebook_config_tpl, facebook_config 
       puts "Ensure 'GatewayPorts yes' is enabled in the remote development server's sshd config when using any of the facebooker:tunnel:*' rake tasks"
       puts "Configuration created in #{RAILS_ROOT}/config/facebooker.yml"

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -11,7 +11,7 @@
   require 'multi_rails_init'
 rescue LoadError
   # multi rails not installed, test against newest supported version of Rails
-  gem 'rails', '2.3.8'
+  gem 'rails', (ENV['RAILS_VERSION'] || '2.3.8')
 end
 require 'active_support'
 require 'flexmock/test_unit'