carrot-facebook 0.9.11 → 0.9.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/carrot-facebook/controller.rb +4 -1
  2. data/lib/carrot-facebook/version.rb +1 -1
  3. metadata +9 -9
data/lib/carrot-facebook/controller.rb CHANGED
@@ -6,7 +6,10 @@ module Carrot
6
6
  extend ActiveSupport::Concern
7
7
 
8
8
  def top_redirect_to(*args)
9
- if request.env[:is_iframe_app]
9
+ force = args[:force] || false
10
+ args.delete(:force)
11
+
12
+ if request.env[:is_iframe_app] or force
10
13
  @redirect_url = [ENV["FACEBOOK_APP_URL"], url_for(*args)].join
11
14
 
12
15
  render :layout => false, :inline => %Q{
data/lib/carrot-facebook/version.rb CHANGED
@@ -2,7 +2,7 @@ module Carrot
2
2
  module Facebook
3
3
  MAJOR = 0
4
4
  MINOR = 9
5
- TINY = 11
5
+ TINY = 12
6
6
  PRE = nil
7
7
 
8
8
  VERSION = [MAJOR, MINOR, TINY, PRE].compact.join('.')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: carrot-facebook
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.11
4
+ version: 0.9.12
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ date: 2013-02-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: yajl-ruby
17
- requirement: &70161201796000 !ruby/object:Gem::Requirement
17
+ requirement: &70175232232000 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: '0'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *70161201796000
25
+ version_requirements: *70175232232000
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: p3p
28
- requirement: &70161201795180 !ruby/object:Gem::Requirement
28
+ requirement: &70175232230540 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *70161201795180
36
+ version_requirements: *70175232230540
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: rails
39
- requirement: &70161201794680 !ruby/object:Gem::Requirement
39
+ requirement: &70175232229520 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :development
46
46
  prerelease: false
47
- version_requirements: *70161201794680
47
+ version_requirements: *70175232229520
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: rspec
50
- requirement: &70161201794140 !ruby/object:Gem::Requirement
50
+ requirement: &70175232228620 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
55
55
  version: '0'
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *70161201794140
58
+ version_requirements: *70175232228620
59
59
  description: Facebook view helpers and signed request handling.
60
60
  email:
61
61
  - tmilewski@gmail.com