alchemy_cms 2.7.2 → 2.7.3

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +10 -11
  3. data/alchemy_cms.gemspec +0 -1
  4. data/app/views/alchemy/admin/pages/configure.html.erb +1 -1
  5. data/lib/alchemy/tinymce.rb +2 -1
  6. data/lib/alchemy/version.rb +1 -3
  7. data/spec/libraries/tinymce_spec.rb +8 -0
  8. metadata +62 -76
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ecc49224edb076e4d074a37cd7c8b0d5c28980e5
4
- data.tar.gz: a5f478f502e5385c1dde9763e448386cba0d41f0
3
+ metadata.gz: 0c1712ce9ba3131c3371c70272b7db7d6c4c1841
4
+ data.tar.gz: 5c448ca386ced2c678073043337dd5bc9c07ca75
5
5
  SHA512:
6
- metadata.gz: f5ca9eda67f8cda86864329b0b0f113d8d29da3aeb2db1f46a677ab6b4ef3da38ffe4d6b26b851824cc767bceb94751729e20876a8d7af6d4e0b8b430438bc0c
7
- data.tar.gz: 87baad981ff2942c54e8a497738213fc529c94f0e997515c20081e99f3bc08d3b11bcb3865477880e87b363ee14566b2430c88c2c561865d67cebd77aef94bbd
6
+ metadata.gz: ccf13a66d86c853cde47712863466b0652adebd807c917b1b5c0f2709eb92e467f0b1fdf23d6e2e3d89c7a8cb697628c7341adfa47f2d88991060e6073b8fe05
7
+ data.tar.gz: 7356a7ee68fef0e7c8c8344fc7e8ed3c1ee252631bda7604f586017f7e8a13455df55cdaecb38a451b91f578a3dc41710cb68c34023976961a187a91f04c0956
data/Gemfile CHANGED
@@ -10,10 +10,17 @@ gem 'multi_json', '1.7.2' # http://stackoverflow.com/q/16543693
10
10
  # Code coverage plattform
11
11
  gem 'coveralls', require: false
12
12
 
13
+ gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
14
+ gem 'mysql2' if ENV['DB'] == 'mysql'
15
+ gem 'pg' if ENV['DB'] == 'postgresql'
16
+
17
+ unless ENV['CI']
18
+ gem 'pry'
19
+ gem 'quiet_assets' # Mute assets loggin
20
+ gem 'thin' # Get rid off 'Could not determine content-length of response body' Warning. Start with 'rails s thin'
21
+ end
22
+
13
23
  group :test do
14
- gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
15
- gem 'mysql2' if ENV['DB'] == 'mysql'
16
- gem 'pg' if ENV['DB'] == 'postgresql'
17
24
  unless ENV['FAST_SPECS']
18
25
  gem 'poltergeist'
19
26
  gem 'connection_pool' # https://gist.github.com/mperham/3049152
@@ -28,11 +35,3 @@ group :assets do
28
35
  gem 'coffee-rails', '~> 3.2.1'
29
36
  gem 'uglifier', '>= 1.0.3'
30
37
  end
31
-
32
- group :development, :test do
33
- unless ENV['CI']
34
- gem 'pry'
35
- gem 'quiet_assets' # Mute assets loggin
36
- gem 'thin' # Get rid off 'Could not determine content-length of response body' Warning. Start with 'rails s thin'
37
- end
38
- end
data/alchemy_cms.gemspec CHANGED
@@ -57,7 +57,6 @@ POST_INSTALL
57
57
  s.add_development_dependency %q<capybara>, ['~> 2.0.3']
58
58
  s.add_development_dependency %q<factory_girl_rails>
59
59
  s.add_development_dependency %q<rspec-rails>, ['~> 2.13.1']
60
- s.add_development_dependency %q<sqlite3>
61
60
  s.add_development_dependency %q<yard>
62
61
  s.add_development_dependency %q<redcarpet>
63
62
 
data/app/views/alchemy/admin/pages/configure.html.erb CHANGED
@@ -17,7 +17,7 @@
17
17
  <%= f.label :visible %><br/>
18
18
  <%= f.check_box :restricted %>
19
19
  <%= f.label :restricted %>
20
- <% if configuration(:sitemap)[:show_flag] %><br/>
20
+ <% if configuration(:sitemap)['show_flag'] %><br/>
21
21
  <%= f.check_box :sitemap %>
22
22
  <%= f.label :sitemap %>
23
23
  <% end %>
data/lib/alchemy/tinymce.rb CHANGED
@@ -54,7 +54,8 @@ module Alchemy
54
54
 
55
55
  def self.content_definitions_from_elements(definitions)
56
56
  definitions.collect do |el|
57
- contents = el.fetch('contents', []).select { |c| c['settings'] && c['settings']['tinymce'].present? }
57
+ next if el['contents'].blank?
58
+ contents = el['contents'].select { |c| c['settings'] && c['settings']['tinymce'].present? }
58
59
  next if contents.blank?
59
60
  contents.map { |c| c.merge('element' => el['name']) }
60
61
  end.flatten.compact
data/lib/alchemy/version.rb CHANGED
@@ -1,9 +1,7 @@
1
1
  module Alchemy
2
-
3
- VERSION = "2.7.2"
2
+ VERSION = "2.7.3"
4
3
 
5
4
  def self.version
6
5
  VERSION
7
6
  end
8
-
9
7
  end
data/spec/libraries/tinymce_spec.rb CHANGED
@@ -54,6 +54,14 @@ module Alchemy
54
54
  should be_an(Array)
55
55
  should include({'element' => element_definition['name']}.merge(content_definition))
56
56
  end
57
+
58
+ context 'with element definition having nil as contents value' do
59
+ let(:element_definition) { {'name' => 'element', 'contents' => nil} }
60
+
61
+ it "returns empty array" do
62
+ should eq([])
63
+ end
64
+ end
57
65
  end
58
66
  end
59
67
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.7.2
4
+ version: 2.7.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
@@ -12,384 +12,370 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2014-01-11 00:00:00.000000000 Z
15
+ date: 2014-04-23 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: rails
19
19
  requirement: !ruby/object:Gem::Requirement
20
20
  requirements:
21
- - - ~>
21
+ - - "~>"
22
22
  - !ruby/object:Gem::Version
23
23
  version: 3.2.13
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
27
27
  requirements:
28
- - - ~>
28
+ - - "~>"
29
29
  - !ruby/object:Gem::Version
30
30
  version: 3.2.13
31
31
  - !ruby/object:Gem::Dependency
32
32
  name: devise
33
33
  requirement: !ruby/object:Gem::Requirement
34
34
  requirements:
35
- - - ~>
35
+ - - "~>"
36
36
  - !ruby/object:Gem::Version
37
37
  version: 2.2.3
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
41
41
  requirements:
42
- - - ~>
42
+ - - "~>"
43
43
  - !ruby/object:Gem::Version
44
44
  version: 2.2.3
45
45
  - !ruby/object:Gem::Dependency
46
46
  name: awesome_nested_set
47
47
  requirement: !ruby/object:Gem::Requirement
48
48
  requirements:
49
- - - ~>
49
+ - - "~>"
50
50
  - !ruby/object:Gem::Version
51
51
  version: '2.0'
52
52
  type: :runtime
53
53
  prerelease: false
54
54
  version_requirements: !ruby/object:Gem::Requirement
55
55
  requirements:
56
- - - ~>
56
+ - - "~>"
57
57
  - !ruby/object:Gem::Version
58
58
  version: '2.0'
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: acts-as-taggable-on
61
61
  requirement: !ruby/object:Gem::Requirement
62
62
  requirements:
63
- - - ~>
63
+ - - "~>"
64
64
  - !ruby/object:Gem::Version
65
65
  version: '2.1'
66
66
  type: :runtime
67
67
  prerelease: false
68
68
  version_requirements: !ruby/object:Gem::Requirement
69
69
  requirements:
70
- - - ~>
70
+ - - "~>"
71
71
  - !ruby/object:Gem::Version
72
72
  version: '2.1'
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: declarative_authorization
75
75
  requirement: !ruby/object:Gem::Requirement
76
76
  requirements:
77
- - - ~>
77
+ - - "~>"
78
78
  - !ruby/object:Gem::Version
79
79
  version: 0.5.7
80
80
  type: :runtime
81
81
  prerelease: false
82
82
  version_requirements: !ruby/object:Gem::Requirement
83
83
  requirements:
84
- - - ~>
84
+ - - "~>"
85
85
  - !ruby/object:Gem::Version
86
86
  version: 0.5.7
87
87
  - !ruby/object:Gem::Dependency
88
88
  name: dragonfly
89
89
  requirement: !ruby/object:Gem::Requirement
90
90
  requirements:
91
- - - ~>
91
+ - - "~>"
92
92
  - !ruby/object:Gem::Version
93
93
  version: 0.9.14
94
94
  type: :runtime
95
95
  prerelease: false
96
96
  version_requirements: !ruby/object:Gem::Requirement
97
97
  requirements:
98
- - - ~>
98
+ - - "~>"
99
99
  - !ruby/object:Gem::Version
100
100
  version: 0.9.14
101
101
  - !ruby/object:Gem::Dependency
102
102
  name: kaminari
103
103
  requirement: !ruby/object:Gem::Requirement
104
104
  requirements:
105
- - - ~>
105
+ - - "~>"
106
106
  - !ruby/object:Gem::Version
107
107
  version: 0.14.1
108
108
  type: :runtime
109
109
  prerelease: false
110
110
  version_requirements: !ruby/object:Gem::Requirement
111
111
  requirements:
112
- - - ~>
112
+ - - "~>"
113
113
  - !ruby/object:Gem::Version
114
114
  version: 0.14.1
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: acts_as_ferret
117
117
  requirement: !ruby/object:Gem::Requirement
118
118
  requirements:
119
- - - ~>
119
+ - - "~>"
120
120
  - !ruby/object:Gem::Version
121
121
  version: '0.5'
122
122
  type: :runtime
123
123
  prerelease: false
124
124
  version_requirements: !ruby/object:Gem::Requirement
125
125
  requirements:
126
- - - ~>
126
+ - - "~>"
127
127
  - !ruby/object:Gem::Version
128
128
  version: '0.5'
129
129
  - !ruby/object:Gem::Dependency
130
130
  name: acts_as_list
131
131
  requirement: !ruby/object:Gem::Requirement
132
132
  requirements:
133
- - - ~>
133
+ - - "~>"
134
134
  - !ruby/object:Gem::Version
135
135
  version: 0.2.0
136
136
  type: :runtime
137
137
  prerelease: false
138
138
  version_requirements: !ruby/object:Gem::Requirement
139
139
  requirements:
140
- - - ~>
140
+ - - "~>"
141
141
  - !ruby/object:Gem::Version
142
142
  version: 0.2.0
143
143
  - !ruby/object:Gem::Dependency
144
144
  name: magiclabs-userstamp
145
145
  requirement: !ruby/object:Gem::Requirement
146
146
  requirements:
147
- - - ~>
147
+ - - "~>"
148
148
  - !ruby/object:Gem::Version
149
149
  version: 2.0.2
150
150
  type: :runtime
151
151
  prerelease: false
152
152
  version_requirements: !ruby/object:Gem::Requirement
153
153
  requirements:
154
- - - ~>
154
+ - - "~>"
155
155
  - !ruby/object:Gem::Version
156
156
  version: 2.0.2
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: dynamic_form
159
159
  requirement: !ruby/object:Gem::Requirement
160
160
  requirements:
161
- - - ~>
161
+ - - "~>"
162
162
  - !ruby/object:Gem::Version
163
163
  version: '1.1'
164
164
  type: :runtime
165
165
  prerelease: false
166
166
  version_requirements: !ruby/object:Gem::Requirement
167
167
  requirements:
168
- - - ~>
168
+ - - "~>"
169
169
  - !ruby/object:Gem::Version
170
170
  version: '1.1'
171
171
  - !ruby/object:Gem::Dependency
172
172
  name: jquery-rails
173
173
  requirement: !ruby/object:Gem::Requirement
174
174
  requirements:
175
- - - ~>
175
+ - - "~>"
176
176
  - !ruby/object:Gem::Version
177
177
  version: 3.0.4
178
178
  type: :runtime
179
179
  prerelease: false
180
180
  version_requirements: !ruby/object:Gem::Requirement
181
181
  requirements:
182
- - - ~>
182
+ - - "~>"
183
183
  - !ruby/object:Gem::Version
184
184
  version: 3.0.4
185
185
  - !ruby/object:Gem::Dependency
186
186
  name: jquery-ui-rails
187
187
  requirement: !ruby/object:Gem::Requirement
188
188
  requirements:
189
- - - ~>
189
+ - - "~>"
190
190
  - !ruby/object:Gem::Version
191
191
  version: 3.0.1
192
192
  type: :runtime
193
193
  prerelease: false
194
194
  version_requirements: !ruby/object:Gem::Requirement
195
195
  requirements:
196
- - - ~>
196
+ - - "~>"
197
197
  - !ruby/object:Gem::Version
198
198
  version: 3.0.1
199
199
  - !ruby/object:Gem::Dependency
200
200
  name: sass-rails
201
201
  requirement: !ruby/object:Gem::Requirement
202
202
  requirements:
203
- - - ~>
203
+ - - "~>"
204
204
  - !ruby/object:Gem::Version
205
205
  version: 3.2.3
206
206
  type: :runtime
207
207
  prerelease: false
208
208
  version_requirements: !ruby/object:Gem::Requirement
209
209
  requirements:
210
- - - ~>
210
+ - - "~>"
211
211
  - !ruby/object:Gem::Version
212
212
  version: 3.2.3
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: coffee-rails
215
215
  requirement: !ruby/object:Gem::Requirement
216
216
  requirements:
217
- - - ~>
217
+ - - "~>"
218
218
  - !ruby/object:Gem::Version
219
219
  version: 3.2.1
220
220
  type: :runtime
221
221
  prerelease: false
222
222
  version_requirements: !ruby/object:Gem::Requirement
223
223
  requirements:
224
- - - ~>
224
+ - - "~>"
225
225
  - !ruby/object:Gem::Version
226
226
  version: 3.2.1
227
227
  - !ruby/object:Gem::Dependency
228
228
  name: compass-rails
229
229
  requirement: !ruby/object:Gem::Requirement
230
230
  requirements:
231
- - - ~>
231
+ - - "~>"
232
232
  - !ruby/object:Gem::Version
233
233
  version: 1.0.3
234
234
  type: :runtime
235
235
  prerelease: false
236
236
  version_requirements: !ruby/object:Gem::Requirement
237
237
  requirements:
238
- - - ~>
238
+ - - "~>"
239
239
  - !ruby/object:Gem::Version
240
240
  version: 1.0.3
241
241
  - !ruby/object:Gem::Dependency
242
242
  name: sassy-buttons
243
243
  requirement: !ruby/object:Gem::Requirement
244
244
  requirements:
245
- - - ~>
245
+ - - "~>"
246
246
  - !ruby/object:Gem::Version
247
247
  version: 0.1.3
248
248
  type: :runtime
249
249
  prerelease: false
250
250
  version_requirements: !ruby/object:Gem::Requirement
251
251
  requirements:
252
- - - ~>
252
+ - - "~>"
253
253
  - !ruby/object:Gem::Version
254
254
  version: 0.1.3
255
255
  - !ruby/object:Gem::Dependency
256
256
  name: rails3-jquery-autocomplete
257
257
  requirement: !ruby/object:Gem::Requirement
258
258
  requirements:
259
- - - ~>
259
+ - - "~>"
260
260
  - !ruby/object:Gem::Version
261
261
  version: 1.0.10
262
262
  type: :runtime
263
263
  prerelease: false
264
264
  version_requirements: !ruby/object:Gem::Requirement
265
265
  requirements:
266
- - - ~>
266
+ - - "~>"
267
267
  - !ruby/object:Gem::Version
268
268
  version: 1.0.10
269
269
  - !ruby/object:Gem::Dependency
270
270
  name: tvdeyen-handles_sortable_columns
271
271
  requirement: !ruby/object:Gem::Requirement
272
272
  requirements:
273
- - - ~>
273
+ - - "~>"
274
274
  - !ruby/object:Gem::Version
275
275
  version: 0.1.5
276
276
  type: :runtime
277
277
  prerelease: false
278
278
  version_requirements: !ruby/object:Gem::Requirement
279
279
  requirements:
280
- - - ~>
280
+ - - "~>"
281
281
  - !ruby/object:Gem::Version
282
282
  version: 0.1.5
283
283
  - !ruby/object:Gem::Dependency
284
284
  name: spinner.rb
285
285
  requirement: !ruby/object:Gem::Requirement
286
286
  requirements:
287
- - - '>='
287
+ - - ">="
288
288
  - !ruby/object:Gem::Version
289
289
  version: '0'
290
290
  type: :runtime
291
291
  prerelease: false
292
292
  version_requirements: !ruby/object:Gem::Requirement
293
293
  requirements:
294
- - - '>='
294
+ - - ">="
295
295
  - !ruby/object:Gem::Version
296
296
  version: '0'
297
297
  - !ruby/object:Gem::Dependency
298
298
  name: bumpy
299
299
  requirement: !ruby/object:Gem::Requirement
300
300
  requirements:
301
- - - '>='
301
+ - - ">="
302
302
  - !ruby/object:Gem::Version
303
303
  version: '0'
304
304
  type: :development
305
305
  prerelease: false
306
306
  version_requirements: !ruby/object:Gem::Requirement
307
307
  requirements:
308
- - - '>='
308
+ - - ">="
309
309
  - !ruby/object:Gem::Version
310
310
  version: '0'
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: capybara
313
313
  requirement: !ruby/object:Gem::Requirement
314
314
  requirements:
315
- - - ~>
315
+ - - "~>"
316
316
  - !ruby/object:Gem::Version
317
317
  version: 2.0.3
318
318
  type: :development
319
319
  prerelease: false
320
320
  version_requirements: !ruby/object:Gem::Requirement
321
321
  requirements:
322
- - - ~>
322
+ - - "~>"
323
323
  - !ruby/object:Gem::Version
324
324
  version: 2.0.3
325
325
  - !ruby/object:Gem::Dependency
326
326
  name: factory_girl_rails
327
327
  requirement: !ruby/object:Gem::Requirement
328
328
  requirements:
329
- - - '>='
329
+ - - ">="
330
330
  - !ruby/object:Gem::Version
331
331
  version: '0'
332
332
  type: :development
333
333
  prerelease: false
334
334
  version_requirements: !ruby/object:Gem::Requirement
335
335
  requirements:
336
- - - '>='
336
+ - - ">="
337
337
  - !ruby/object:Gem::Version
338
338
  version: '0'
339
339
  - !ruby/object:Gem::Dependency
340
340
  name: rspec-rails
341
341
  requirement: !ruby/object:Gem::Requirement
342
342
  requirements:
343
- - - ~>
343
+ - - "~>"
344
344
  - !ruby/object:Gem::Version
345
345
  version: 2.13.1
346
346
  type: :development
347
347
  prerelease: false
348
348
  version_requirements: !ruby/object:Gem::Requirement
349
349
  requirements:
350
- - - ~>
350
+ - - "~>"
351
351
  - !ruby/object:Gem::Version
352
352
  version: 2.13.1
353
- - !ruby/object:Gem::Dependency
354
- name: sqlite3
355
- requirement: !ruby/object:Gem::Requirement
356
- requirements:
357
- - - '>='
358
- - !ruby/object:Gem::Version
359
- version: '0'
360
- type: :development
361
- prerelease: false
362
- version_requirements: !ruby/object:Gem::Requirement
363
- requirements:
364
- - - '>='
365
- - !ruby/object:Gem::Version
366
- version: '0'
367
353
  - !ruby/object:Gem::Dependency
368
354
  name: yard
369
355
  requirement: !ruby/object:Gem::Requirement
370
356
  requirements:
371
- - - '>='
357
+ - - ">="
372
358
  - !ruby/object:Gem::Version
373
359
  version: '0'
374
360
  type: :development
375
361
  prerelease: false
376
362
  version_requirements: !ruby/object:Gem::Requirement
377
363
  requirements:
378
- - - '>='
364
+ - - ">="
379
365
  - !ruby/object:Gem::Version
380
366
  version: '0'
381
367
  - !ruby/object:Gem::Dependency
382
368
  name: redcarpet
383
369
  requirement: !ruby/object:Gem::Requirement
384
370
  requirements:
385
- - - '>='
371
+ - - ">="
386
372
  - !ruby/object:Gem::Version
387
373
  version: '0'
388
374
  type: :development
389
375
  prerelease: false
390
376
  version_requirements: !ruby/object:Gem::Requirement
391
377
  requirements:
392
- - - '>='
378
+ - - ">="
393
379
  - !ruby/object:Gem::Version
394
380
  version: '0'
395
381
  description: Alchemy is a powerful, userfriendly and flexible Rails 3 CMS.
@@ -400,11 +386,11 @@ executables:
400
386
  extensions: []
401
387
  extra_rdoc_files: []
402
388
  files:
403
- - .gitignore
404
- - .rspec
405
- - .simplecov
406
- - .travis.yml
407
- - .yardopts
389
+ - ".gitignore"
390
+ - ".rspec"
391
+ - ".simplecov"
392
+ - ".travis.yml"
393
+ - ".yardopts"
408
394
  - Gemfile
409
395
  - LICENSE
410
396
  - README.md
@@ -1135,18 +1121,18 @@ require_paths:
1135
1121
  - lib
1136
1122
  required_ruby_version: !ruby/object:Gem::Requirement
1137
1123
  requirements:
1138
- - - '>='
1124
+ - - ">="
1139
1125
  - !ruby/object:Gem::Version
1140
1126
  version: 1.9.3
1141
1127
  required_rubygems_version: !ruby/object:Gem::Requirement
1142
1128
  requirements:
1143
- - - '>='
1129
+ - - ">="
1144
1130
  - !ruby/object:Gem::Version
1145
1131
  version: '0'
1146
1132
  requirements:
1147
1133
  - ImageMagick (libmagick), v6.6 or greater.
1148
1134
  rubyforge_project:
1149
- rubygems_version: 2.1.11
1135
+ rubygems_version: 2.2.2
1150
1136
  signing_key:
1151
1137
  specification_version: 4
1152
1138
  summary: A powerful, userfriendly and flexible CMS for Rails 3