facebooker 1.0.73 → 1.0.74

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -31,7 +31,7 @@ module ::ActionController
31
31
  one_or_true @request.parameters["fb_sig_in_new_facebook"]
32
32
  end
33
33
 
34
- def link_to_canvas?(params, options)
34
+ def link_to_canvas?(options)
35
35
  option_override = options[:canvas]
36
36
  return false if option_override == false # important to check for false. nil should use default behavior
37
37
  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
44
44
 
45
45
  def rewrite_url_with_facebooker(*args)
46
46
  options = args.first.is_a?(Hash) ? args.first : args.last
47
- is_link_to_canvas = link_to_canvas?(@request.request_parameters, options)
47
+ is_link_to_canvas = link_to_canvas?(options)
48
48
  if is_link_to_canvas && !options.has_key?(:host)
49
49
  options[:host] = Facebooker.canvas_server_base
50
50
  end
@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 1
4
4
  MINOR = 0
5
- TINY = 73
5
+ TINY = 74
6
6
 
7
7
  STRING = [MAJOR, MINOR, TINY].join('.')
8
8
  end
@@ -6,8 +6,8 @@ namespace :facebooker do
6
6
  task :setup => :environment do
7
7
  facebook_config = File.join(RAILS_ROOT,"config","facebooker.yml")
8
8
  unless File.exist?(facebook_config)
9
- plugin_root = File.join(RAILS_ROOT,"vendor","plugins")
10
- facebook_config_tpl = File.join(plugin_root,"facebooker","generators","facebook","templates","config","facebooker.yml")
9
+ facebooker_root = File.expand_path(File.join(File.dirname(__FILE__),"..",".."))
10
+ facebook_config_tpl = File.join(facebooker_root,"generators","facebook","templates","config","facebooker.yml")
11
11
  FileUtils.cp facebook_config_tpl, facebook_config
12
12
  puts "Ensure 'GatewayPorts yes' is enabled in the remote development server's sshd config when using any of the facebooker:tunnel:*' rake tasks"
13
13
  puts "Configuration created in #{RAILS_ROOT}/config/facebooker.yml"
@@ -11,7 +11,7 @@ begin
11
11
  require 'multi_rails_init'
12
12
  rescue LoadError
13
13
  # multi rails not installed, test against newest supported version of Rails
14
- gem 'rails', '2.3.8'
14
+ gem 'rails', (ENV['RAILS_VERSION'] || '2.3.8')
15
15
  end
16
16
  require 'active_support'
17
17
  require 'flexmock/test_unit'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: facebooker
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.73
4
+ version: 1.0.74
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chad Fowler
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-06-24 00:00:00 -04:00
17
+ date: 2010-06-28 00:00:00 -04:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency