refinerycms-core 2.1.1 → 2.1.2

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/wymeditor/prototypes.js.erb +1 -1
  3. data/lib/generators/refinery/engine/templates/lib/refinery/plural_name/engine.rb.erb +1 -1
  4. data/lib/generators/refinery/form/templates/lib/refinery/plural_name/engine.rb.erb +1 -1
  5. data/lib/refinery/extension_generation.rb +2 -2
  6. data/lib/refinery/version.rb +1 -1
  7. metadata +103 -103
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e862b07dadd6e91003f980ca76f20ec6d86e63ea
4
- data.tar.gz: f1593003922925741d33c82538bab1a371edd88d
3
+ metadata.gz: 520c41a8d2e49eab6fa3fe8900116be50df259fe
4
+ data.tar.gz: b805f56392af2404ef1077bb0dcc0d4e961bcc33
5
5
  SHA512:
6
- metadata.gz: 5abe01890f53b995dc6fc3906c08b8a47ff47966f251a84184acc4979f71fe020b9168d9e8a3c37d9726f7ae36a8e5597ec1b47d70064fc1acb3df201f37bea9
7
- data.tar.gz: 95526e162c07d7e95fb818b0e8509587781a5b6cec1e478cc6b1c021fafbca7b8ce5a0a4750429851aaa7ee47a61619b82f0f550722455123e9c97c3325eb6df
6
+ metadata.gz: d77779f5a8d886c5df084e5f90565b4b481541ac356a9573a8dd9cc8ddbf5e52918b394eaa1b86871cd0b6633b6791119c2eaa7fa3b71dbe9fc61ab76fcf1618
7
+ data.tar.gz: 8703abeed0865875ae6530effb310ef20a167d9e0a02cfcbb00684b520d0de2a2b849fc281d8b1dffd6f3e28afccebcacf511c669f6496e296fd18e42bfedc96
data/app/assets/javascripts/wymeditor/prototypes.js.erb CHANGED
@@ -630,7 +630,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
630
630
  var wym = this;
631
631
 
632
632
  wym.update();
633
- var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true&' + window.location.href.match(/switch_locale=[a-z]{2}/);
633
+ var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true&' + window.location.href.match(/switch_locale=[a-z]{2}(?:-[A-Z]{2})?/);
634
634
 
635
635
  wym._current_unique_stamp = wym.uniqueStamp();
636
636
  // change undo or redo on cancel to true to have this happen when a user closes (cancels) a dialogue
data/lib/generators/refinery/engine/templates/lib/refinery/plural_name/engine.rb.erb CHANGED
@@ -6,7 +6,7 @@ module Refinery
6
6
 
7
7
  engine_name :refinery_<%= extension_plural_name %>
8
8
 
9
- initializer "register refinerycms_<%= plural_name %> plugin" do
9
+ before_inclusion do
10
10
  Refinery::Plugin.register do |plugin|
11
11
  plugin.name = "<%= plural_name %>"
12
12
  plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.<%= namespacing.underscore %>_admin_<%= plural_name %>_path }
data/lib/generators/refinery/form/templates/lib/refinery/plural_name/engine.rb.erb CHANGED
@@ -6,7 +6,7 @@ module Refinery
6
6
 
7
7
  engine_name :refinery_<%= extension_plural_name %>
8
8
 
9
- initializer "register refinerycms_<%= plural_name %> plugin" do
9
+ before_inclusion do
10
10
  Refinery::Plugin.register do |plugin|
11
11
  plugin.name = "<%= plural_name %>"
12
12
  plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.<%= namespacing.underscore %>_admin_<%= plural_name %>_path }
data/lib/refinery/extension_generation.rb CHANGED
@@ -146,8 +146,8 @@ module Refinery
146
146
  # Detect whether this is a special file that needs to get merged not overwritten.
147
147
  # This is important only when nesting extensions.
148
148
  # Routes and #{gem_name}\.rb have an .erb extension as path points to the generator template
149
- # We have to exclude it when checking if the file already exists and include it in the regexps
150
- path = extension_path_for_nested_extension(path, apply_tmp) if extension.present?
149
+ # We have to exclude it when checking if the file already exists and include it in the regexps
150
+ path = extension_path_for_nested_extension(path, apply_tmp) if options[:extension].present?
151
151
  end
152
152
 
153
153
  path
data/lib/refinery/version.rb CHANGED
@@ -2,7 +2,7 @@ module Refinery
2
2
  class Version
3
3
  @major = 2
4
4
  @minor = 1
5
- @tiny = 1
5
+ @tiny = 2
6
6
  @build = nil
7
7
 
8
8
  class << self
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.1
4
+ version: 2.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Philip Arndt
@@ -10,380 +10,380 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-11-26 00:00:00.000000000 Z
13
+ date: 2014-03-14 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: refinerycms-i18n
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - ~>
19
+ - - "~>"
20
20
  - !ruby/object:Gem::Version
21
21
  version: 2.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - ~>
26
+ - - "~>"
27
27
  - !ruby/object:Gem::Version
28
28
  version: 2.1.0
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: awesome_nested_set
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - ~>
33
+ - - "~>"
34
34
  - !ruby/object:Gem::Version
35
35
  version: 2.1.3
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - ~>
40
+ - - "~>"
41
41
  - !ruby/object:Gem::Version
42
42
  version: 2.1.3
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: railties
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - '>='
47
+ - - ">="
48
48
  - !ruby/object:Gem::Version
49
49
  version: 3.1.11
50
- - - <
50
+ - - "<"
51
51
  - !ruby/object:Gem::Version
52
52
  version: '3.3'
53
- - - '!='
53
+ - - "!="
54
54
  - !ruby/object:Gem::Version
55
55
  version: 3.2.0
56
- - - '!='
56
+ - - "!="
57
57
  - !ruby/object:Gem::Version
58
58
  version: 3.2.1
59
- - - '!='
59
+ - - "!="
60
60
  - !ruby/object:Gem::Version
61
61
  version: 3.2.2
62
- - - '!='
62
+ - - "!="
63
63
  - !ruby/object:Gem::Version
64
64
  version: 3.2.3
65
- - - '!='
65
+ - - "!="
66
66
  - !ruby/object:Gem::Version
67
67
  version: 3.2.4
68
- - - '!='
68
+ - - "!="
69
69
  - !ruby/object:Gem::Version
70
70
  version: 3.2.5
71
- - - '!='
71
+ - - "!="
72
72
  - !ruby/object:Gem::Version
73
73
  version: 3.2.6
74
- - - '!='
74
+ - - "!="
75
75
  - !ruby/object:Gem::Version
76
76
  version: 3.2.7
77
- - - '!='
77
+ - - "!="
78
78
  - !ruby/object:Gem::Version
79
79
  version: 3.2.8
80
- - - '!='
80
+ - - "!="
81
81
  - !ruby/object:Gem::Version
82
82
  version: 3.2.9
83
- - - '!='
83
+ - - "!="
84
84
  - !ruby/object:Gem::Version
85
85
  version: 3.2.10
86
- - - '!='
86
+ - - "!="
87
87
  - !ruby/object:Gem::Version
88
88
  version: 3.2.11
89
89
  type: :runtime
90
90
  prerelease: false
91
91
  version_requirements: !ruby/object:Gem::Requirement
92
92
  requirements:
93
- - - '>='
93
+ - - ">="
94
94
  - !ruby/object:Gem::Version
95
95
  version: 3.1.11
96
- - - <
96
+ - - "<"
97
97
  - !ruby/object:Gem::Version
98
98
  version: '3.3'
99
- - - '!='
99
+ - - "!="
100
100
  - !ruby/object:Gem::Version
101
101
  version: 3.2.0
102
- - - '!='
102
+ - - "!="
103
103
  - !ruby/object:Gem::Version
104
104
  version: 3.2.1
105
- - - '!='
105
+ - - "!="
106
106
  - !ruby/object:Gem::Version
107
107
  version: 3.2.2
108
- - - '!='
108
+ - - "!="
109
109
  - !ruby/object:Gem::Version
110
110
  version: 3.2.3
111
- - - '!='
111
+ - - "!="
112
112
  - !ruby/object:Gem::Version
113
113
  version: 3.2.4
114
- - - '!='
114
+ - - "!="
115
115
  - !ruby/object:Gem::Version
116
116
  version: 3.2.5
117
- - - '!='
117
+ - - "!="
118
118
  - !ruby/object:Gem::Version
119
119
  version: 3.2.6
120
- - - '!='
120
+ - - "!="
121
121
  - !ruby/object:Gem::Version
122
122
  version: 3.2.7
123
- - - '!='
123
+ - - "!="
124
124
  - !ruby/object:Gem::Version
125
125
  version: 3.2.8
126
- - - '!='
126
+ - - "!="
127
127
  - !ruby/object:Gem::Version
128
128
  version: 3.2.9
129
- - - '!='
129
+ - - "!="
130
130
  - !ruby/object:Gem::Version
131
131
  version: 3.2.10
132
- - - '!='
132
+ - - "!="
133
133
  - !ruby/object:Gem::Version
134
134
  version: 3.2.11
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: activerecord
137
137
  requirement: !ruby/object:Gem::Requirement
138
138
  requirements:
139
- - - '>='
139
+ - - ">="
140
140
  - !ruby/object:Gem::Version
141
141
  version: 3.1.11
142
- - - <
142
+ - - "<"
143
143
  - !ruby/object:Gem::Version
144
144
  version: '3.3'
145
- - - '!='
145
+ - - "!="
146
146
  - !ruby/object:Gem::Version
147
147
  version: 3.2.0
148
- - - '!='
148
+ - - "!="
149
149
  - !ruby/object:Gem::Version
150
150
  version: 3.2.1
151
- - - '!='
151
+ - - "!="
152
152
  - !ruby/object:Gem::Version
153
153
  version: 3.2.2
154
- - - '!='
154
+ - - "!="
155
155
  - !ruby/object:Gem::Version
156
156
  version: 3.2.3
157
- - - '!='
157
+ - - "!="
158
158
  - !ruby/object:Gem::Version
159
159
  version: 3.2.4
160
- - - '!='
160
+ - - "!="
161
161
  - !ruby/object:Gem::Version
162
162
  version: 3.2.5
163
- - - '!='
163
+ - - "!="
164
164
  - !ruby/object:Gem::Version
165
165
  version: 3.2.6
166
- - - '!='
166
+ - - "!="
167
167
  - !ruby/object:Gem::Version
168
168
  version: 3.2.7
169
- - - '!='
169
+ - - "!="
170
170
  - !ruby/object:Gem::Version
171
171
  version: 3.2.8
172
- - - '!='
172
+ - - "!="
173
173
  - !ruby/object:Gem::Version
174
174
  version: 3.2.9
175
- - - '!='
175
+ - - "!="
176
176
  - !ruby/object:Gem::Version
177
177
  version: 3.2.10
178
- - - '!='
178
+ - - "!="
179
179
  - !ruby/object:Gem::Version
180
180
  version: 3.2.11
181
181
  type: :runtime
182
182
  prerelease: false
183
183
  version_requirements: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - '>='
185
+ - - ">="
186
186
  - !ruby/object:Gem::Version
187
187
  version: 3.1.11
188
- - - <
188
+ - - "<"
189
189
  - !ruby/object:Gem::Version
190
190
  version: '3.3'
191
- - - '!='
191
+ - - "!="
192
192
  - !ruby/object:Gem::Version
193
193
  version: 3.2.0
194
- - - '!='
194
+ - - "!="
195
195
  - !ruby/object:Gem::Version
196
196
  version: 3.2.1
197
- - - '!='
197
+ - - "!="
198
198
  - !ruby/object:Gem::Version
199
199
  version: 3.2.2
200
- - - '!='
200
+ - - "!="
201
201
  - !ruby/object:Gem::Version
202
202
  version: 3.2.3
203
- - - '!='
203
+ - - "!="
204
204
  - !ruby/object:Gem::Version
205
205
  version: 3.2.4
206
- - - '!='
206
+ - - "!="
207
207
  - !ruby/object:Gem::Version
208
208
  version: 3.2.5
209
- - - '!='
209
+ - - "!="
210
210
  - !ruby/object:Gem::Version
211
211
  version: 3.2.6
212
- - - '!='
212
+ - - "!="
213
213
  - !ruby/object:Gem::Version
214
214
  version: 3.2.7
215
- - - '!='
215
+ - - "!="
216
216
  - !ruby/object:Gem::Version
217
217
  version: 3.2.8
218
- - - '!='
218
+ - - "!="
219
219
  - !ruby/object:Gem::Version
220
220
  version: 3.2.9
221
- - - '!='
221
+ - - "!="
222
222
  - !ruby/object:Gem::Version
223
223
  version: 3.2.10
224
- - - '!='
224
+ - - "!="
225
225
  - !ruby/object:Gem::Version
226
226
  version: 3.2.11
227
227
  - !ruby/object:Gem::Dependency
228
228
  name: actionpack
229
229
  requirement: !ruby/object:Gem::Requirement
230
230
  requirements:
231
- - - '>='
231
+ - - ">="
232
232
  - !ruby/object:Gem::Version
233
233
  version: 3.1.11
234
- - - <
234
+ - - "<"
235
235
  - !ruby/object:Gem::Version
236
236
  version: '3.3'
237
- - - '!='
237
+ - - "!="
238
238
  - !ruby/object:Gem::Version
239
239
  version: 3.2.0
240
- - - '!='
240
+ - - "!="
241
241
  - !ruby/object:Gem::Version
242
242
  version: 3.2.1
243
- - - '!='
243
+ - - "!="
244
244
  - !ruby/object:Gem::Version
245
245
  version: 3.2.2
246
- - - '!='
246
+ - - "!="
247
247
  - !ruby/object:Gem::Version
248
248
  version: 3.2.3
249
- - - '!='
249
+ - - "!="
250
250
  - !ruby/object:Gem::Version
251
251
  version: 3.2.4
252
- - - '!='
252
+ - - "!="
253
253
  - !ruby/object:Gem::Version
254
254
  version: 3.2.5
255
- - - '!='
255
+ - - "!="
256
256
  - !ruby/object:Gem::Version
257
257
  version: 3.2.6
258
- - - '!='
258
+ - - "!="
259
259
  - !ruby/object:Gem::Version
260
260
  version: 3.2.7
261
- - - '!='
261
+ - - "!="
262
262
  - !ruby/object:Gem::Version
263
263
  version: 3.2.8
264
- - - '!='
264
+ - - "!="
265
265
  - !ruby/object:Gem::Version
266
266
  version: 3.2.9
267
- - - '!='
267
+ - - "!="
268
268
  - !ruby/object:Gem::Version
269
269
  version: 3.2.10
270
- - - '!='
270
+ - - "!="
271
271
  - !ruby/object:Gem::Version
272
272
  version: 3.2.11
273
273
  type: :runtime
274
274
  prerelease: false
275
275
  version_requirements: !ruby/object:Gem::Requirement
276
276
  requirements:
277
- - - '>='
277
+ - - ">="
278
278
  - !ruby/object:Gem::Version
279
279
  version: 3.1.11
280
- - - <
280
+ - - "<"
281
281
  - !ruby/object:Gem::Version
282
282
  version: '3.3'
283
- - - '!='
283
+ - - "!="
284
284
  - !ruby/object:Gem::Version
285
285
  version: 3.2.0
286
- - - '!='
286
+ - - "!="
287
287
  - !ruby/object:Gem::Version
288
288
  version: 3.2.1
289
- - - '!='
289
+ - - "!="
290
290
  - !ruby/object:Gem::Version
291
291
  version: 3.2.2
292
- - - '!='
292
+ - - "!="
293
293
  - !ruby/object:Gem::Version
294
294
  version: 3.2.3
295
- - - '!='
295
+ - - "!="
296
296
  - !ruby/object:Gem::Version
297
297
  version: 3.2.4
298
- - - '!='
298
+ - - "!="
299
299
  - !ruby/object:Gem::Version
300
300
  version: 3.2.5
301
- - - '!='
301
+ - - "!="
302
302
  - !ruby/object:Gem::Version
303
303
  version: 3.2.6
304
- - - '!='
304
+ - - "!="
305
305
  - !ruby/object:Gem::Version
306
306
  version: 3.2.7
307
- - - '!='
307
+ - - "!="
308
308
  - !ruby/object:Gem::Version
309
309
  version: 3.2.8
310
- - - '!='
310
+ - - "!="
311
311
  - !ruby/object:Gem::Version
312
312
  version: 3.2.9
313
- - - '!='
313
+ - - "!="
314
314
  - !ruby/object:Gem::Version
315
315
  version: 3.2.10
316
- - - '!='
316
+ - - "!="
317
317
  - !ruby/object:Gem::Version
318
318
  version: 3.2.11
319
319
  - !ruby/object:Gem::Dependency
320
320
  name: truncate_html
321
321
  requirement: !ruby/object:Gem::Requirement
322
322
  requirements:
323
- - - ~>
323
+ - - "~>"
324
324
  - !ruby/object:Gem::Version
325
325
  version: '0.9'
326
326
  type: :runtime
327
327
  prerelease: false
328
328
  version_requirements: !ruby/object:Gem::Requirement
329
329
  requirements:
330
- - - ~>
330
+ - - "~>"
331
331
  - !ruby/object:Gem::Version
332
332
  version: '0.9'
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: will_paginate
335
335
  requirement: !ruby/object:Gem::Requirement
336
336
  requirements:
337
- - - ~>
337
+ - - "~>"
338
338
  - !ruby/object:Gem::Version
339
339
  version: 3.0.2
340
340
  type: :runtime
341
341
  prerelease: false
342
342
  version_requirements: !ruby/object:Gem::Requirement
343
343
  requirements:
344
- - - ~>
344
+ - - "~>"
345
345
  - !ruby/object:Gem::Version
346
346
  version: 3.0.2
347
347
  - !ruby/object:Gem::Dependency
348
348
  name: sass-rails
349
349
  requirement: !ruby/object:Gem::Requirement
350
350
  requirements:
351
- - - ~>
351
+ - - "~>"
352
352
  - !ruby/object:Gem::Version
353
353
  version: 3.2.3
354
354
  type: :runtime
355
355
  prerelease: false
356
356
  version_requirements: !ruby/object:Gem::Requirement
357
357
  requirements:
358
- - - ~>
358
+ - - "~>"
359
359
  - !ruby/object:Gem::Version
360
360
  version: 3.2.3
361
361
  - !ruby/object:Gem::Dependency
362
362
  name: jquery-rails
363
363
  requirement: !ruby/object:Gem::Requirement
364
364
  requirements:
365
- - - ~>
365
+ - - "~>"
366
366
  - !ruby/object:Gem::Version
367
367
  version: 2.3.0
368
368
  type: :runtime
369
369
  prerelease: false
370
370
  version_requirements: !ruby/object:Gem::Requirement
371
371
  requirements:
372
- - - ~>
372
+ - - "~>"
373
373
  - !ruby/object:Gem::Version
374
374
  version: 2.3.0
375
375
  - !ruby/object:Gem::Dependency
376
376
  name: decorators
377
377
  requirement: !ruby/object:Gem::Requirement
378
378
  requirements:
379
- - - ~>
379
+ - - "~>"
380
380
  - !ruby/object:Gem::Version
381
381
  version: 1.0.0
382
382
  type: :runtime
383
383
  prerelease: false
384
384
  version_requirements: !ruby/object:Gem::Requirement
385
385
  requirements:
386
- - - ~>
386
+ - - "~>"
387
387
  - !ruby/object:Gem::Version
388
388
  version: 1.0.0
389
389
  description: The core of Refinery CMS. This handles the common functionality and is
@@ -896,17 +896,17 @@ require_paths:
896
896
  - lib
897
897
  required_ruby_version: !ruby/object:Gem::Requirement
898
898
  requirements:
899
- - - '>='
899
+ - - ">="
900
900
  - !ruby/object:Gem::Version
901
901
  version: 1.9.3
902
902
  required_rubygems_version: !ruby/object:Gem::Requirement
903
903
  requirements:
904
- - - '>='
904
+ - - ">="
905
905
  - !ruby/object:Gem::Version
906
906
  version: '0'
907
907
  requirements: []
908
908
  rubyforge_project: refinerycms
909
- rubygems_version: 2.1.0
909
+ rubygems_version: 2.2.2
910
910
  signing_key:
911
911
  specification_version: 4
912
912
  summary: Core extension for Refinery CMS