carrot-facebook 0.9.10 → 0.9.11

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.
@@ -1,22 +1,28 @@
1
+ include ActionView::Helpers::TagHelper
2
+
1
3
  module Carrot
2
4
  module Facebook
3
5
  module Controller
4
6
  extend ActiveSupport::Concern
5
7
 
6
8
  def top_redirect_to(*args)
7
- @redirect_url = url_for(*args)
8
- render :layout => false, :inline => "
9
- <html><head>
10
- <script type=\"text/javascript\">
11
- window.top.location.href = \"#{@redirect_url.to_json}\";
12
- alert(\"test\");
13
- </script>
14
- <noscript>
15
- <meta http-equiv=\"refresh\" content=\"0;url=#{h @redirect_url}\" />
16
- <meta http-equiv=\"window-target\" content=\"_top\" />
17
- </noscript>
18
- </head></html>
19
- ".html_safe
9
+ if request.env[:is_iframe_app]
10
+ @redirect_url = [ENV["FACEBOOK_APP_URL"], url_for(*args)].join
11
+
12
+ render :layout => false, :inline => %Q{
13
+ <html><head>
14
+ <script type="text/javascript">
15
+ window.top.location.href = #{@redirect_url.to_json};
16
+ </script>
17
+ <noscript>
18
+ <meta http-equiv="refresh" content="0;url=#{@redirect_url}" />
19
+ <meta http-equiv="window-target" content="_top" />
20
+ </noscript>
21
+ </head></html>
22
+ }.html_safe
23
+ else
24
+ redirect_to(*args)
25
+ end
20
26
  end
21
27
  end
22
28
  end
@@ -2,7 +2,7 @@ module Carrot
2
2
  module Facebook
3
3
  MAJOR = 0
4
4
  MINOR = 9
5
- TINY = 10
5
+ TINY = 11
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.10
4
+ version: 0.9.11
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: &70168114292780 !ruby/object:Gem::Requirement
17
+ requirement: &70161201796000 !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: *70168114292780
25
+ version_requirements: *70161201796000
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: p3p
28
- requirement: &70168114291420 !ruby/object:Gem::Requirement
28
+ requirement: &70161201795180 !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: *70168114291420
36
+ version_requirements: *70161201795180
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: rails
39
- requirement: &70168114290460 !ruby/object:Gem::Requirement
39
+ requirement: &70161201794680 !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: *70168114290460
47
+ version_requirements: *70161201794680
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: rspec
50
- requirement: &70168114289380 !ruby/object:Gem::Requirement
50
+ requirement: &70161201794140 !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: *70168114289380
58
+ version_requirements: *70161201794140
59
59
  description: Facebook view helpers and signed request handling.
60
60
  email:
61
61
  - tmilewski@gmail.com