locomotive_cms 2.0.0.rc1 → 2.0.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (41) hide show
  1. data/Gemfile +1 -1
  2. data/LICENSE +1 -1
  3. data/app/assets/javascripts/locomotive/models/editable_element.js.coffee +5 -0
  4. data/app/assets/stylesheets/locomotive/backoffice/application.css.scss +12 -0
  5. data/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss +5 -3
  6. data/app/assets/stylesheets/locomotive/shared/_helpers.css.scss +15 -0
  7. data/app/controllers/locomotive/api/content_entries_controller.rb +6 -1
  8. data/app/helpers/locomotive/content_types_helper.rb +2 -2
  9. data/app/helpers/locomotive/custom_fields_helper.rb +1 -1
  10. data/app/models/locomotive/content_entry.rb +12 -2
  11. data/app/models/locomotive/content_type.rb +32 -83
  12. data/app/models/locomotive/editable_file.rb +2 -2
  13. data/app/models/locomotive/extensions/content_type/default_values.rb +59 -0
  14. data/app/models/locomotive/extensions/content_type/sync.rb +62 -0
  15. data/app/models/locomotive/extensions/page/tree.rb +4 -4
  16. data/app/models/locomotive/extensions/site/locales.rb +0 -1
  17. data/app/models/locomotive/page.rb +6 -2
  18. data/app/models/locomotive/snippet.rb +3 -1
  19. data/app/presenters/locomotive/content_entry_presenter.rb +14 -9
  20. data/app/views/locomotive/content_entries/_list.html.haml +4 -0
  21. data/app/views/locomotive/pages/_page.html.haml +3 -0
  22. data/config/locales/admin_ui.de.yml +98 -100
  23. data/config/locales/admin_ui.en.yml +2 -0
  24. data/config/locales/admin_ui.fr.yml +2 -0
  25. data/config/locales/default.es.yml +2 -2
  26. data/lib/generators/locomotive/install/templates/carrierwave.rb +8 -5
  27. data/lib/locomotive.rb +0 -2
  28. data/lib/locomotive/carrierwave/base.rb +5 -5
  29. data/lib/locomotive/configuration.rb +1 -1
  30. data/lib/locomotive/custom_fields.rb +1 -1
  31. data/lib/locomotive/dependencies.rb +0 -2
  32. data/lib/locomotive/engine.rb +0 -2
  33. data/lib/locomotive/liquid/drops/content_entry.rb +19 -2
  34. data/lib/locomotive/liquid/drops/page.rb +4 -0
  35. data/lib/locomotive/liquid/drops/uploader.rb +15 -0
  36. data/lib/locomotive/liquid/tags/nav.rb +18 -5
  37. data/lib/locomotive/liquid/tags/with_scope.rb +17 -9
  38. data/lib/locomotive/routing/site_dispatcher.rb +1 -1
  39. data/lib/locomotive/version.rb +1 -1
  40. data/lib/tasks/locomotive.rake +7 -185
  41. metadata +71 -68
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.rc1
4
+ version: 2.0.0.rc2
5
5
  prerelease: 6
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-03-01 00:00:00.000000000 Z
12
+ date: 2012-03-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &2152876660 !ruby/object:Gem::Requirement
16
+ requirement: &2153204100 !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: *2152876660
24
+ version_requirements: *2153204100
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rails
27
- requirement: &2152876180 !ruby/object:Gem::Requirement
27
+ requirement: &2153203600 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 3.2.1
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2152876180
35
+ version_requirements: *2153203600
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise
38
- requirement: &2152875600 !ruby/object:Gem::Requirement
38
+ requirement: &2153202920 !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: *2152875600
46
+ version_requirements: *2153202920
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: cancan
49
- requirement: &2152875100 !ruby/object:Gem::Requirement
49
+ requirement: &2153227140 !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: *2152875100
57
+ version_requirements: *2153227140
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mongo
60
- requirement: &2152874580 !ruby/object:Gem::Requirement
60
+ requirement: &2153226560 !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: *2152874580
68
+ version_requirements: *2153226560
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bson_ext
71
- requirement: &2152874080 !ruby/object:Gem::Requirement
71
+ requirement: &2153225680 !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: *2152874080
79
+ version_requirements: *2153225680
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: mongoid
82
- requirement: &2152873580 !ruby/object:Gem::Requirement
82
+ requirement: &2153224620 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 2.4.5
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *2152873580
90
+ version_requirements: *2153224620
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: locomotive-mongoid-tree
93
- requirement: &2152873080 !ruby/object:Gem::Requirement
93
+ requirement: &2153223680 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,21 +98,21 @@ dependencies:
98
98
  version: 0.6.2
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *2152873080
101
+ version_requirements: *2153223680
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: custom_fields
104
- requirement: &2152872580 !ruby/object:Gem::Requirement
104
+ requirement: &2153222460 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: 2.0.0.rc5
109
+ version: 2.0.0.rc8
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *2152872580
112
+ version_requirements: *2153222460
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: kaminari
115
- requirement: &2153061020 !ruby/object:Gem::Requirement
115
+ requirement: &2153220580 !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: *2153061020
123
+ version_requirements: *2153220580
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: haml
126
- requirement: &2153060540 !ruby/object:Gem::Requirement
126
+ requirement: &2153212840 !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: *2153060540
134
+ version_requirements: *2153212840
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: jquery-rails
137
- requirement: &2153060040 !ruby/object:Gem::Requirement
137
+ requirement: &2153247500 !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: *2153060040
145
+ version_requirements: *2153247500
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: rails-backbone
148
- requirement: &2153059560 !ruby/object:Gem::Requirement
148
+ requirement: &2153245780 !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: *2153059560
156
+ version_requirements: *2153245780
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: codemirror-rails
159
- requirement: &2153058900 !ruby/object:Gem::Requirement
159
+ requirement: &2153244140 !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: *2153058900
167
+ version_requirements: *2153244140
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: locomotive-tinymce-rails
170
- requirement: &2153058300 !ruby/object:Gem::Requirement
170
+ requirement: &2153242980 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ~>
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 3.4.7.1
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *2153058300
178
+ version_requirements: *2153242980
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: locomotive-aloha-rails
181
- requirement: &2153057720 !ruby/object:Gem::Requirement
181
+ requirement: &2153241900 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 0.20.1.1
187
187
  type: :runtime
188
188
  prerelease: false
189
- version_requirements: *2153057720
189
+ version_requirements: *2153241900
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: flash_cookie_session
192
- requirement: &2153057240 !ruby/object:Gem::Requirement
192
+ requirement: &2153256760 !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: *2153057240
200
+ version_requirements: *2153256760
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: locomotive_liquid
203
- requirement: &2153056740 !ruby/object:Gem::Requirement
203
+ requirement: &2153253320 !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: *2153056740
211
+ version_requirements: *2153253320
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: formtastic
214
- requirement: &2153056240 !ruby/object:Gem::Requirement
214
+ requirement: &2153251760 !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: *2153056240
222
+ version_requirements: *2153251760
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: responders
225
- requirement: &2153055680 !ruby/object:Gem::Requirement
225
+ requirement: &2153249860 !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: *2153055680
233
+ version_requirements: *2153249860
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: cells
236
- requirement: &2153055200 !ruby/object:Gem::Requirement
236
+ requirement: &2153264800 !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: *2153055200
244
+ version_requirements: *2153264800
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: RedCloth
247
- requirement: &2153054720 !ruby/object:Gem::Requirement
247
+ requirement: &2153264000 !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: *2153054720
255
+ version_requirements: *2153264000
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: sanitize
258
- requirement: &2153054240 !ruby/object:Gem::Requirement
258
+ requirement: &2153263040 !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: *2153054240
266
+ version_requirements: *2153263040
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: highline
269
- requirement: &2153053680 !ruby/object:Gem::Requirement
269
+ requirement: &2153262020 !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: *2153053680
277
+ version_requirements: *2153262020
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: rmagick
280
- requirement: &2153053200 !ruby/object:Gem::Requirement
280
+ requirement: &2153260720 !ruby/object:Gem::Requirement
281
281
  none: false
282
282
  requirements:
283
283
  - - ~>
@@ -285,10 +285,10 @@ dependencies:
285
285
  version: 2.12.2
286
286
  type: :runtime
287
287
  prerelease: false
288
- version_requirements: *2153053200
288
+ version_requirements: *2153260720
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: carrierwave-mongoid
291
- requirement: &2153488920 !ruby/object:Gem::Requirement
291
+ requirement: &2153259320 !ruby/object:Gem::Requirement
292
292
  none: false
293
293
  requirements:
294
294
  - - ~>
@@ -296,10 +296,10 @@ dependencies:
296
296
  version: 0.1.3
297
297
  type: :runtime
298
298
  prerelease: false
299
- version_requirements: *2153488920
299
+ version_requirements: *2153259320
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: fog
302
- requirement: &2153488420 !ruby/object:Gem::Requirement
302
+ requirement: &2153257880 !ruby/object:Gem::Requirement
303
303
  none: false
304
304
  requirements:
305
305
  - - ~>
@@ -307,10 +307,10 @@ dependencies:
307
307
  version: 1.1.2
308
308
  type: :runtime
309
309
  prerelease: false
310
- version_requirements: *2153488420
310
+ version_requirements: *2153257880
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: dragonfly
313
- requirement: &2153487940 !ruby/object:Gem::Requirement
313
+ requirement: &2153277600 !ruby/object:Gem::Requirement
314
314
  none: false
315
315
  requirements:
316
316
  - - ~>
@@ -318,10 +318,10 @@ dependencies:
318
318
  version: 0.9.8
319
319
  type: :runtime
320
320
  prerelease: false
321
- version_requirements: *2153487940
321
+ version_requirements: *2153277600
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: rack-cache
324
- requirement: &2153487440 !ruby/object:Gem::Requirement
324
+ requirement: &2153272620 !ruby/object:Gem::Requirement
325
325
  none: false
326
326
  requirements:
327
327
  - - ~>
@@ -329,10 +329,10 @@ dependencies:
329
329
  version: '1.1'
330
330
  type: :runtime
331
331
  prerelease: false
332
- version_requirements: *2153487440
332
+ version_requirements: *2153272620
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: mimetype-fu
335
- requirement: &2153486960 !ruby/object:Gem::Requirement
335
+ requirement: &2153271060 !ruby/object:Gem::Requirement
336
336
  none: false
337
337
  requirements:
338
338
  - - ~>
@@ -340,10 +340,10 @@ dependencies:
340
340
  version: 0.1.2
341
341
  type: :runtime
342
342
  prerelease: false
343
- version_requirements: *2153486960
343
+ version_requirements: *2153271060
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: httparty
346
- requirement: &2153486420 !ruby/object:Gem::Requirement
346
+ requirement: &2153286080 !ruby/object:Gem::Requirement
347
347
  none: false
348
348
  requirements:
349
349
  - - ~>
@@ -351,10 +351,10 @@ dependencies:
351
351
  version: 0.8.1
352
352
  type: :runtime
353
353
  prerelease: false
354
- version_requirements: *2153486420
354
+ version_requirements: *2153286080
355
355
  - !ruby/object:Gem::Dependency
356
356
  name: actionmailer-with-request
357
- requirement: &2153485940 !ruby/object:Gem::Requirement
357
+ requirement: &2153300660 !ruby/object:Gem::Requirement
358
358
  none: false
359
359
  requirements:
360
360
  - - ~>
@@ -362,7 +362,7 @@ dependencies:
362
362
  version: 0.3.0
363
363
  type: :runtime
364
364
  prerelease: false
365
- version_requirements: *2153485940
365
+ version_requirements: *2153300660
366
366
  description: Locomotive is a next generation CMS system with sexy admin tools, liquid
367
367
  templating, and inline editing powered by mongodb and rails 3.2
368
368
  email:
@@ -630,7 +630,9 @@ files:
630
630
  - app/models/locomotive/editable_short_text.rb
631
631
  - app/models/locomotive/extensions/asset/types.rb
632
632
  - app/models/locomotive/extensions/asset/vignette.rb
633
+ - app/models/locomotive/extensions/content_type/default_values.rb
633
634
  - app/models/locomotive/extensions/content_type/item_template.rb
635
+ - app/models/locomotive/extensions/content_type/sync.rb
634
636
  - app/models/locomotive/extensions/page/editable_elements.rb
635
637
  - app/models/locomotive/extensions/page/listed.rb
636
638
  - app/models/locomotive/extensions/page/parse.rb
@@ -833,6 +835,7 @@ files:
833
835
  - lib/locomotive/liquid/drops/page.rb
834
836
  - lib/locomotive/liquid/drops/proxy_collection.rb
835
837
  - lib/locomotive/liquid/drops/site.rb
838
+ - lib/locomotive/liquid/drops/uploader.rb
836
839
  - lib/locomotive/liquid/errors.rb
837
840
  - lib/locomotive/liquid/filters/date.rb
838
841
  - lib/locomotive/liquid/filters/html.rb
@@ -932,7 +935,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
932
935
  version: '0'
933
936
  segments:
934
937
  - 0
935
- hash: -910836430079529692
938
+ hash: -83862072915478114
936
939
  required_rubygems_version: !ruby/object:Gem::Requirement
937
940
  none: false
938
941
  requirements: