locomotive_cms 2.0.0.rc5 → 2.0.0.rc6

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.
Files changed (6) hide show
  1. data/Gemfile +2 -0
  2. data/app/controllers/locomotive/public/content_entries_controller.rb +3 -0
  3. data/lib/locomotive/action_controller/responder.rb +7 -3
  4. data/lib/locomotive/haml.rb +3 -1
  5. data/lib/locomotive/version.rb +1 -1
  6. metadata +72 -72
data/Gemfile CHANGED
@@ -45,5 +45,7 @@ group :test do
45
45
 
46
46
  gem 'xpath', '~> 0.1.4'
47
47
 
48
+ gem 'json_spec'
49
+
48
50
  gem 'database_cleaner'
49
51
  end
data/app/controllers/locomotive/public/content_entries_controller.rb CHANGED
@@ -8,6 +8,8 @@ module Locomotive
8
8
 
9
9
  skip_before_filter :verify_authenticity_token
10
10
 
11
+ skip_load_and_authorize_resource
12
+
11
13
  self.responder = Locomotive::ActionController::PublicResponder # custom responder
12
14
 
13
15
  respond_to :html, :json
@@ -15,6 +17,7 @@ module Locomotive
15
17
  def create
16
18
  @entry = @content_type.entries.create(params[:entry] || params[:content])
17
19
  flash[@content_type.slug.singularize] = @entry.to_presenter(:include_errors => true).as_json
20
+ Rails.logger.debug @entry.to_presenter(:include_errors => true).as_json
18
21
  respond_with @entry, :location => self.callback_url
19
22
  end
20
23
 
data/lib/locomotive/action_controller/responder.rb CHANGED
@@ -10,10 +10,14 @@ module Locomotive
10
10
  end
11
11
 
12
12
  def options
13
+ current_site = self.controller.send(:current_site)
14
+ current_account = self.controller.send(:current_locomotive_account)
15
+ ability = current_account.nil? ? nil : self.controller.send(:current_ability)
16
+
13
17
  super.merge({
14
- :current_site => self.controller.send(:current_site),
15
- :current_account => self.controller.send(:current_locomotive_account),
16
- :ability => self.controller.send(:current_ability)
18
+ :current_site => current_site,
19
+ :current_account => current_account,
20
+ :ability => ability
17
21
  })
18
22
  end
19
23
 
data/lib/locomotive/haml.rb CHANGED
@@ -17,7 +17,9 @@ module ActionView
17
17
  content_tag_without_haml(name, content_or_options_with_block, *args, &block)
18
18
  end
19
19
  else
20
- if preserve && content_or_options_with_block
20
+ if name == 'textarea'
21
+ tab_down(haml_buffer.tabulation)
22
+ elsif preserve && content_or_options_with_block
21
23
  content_or_options_with_block = Haml::Helpers.preserve(content_or_options_with_block)
22
24
  end
23
25
  content_tag_without_haml(name, content_or_options_with_block, *args, &block)
data/lib/locomotive/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Locomotive #:nodoc
2
- VERSION = '2.0.0.rc5'
2
+ VERSION = '2.0.0.rc6'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: locomotive_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc5
4
+ version: 2.0.0.rc6
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-04-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &2152269500 !ruby/object:Gem::Requirement
16
+ requirement: &2152167580 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.9.2
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2152269500
24
+ version_requirements: *2152167580
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rails
27
- requirement: &2152268040 !ruby/object:Gem::Requirement
27
+ requirement: &2152022600 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 3.2.3
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2152268040
35
+ version_requirements: *2152022600
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise
38
- requirement: &2152133040 !ruby/object:Gem::Requirement
38
+ requirement: &2152020640 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.5.3
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2152133040
46
+ version_requirements: *2152020640
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: cancan
49
- requirement: &2152132220 !ruby/object:Gem::Requirement
49
+ requirement: &2152019000 !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: *2152132220
57
+ version_requirements: *2152019000
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mongo
60
- requirement: &2152130880 !ruby/object:Gem::Requirement
60
+ requirement: &2152180180 !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: *2152130880
68
+ version_requirements: *2152180180
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bson_ext
71
- requirement: &2152129900 !ruby/object:Gem::Requirement
71
+ requirement: &2152178640 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 1.5.2
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *2152129900
79
+ version_requirements: *2152178640
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: mongoid
82
- requirement: &2152128800 !ruby/object:Gem::Requirement
82
+ requirement: &2152177040 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 2.4.6
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *2152128800
90
+ version_requirements: *2152177040
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: locomotive-mongoid-tree
93
- requirement: &2152127880 !ruby/object:Gem::Requirement
93
+ requirement: &2152175700 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 0.6.2
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *2152127880
101
+ version_requirements: *2152175700
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: custom_fields
104
- requirement: &2152126860 !ruby/object:Gem::Requirement
104
+ requirement: &2152174340 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 2.0.0.rc9
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *2152126860
112
+ version_requirements: *2152174340
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: kaminari
115
- requirement: &2152125800 !ruby/object:Gem::Requirement
115
+ requirement: &2152173440 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 0.13.0
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *2152125800
123
+ version_requirements: *2152173440
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: haml
126
- requirement: &2152161020 !ruby/object:Gem::Requirement
126
+ requirement: &2152172640 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 3.1.4
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *2152161020
134
+ version_requirements: *2152172640
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: jquery-rails
137
- requirement: &2152159520 !ruby/object:Gem::Requirement
137
+ requirement: &2152188000 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: 1.0.16
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *2152159520
145
+ version_requirements: *2152188000
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: rails-backbone
148
- requirement: &2152157680 !ruby/object:Gem::Requirement
148
+ requirement: &2152186500 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 0.6.1
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *2152157680
156
+ version_requirements: *2152186500
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: codemirror-rails
159
- requirement: &2152155460 !ruby/object:Gem::Requirement
159
+ requirement: &2152185160 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '2.21'
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *2152155460
167
+ version_requirements: *2152185160
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: locomotive-tinymce-rails
170
- requirement: &2152212800 !ruby/object:Gem::Requirement
170
+ requirement: &2152184040 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ~>
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 3.4.7.2
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *2152212800
178
+ version_requirements: *2152184040
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: locomotive-aloha-rails
181
- requirement: &2152210420 !ruby/object:Gem::Requirement
181
+ requirement: &2152181920 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 0.20.1.2
187
187
  type: :runtime
188
188
  prerelease: false
189
- version_requirements: *2152210420
189
+ version_requirements: *2152181920
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: flash_cookie_session
192
- requirement: &2152209360 !ruby/object:Gem::Requirement
192
+ requirement: &2152180740 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ~>
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: 1.1.1
198
198
  type: :runtime
199
199
  prerelease: false
200
- version_requirements: *2152209360
200
+ version_requirements: *2152180740
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: locomotive_liquid
203
- requirement: &2152208600 !ruby/object:Gem::Requirement
203
+ requirement: &2152263740 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - =
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: 2.2.2
209
209
  type: :runtime
210
210
  prerelease: false
211
- version_requirements: *2152208600
211
+ version_requirements: *2152263740
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: formtastic
214
- requirement: &2152207760 !ruby/object:Gem::Requirement
214
+ requirement: &2152261540 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ~>
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: 2.0.2
220
220
  type: :runtime
221
221
  prerelease: false
222
- version_requirements: *2152207760
222
+ version_requirements: *2152261540
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: responders
225
- requirement: &2152316820 !ruby/object:Gem::Requirement
225
+ requirement: &2152300500 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ~>
@@ -230,10 +230,10 @@ dependencies:
230
230
  version: 0.6.4
231
231
  type: :runtime
232
232
  prerelease: false
233
- version_requirements: *2152316820
233
+ version_requirements: *2152300500
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: cells
236
- requirement: &2152316020 !ruby/object:Gem::Requirement
236
+ requirement: &2152299700 !ruby/object:Gem::Requirement
237
237
  none: false
238
238
  requirements:
239
239
  - - ~>
@@ -241,10 +241,10 @@ dependencies:
241
241
  version: 3.8.0
242
242
  type: :runtime
243
243
  prerelease: false
244
- version_requirements: *2152316020
244
+ version_requirements: *2152299700
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: RedCloth
247
- requirement: &2152315200 !ruby/object:Gem::Requirement
247
+ requirement: &2152298780 !ruby/object:Gem::Requirement
248
248
  none: false
249
249
  requirements:
250
250
  - - ~>
@@ -252,10 +252,10 @@ dependencies:
252
252
  version: 4.2.8
253
253
  type: :runtime
254
254
  prerelease: false
255
- version_requirements: *2152315200
255
+ version_requirements: *2152298780
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: sanitize
258
- requirement: &2152314280 !ruby/object:Gem::Requirement
258
+ requirement: &2152298000 !ruby/object:Gem::Requirement
259
259
  none: false
260
260
  requirements:
261
261
  - - ~>
@@ -263,10 +263,10 @@ dependencies:
263
263
  version: 2.0.3
264
264
  type: :runtime
265
265
  prerelease: false
266
- version_requirements: *2152314280
266
+ version_requirements: *2152298000
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: highline
269
- requirement: &2152313520 !ruby/object:Gem::Requirement
269
+ requirement: &2152292920 !ruby/object:Gem::Requirement
270
270
  none: false
271
271
  requirements:
272
272
  - - ~>
@@ -274,10 +274,10 @@ dependencies:
274
274
  version: 1.6.2
275
275
  type: :runtime
276
276
  prerelease: false
277
- version_requirements: *2152313520
277
+ version_requirements: *2152292920
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: unidecoder
280
- requirement: &2152312740 !ruby/object:Gem::Requirement
280
+ requirement: &2152322980 !ruby/object:Gem::Requirement
281
281
  none: false
282
282
  requirements:
283
283
  - - ~>
@@ -285,10 +285,10 @@ dependencies:
285
285
  version: 1.1.1
286
286
  type: :runtime
287
287
  prerelease: false
288
- version_requirements: *2152312740
288
+ version_requirements: *2152322980
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: rmagick
291
- requirement: &2152310080 !ruby/object:Gem::Requirement
291
+ requirement: &2152320340 !ruby/object:Gem::Requirement
292
292
  none: false
293
293
  requirements:
294
294
  - - ~>
@@ -296,10 +296,10 @@ dependencies:
296
296
  version: 2.12.2
297
297
  type: :runtime
298
298
  prerelease: false
299
- version_requirements: *2152310080
299
+ version_requirements: *2152320340
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: carrierwave-mongoid
302
- requirement: &2152445600 !ruby/object:Gem::Requirement
302
+ requirement: &2152318520 !ruby/object:Gem::Requirement
303
303
  none: false
304
304
  requirements:
305
305
  - - ~>
@@ -307,10 +307,10 @@ dependencies:
307
307
  version: 0.1.3
308
308
  type: :runtime
309
309
  prerelease: false
310
- version_requirements: *2152445600
310
+ version_requirements: *2152318520
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: carrierwave
313
- requirement: &2152443360 !ruby/object:Gem::Requirement
313
+ requirement: &2152348760 !ruby/object:Gem::Requirement
314
314
  none: false
315
315
  requirements:
316
316
  - - ~>
@@ -318,10 +318,10 @@ dependencies:
318
318
  version: 0.6.0
319
319
  type: :runtime
320
320
  prerelease: false
321
- version_requirements: *2152443360
321
+ version_requirements: *2152348760
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: fog
324
- requirement: &2152440280 !ruby/object:Gem::Requirement
324
+ requirement: &2152346900 !ruby/object:Gem::Requirement
325
325
  none: false
326
326
  requirements:
327
327
  - - ~>
@@ -329,10 +329,10 @@ dependencies:
329
329
  version: 1.3.1
330
330
  type: :runtime
331
331
  prerelease: false
332
- version_requirements: *2152440280
332
+ version_requirements: *2152346900
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: dragonfly
335
- requirement: &2152437840 !ruby/object:Gem::Requirement
335
+ requirement: &2152345800 !ruby/object:Gem::Requirement
336
336
  none: false
337
337
  requirements:
338
338
  - - ~>
@@ -340,10 +340,10 @@ dependencies:
340
340
  version: 0.9.8
341
341
  type: :runtime
342
342
  prerelease: false
343
- version_requirements: *2152437840
343
+ version_requirements: *2152345800
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: rack-cache
346
- requirement: &2152436720 !ruby/object:Gem::Requirement
346
+ requirement: &2152341480 !ruby/object:Gem::Requirement
347
347
  none: false
348
348
  requirements:
349
349
  - - ~>
@@ -351,10 +351,10 @@ dependencies:
351
351
  version: '1.1'
352
352
  type: :runtime
353
353
  prerelease: false
354
- version_requirements: *2152436720
354
+ version_requirements: *2152341480
355
355
  - !ruby/object:Gem::Dependency
356
356
  name: mimetype-fu
357
- requirement: &2152435240 !ruby/object:Gem::Requirement
357
+ requirement: &2152356720 !ruby/object:Gem::Requirement
358
358
  none: false
359
359
  requirements:
360
360
  - - ~>
@@ -362,10 +362,10 @@ dependencies:
362
362
  version: 0.1.2
363
363
  type: :runtime
364
364
  prerelease: false
365
- version_requirements: *2152435240
365
+ version_requirements: *2152356720
366
366
  - !ruby/object:Gem::Dependency
367
367
  name: multi_json
368
- requirement: &2152433720 !ruby/object:Gem::Requirement
368
+ requirement: &2152356080 !ruby/object:Gem::Requirement
369
369
  none: false
370
370
  requirements:
371
371
  - - =
@@ -373,10 +373,10 @@ dependencies:
373
373
  version: 1.2.0
374
374
  type: :runtime
375
375
  prerelease: false
376
- version_requirements: *2152433720
376
+ version_requirements: *2152356080
377
377
  - !ruby/object:Gem::Dependency
378
378
  name: httparty
379
- requirement: &2152426200 !ruby/object:Gem::Requirement
379
+ requirement: &2152355220 !ruby/object:Gem::Requirement
380
380
  none: false
381
381
  requirements:
382
382
  - - ~>
@@ -384,10 +384,10 @@ dependencies:
384
384
  version: 0.8.1
385
385
  type: :runtime
386
386
  prerelease: false
387
- version_requirements: *2152426200
387
+ version_requirements: *2152355220
388
388
  - !ruby/object:Gem::Dependency
389
389
  name: actionmailer-with-request
390
- requirement: &2152418020 !ruby/object:Gem::Requirement
390
+ requirement: &2152354540 !ruby/object:Gem::Requirement
391
391
  none: false
392
392
  requirements:
393
393
  - - ~>
@@ -395,7 +395,7 @@ dependencies:
395
395
  version: 0.3.0
396
396
  type: :runtime
397
397
  prerelease: false
398
- version_requirements: *2152418020
398
+ version_requirements: *2152354540
399
399
  description: Locomotive is a next generation CMS system with sexy admin tools, liquid
400
400
  templating, and inline editing powered by mongodb and rails 3.2
401
401
  email:
@@ -975,7 +975,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
975
975
  version: '0'
976
976
  segments:
977
977
  - 0
978
- hash: -3180682494187684957
978
+ hash: -2291864863036399309
979
979
  required_rubygems_version: !ruby/object:Gem::Requirement
980
980
  none: false
981
981
  requirements: