rostra 0.3.4 → 0.3.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/app/assets/javascripts/rostra/application.js +0 -1
  2. data/app/helpers/rostra/base/application_helper.rb +17 -3
  3. data/app/views/layouts/rostra/application.html.erb +3 -1
  4. data/app/views/rostra/questions/show.html.erb +1 -1
  5. data/app/views/rostra/shared/_sharing_links.html.erb +1 -1
  6. data/lib/generators/rostra/templates/app/helpers/rostra/application_helper.rb +17 -3
  7. data/lib/rostra/version.rb +1 -1
  8. metadata +42 -42
data/app/assets/javascripts/rostra/application.js CHANGED
@@ -122,5 +122,4 @@ $(document).ready(function() {
122
122
  });
123
123
  }();
124
124
 
125
-
126
125
  });
data/app/helpers/rostra/base/application_helper.rb CHANGED
@@ -13,10 +13,24 @@ module Rostra
13
13
 
14
14
  # Snippet used to share a question on Facebook.
15
15
  #
16
- def facebook_sharing_link
16
+ def facebook_sharing_link(question)
17
17
  raw %{
18
- <a name="fb_share"></a>
19
- <script src="http://static.ak.fbcdn.net/connect.php/js/FB.Share" type="text/javascript"></script>
18
+ <div class="fb-like" data-href="#{question_url(question)}" data-send="true" data-layout="button_count" data-width="450" data-show-faces="true" data-font="arial"></div>
19
+ }
20
+ end
21
+
22
+ # Javascript snippet required by facebook to support share links.
23
+ #
24
+ def include_facebook_sharing_link_javascript
25
+ raw %{
26
+ <div id="fb-root"></div>
27
+ <script>(function(d, s, id) {
28
+ var js, fjs = d.getElementsByTagName(s)[0];
29
+ if (d.getElementById(id)) return;
30
+ js = d.createElement(s); js.id = id;
31
+ js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
32
+ fjs.parentNode.insertBefore(js, fjs);
33
+ }(document, 'script', 'facebook-jssdk'));</script>
20
34
  }
21
35
  end
22
36
 
data/app/views/layouts/rostra/application.html.erb CHANGED
@@ -9,8 +9,9 @@
9
9
  <%= include_meta_keywords %>
10
10
  </head>
11
11
  <body id="<%= controller_name %>" class="<%= action_name %>">
12
- <div id="page_wrap">
12
+ <%= include_facebook_sharing_link_javascript %>
13
13
 
14
+ <div id="page_wrap">
14
15
  <% flash.each do |name, message| %>
15
16
  <%= content_tag :div, message, id: "flash_#{name}", class: 'flash' %>
16
17
  <% end %>
@@ -19,5 +20,6 @@
19
20
 
20
21
  <%= yield %>
21
22
  </div>
23
+
22
24
  </body>
23
25
  </html>
data/app/views/rostra/questions/show.html.erb CHANGED
@@ -14,7 +14,7 @@
14
14
  <div class="timestamp"><%= time_ago_in_words(@question.created_at) %> ago</div>
15
15
  <%= tag_list(@question) %>
16
16
  </div>
17
- <%= render 'rostra/shared/sharing_links' %>
17
+ <%= render 'rostra/shared/sharing_links', question: @question %>
18
18
  </div>
19
19
 
20
20
  <% unless @answers.empty? %>
data/app/views/rostra/shared/_sharing_links.html.erb CHANGED
@@ -1,4 +1,4 @@
1
1
  <div class="sharing_links">
2
2
  <span class="twitter"><%= twitter_sharing_link %></span>
3
- <span class="facebook"><%= facebook_sharing_link %></span>
3
+ <span class="facebook"><%= facebook_sharing_link(question) %></span>
4
4
  </div>
data/lib/generators/rostra/templates/app/helpers/rostra/application_helper.rb CHANGED
@@ -44,10 +44,24 @@ module Rostra
44
44
 
45
45
  # Snippet used to share a question on Facebook.
46
46
  #
47
- # def facebook_sharing_link
47
+ # def facebook_sharing_link(question)
48
48
  # raw %{
49
- # <a name="fb_share"></a>
50
- # <script src="http://static.ak.fbcdn.net/connect.php/js/FB.Share" type="text/javascript"></script>
49
+ # <div class="fb-like" data-href="#{question_url(question)}" data-send="true" data-layout="button_count" data-width="450" data-show-faces="true" data-font="arial"></div>
50
+ # }
51
+ # end
52
+
53
+ # Javascript snippet required by facebook to support share links.
54
+ #
55
+ # def include_facebook_sharing_link_javascript
56
+ # raw %{
57
+ # <div id="fb-root"></div>
58
+ # <script>(function(d, s, id) {
59
+ # var js, fjs = d.getElementsByTagName(s)[0];
60
+ # if (d.getElementById(id)) return;
61
+ # js = d.createElement(s); js.id = id;
62
+ # js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
63
+ # fjs.parentNode.insertBefore(js, fjs);
64
+ # }(document, 'script', 'facebook-jssdk'));</script>
51
65
  # }
52
66
  # end
53
67
 
data/lib/rostra/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rostra
2
- VERSION = "0.3.4"
2
+ VERSION = "0.3.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rostra
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.4
4
+ version: 0.3.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-17 00:00:00.000000000Z
12
+ date: 2012-07-06 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70233190336100 !ruby/object:Gem::Requirement
16
+ requirement: &70313136767640 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.3
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70233190336100
24
+ version_requirements: *70313136767640
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: jquery-rails
27
- requirement: &70233190335600 !ruby/object:Gem::Requirement
27
+ requirement: &70313136767120 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.19
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70233190335600
35
+ version_requirements: *70313136767120
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: acts-as-taggable-on
38
- requirement: &70233190335140 !ruby/object:Gem::Requirement
38
+ requirement: &70313136766580 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 2.1.1
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70233190335140
46
+ version_requirements: *70313136766580
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: cancan
49
- requirement: &70233190334640 !ruby/object:Gem::Requirement
49
+ requirement: &70313136766120 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.6.7
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70233190334640
57
+ version_requirements: *70313136766120
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: simple_form
60
- requirement: &70233190334140 !ruby/object:Gem::Requirement
60
+ requirement: &70313136765580 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.5.2
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70233190334140
68
+ version_requirements: *70313136765580
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: client_side_validations
71
- requirement: &70233190333680 !ruby/object:Gem::Requirement
71
+ requirement: &70313136765060 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 3.1.4
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70233190333680
79
+ version_requirements: *70313136765060
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: thumbs_up
82
- requirement: &70233190333220 !ruby/object:Gem::Requirement
82
+ requirement: &70313136764580 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.4.6
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70233190333220
90
+ version_requirements: *70313136764580
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: acts_as_commentable
93
- requirement: &70233190332760 !ruby/object:Gem::Requirement
93
+ requirement: &70313136764040 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 3.0.1
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70233190332760
101
+ version_requirements: *70313136764040
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: kaminari
104
- requirement: &70233190332300 !ruby/object:Gem::Requirement
104
+ requirement: &70313136763500 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 0.13.0
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70233190332300
112
+ version_requirements: *70313136763500
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: friendly_id
115
- requirement: &70233190331840 !ruby/object:Gem::Requirement
115
+ requirement: &70313136762940 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 4.0.0
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70233190331840
123
+ version_requirements: *70313136762940
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: impressionist
126
- requirement: &70233190331380 !ruby/object:Gem::Requirement
126
+ requirement: &70313136762440 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 1.0.0
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70233190331380
134
+ version_requirements: *70313136762440
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: sqlite3
137
- requirement: &70233190331000 !ruby/object:Gem::Requirement
137
+ requirement: &70313136762060 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70233190331000
145
+ version_requirements: *70313136762060
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: cucumber-rails
148
- requirement: &70233190330540 !ruby/object:Gem::Requirement
148
+ requirement: &70313136761460 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *70233190330540
156
+ version_requirements: *70313136761460
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: factory_girl_rails
159
- requirement: &70233190330120 !ruby/object:Gem::Requirement
159
+ requirement: &70313136760960 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '0'
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *70233190330120
167
+ version_requirements: *70313136760960
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: launchy
170
- requirement: &70233190329700 !ruby/object:Gem::Requirement
170
+ requirement: &70313136760540 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *70233190329700
178
+ version_requirements: *70313136760540
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: database_cleaner
181
- requirement: &70233190319260 !ruby/object:Gem::Requirement
181
+ requirement: &70313136760080 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *70233190319260
189
+ version_requirements: *70313136760080
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: rspec-rails
192
- requirement: &70233190318840 !ruby/object:Gem::Requirement
192
+ requirement: &70313136759560 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *70233190318840
200
+ version_requirements: *70313136759560
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: devise
203
- requirement: &70233190318380 !ruby/object:Gem::Requirement
203
+ requirement: &70313136759060 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: '0'
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *70233190318380
211
+ version_requirements: *70313136759060
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: pry
214
- requirement: &70233190317920 !ruby/object:Gem::Requirement
214
+ requirement: &70313136758520 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: '0'
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *70233190317920
222
+ version_requirements: *70313136758520
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: email_spec
225
- requirement: &70233190317440 !ruby/object:Gem::Requirement
225
+ requirement: &70313136758040 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
230
230
  version: '0'
231
231
  type: :development
232
232
  prerelease: false
233
- version_requirements: *70233190317440
233
+ version_requirements: *70313136758040
234
234
  description: Don't use. Not production ready
235
235
  email:
236
236
  - coryschires@gmail.com