facebooker 1.0.73 → 1.0.74

data/lib/facebooker/rails/facebook_url_rewriting.rb

@@ -31,7 +31,7 @@ module ::ActionController
       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 @@ module ::ActionController
   
     def rewrite_url_with_facebooker(*args)
       options = args.first.is_a?(Hash) ? args.first : args.last
-      is_link_to_canvas = 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 

data/lib/facebooker/version.rb

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

data/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"

data/test/test_helper.rb

@@ -11,7 +11,7 @@ begin
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.73
+  version: 1.0.74
 platform: ruby
 authors: 
 - Chad Fowler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -04:00
+date: 2010-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency