cmtool 3.0.0 → 3.1.0

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 (16) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -2
  3. data/Gemfile.lock +342 -199
  4. data/app/assets/javascripts/cmtool/application.js.coffee +1 -0
  5. data/app/assets/javascripts/cmtool/html_edit.js.coffee +4 -0
  6. data/app/helpers/cmtool/application_helper.rb +2 -2
  7. data/app/models/cmtool/image.rb +4 -0
  8. data/app/models/cmtool/news.rb +3 -0
  9. data/app/models/cmtool/quote.rb +3 -0
  10. data/app/views/cmtool/pages/_form.html.slim +6 -0
  11. data/lib/cmtool/engine.rb +22 -22
  12. data/lib/cmtool/includes/page.rb +8 -1
  13. data/lib/cmtool/includes/pages_controller.rb +1 -1
  14. data/lib/cmtool/version.rb +1 -1
  15. data/lib/cmtool.rb +7 -0
  16. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 57b2a507dbed62eed8528b2c9bbaa4b4303b8b36b75df68f59a80f43c58c5a8f
4
- data.tar.gz: c0246bf43756707a9ccef94a720654cfdd5ade5984febc02bad6e338e6057417
3
+ metadata.gz: 2f72ef363574bd8878f860a59d29dc3830347ad1bc1a0becbcaaaad80bd875f6
4
+ data.tar.gz: 9ddba2aea2e96bf51ec92dddc3106909c8f9c8ea72488e83c9617c91b63a9556
5
5
  SHA512:
6
- metadata.gz: f7e6b716e8423184d216627c2e494912cbcc24eb0dfe7546610727a63b1bc136681c70dfec4a5233d219822a5a44ec452a718191f8f9801bebf7e973f194b79f
7
- data.tar.gz: 97a7b691f3bb8dd701d898b76271926914d08bca0b967f67a18a84d488414946549e1ca09569d83bd84eaa8502c3e6a8cd4c03dcdc34779c0d769291faf8942a
6
+ metadata.gz: 1af25b2239ed2c3a2d2c29ef13a0159822336a90b7e7db76decfd36322fb2636ded0183605e9d52f47dd64205e3a5d0db3ffe5473401ad2002d93af76925d87a
7
+ data.tar.gz: 5457746564eb79514e3865c3885ab8bf10b196f84f18fbe641acd8f1a7cdaf31e09a0d4c16c127ff2bf3bcbc4f339fe5219a28d5e26aad272df1de26ff124e1c
data/Gemfile CHANGED
@@ -21,10 +21,10 @@ group :assets do
21
21
  gem 'momentjs-rails'
22
22
  end
23
23
 
24
- gem 'simply_stored' , github: 'bterkuile/simply_stored'
24
+ gem 'simply_stored' , github: 'bterkuile/simply_stored', branch: 'master'
25
25
  #gem 'orm_adapter', github: 'bterkuile/orm_adapter'
26
26
  gem 'devise'
27
- gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
27
+ gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored', branch: 'master'
28
28
  gem 'slim-rails'
29
29
  gem 'paperclip', ['>= 3.4', '!= 4.3.0']
30
30
  gem 'email_validator'
data/Gemfile.lock CHANGED
@@ -1,13 +1,15 @@
1
1
  GIT
2
- remote: git://github.com/bterkuile/devise_simply_stored.git
3
- revision: 86f93782c607958e7f99a6fdbae5566e17047273
2
+ remote: https://github.com/bterkuile/devise_simply_stored.git
3
+ revision: d40020669b22bbb14fa40dc4521b2f072eb96e84
4
+ branch: master
4
5
  specs:
5
6
  devise_simply_stored (0.3.0)
6
7
  devise
7
8
 
8
9
  GIT
9
- remote: git://github.com/bterkuile/simply_stored.git
10
- revision: 7633d88a62972cee6aea49d7d2a175bf07906236
10
+ remote: https://github.com/bterkuile/simply_stored.git
11
+ revision: 284607e973802ef46d7b47409bcf4beed7c0984c
12
+ branch: master
11
13
  specs:
12
14
  simply_stored (1.0.0)
13
15
  activesupport
@@ -16,256 +18,397 @@ GIT
16
18
  PATH
17
19
  remote: .
18
20
  specs:
19
- cmtool (2.0.0)
21
+ cmtool (3.0.0)
20
22
  ace-rails-ap
21
- bourbon
22
23
  email_validator
23
24
  font-awesome-rails
24
25
  foundation-rails
25
26
  jquery-rails
27
+ momentjs-rails
26
28
  paperclip
27
29
  pickadate-rails
28
30
  slim-rails
29
- tinymce-rails
30
31
 
31
32
  GEM
32
33
  remote: http://rubygems.org/
33
34
  specs:
34
- ace-rails-ap (4.1.2)
35
- actionmailer (4.2.7.1)
36
- actionpack (= 4.2.7.1)
37
- actionview (= 4.2.7.1)
38
- activejob (= 4.2.7.1)
39
- mail (~> 2.5, >= 2.5.4)
40
- rails-dom-testing (~> 1.0, >= 1.0.5)
41
- actionpack (4.2.7.1)
42
- actionview (= 4.2.7.1)
43
- activesupport (= 4.2.7.1)
44
- rack (~> 1.6)
45
- rack-test (~> 0.6.2)
46
- rails-dom-testing (~> 1.0, >= 1.0.5)
47
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
48
- actionview (4.2.7.1)
49
- activesupport (= 4.2.7.1)
35
+ ace-rails-ap (4.5)
36
+ actioncable (8.0.2.1)
37
+ actionpack (= 8.0.2.1)
38
+ activesupport (= 8.0.2.1)
39
+ nio4r (~> 2.0)
40
+ websocket-driver (>= 0.6.1)
41
+ zeitwerk (~> 2.6)
42
+ actionmailbox (8.0.2.1)
43
+ actionpack (= 8.0.2.1)
44
+ activejob (= 8.0.2.1)
45
+ activerecord (= 8.0.2.1)
46
+ activestorage (= 8.0.2.1)
47
+ activesupport (= 8.0.2.1)
48
+ mail (>= 2.8.0)
49
+ actionmailer (8.0.2.1)
50
+ actionpack (= 8.0.2.1)
51
+ actionview (= 8.0.2.1)
52
+ activejob (= 8.0.2.1)
53
+ activesupport (= 8.0.2.1)
54
+ mail (>= 2.8.0)
55
+ rails-dom-testing (~> 2.2)
56
+ actionpack (8.0.2.1)
57
+ actionview (= 8.0.2.1)
58
+ activesupport (= 8.0.2.1)
59
+ nokogiri (>= 1.8.5)
60
+ rack (>= 2.2.4)
61
+ rack-session (>= 1.0.1)
62
+ rack-test (>= 0.6.3)
63
+ rails-dom-testing (~> 2.2)
64
+ rails-html-sanitizer (~> 1.6)
65
+ useragent (~> 0.16)
66
+ actiontext (8.0.2.1)
67
+ actionpack (= 8.0.2.1)
68
+ activerecord (= 8.0.2.1)
69
+ activestorage (= 8.0.2.1)
70
+ activesupport (= 8.0.2.1)
71
+ globalid (>= 0.6.0)
72
+ nokogiri (>= 1.8.5)
73
+ actionview (8.0.2.1)
74
+ activesupport (= 8.0.2.1)
50
75
  builder (~> 3.1)
51
- erubis (~> 2.7.0)
52
- rails-dom-testing (~> 1.0, >= 1.0.5)
53
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
54
- activejob (4.2.7.1)
55
- activesupport (= 4.2.7.1)
56
- globalid (>= 0.3.0)
57
- activemodel (4.2.7.1)
58
- activesupport (= 4.2.7.1)
59
- builder (~> 3.1)
60
- activerecord (4.2.7.1)
61
- activemodel (= 4.2.7.1)
62
- activesupport (= 4.2.7.1)
63
- arel (~> 6.0)
64
- activesupport (4.2.7.1)
65
- i18n (~> 0.7)
66
- json (~> 1.7, >= 1.7.7)
67
- minitest (~> 5.1)
68
- thread_safe (~> 0.3, >= 0.3.4)
69
- tzinfo (~> 1.1)
70
- addressable (2.5.0)
71
- public_suffix (~> 2.0, >= 2.0.2)
72
- arel (6.0.4)
73
- bcrypt (3.1.11)
74
- bourbon (4.3.2)
75
- sass (~> 3.4)
76
- thor (~> 0.19)
77
- builder (3.2.3)
78
- capybara (2.12.0)
76
+ erubi (~> 1.11)
77
+ rails-dom-testing (~> 2.2)
78
+ rails-html-sanitizer (~> 1.6)
79
+ activejob (8.0.2.1)
80
+ activesupport (= 8.0.2.1)
81
+ globalid (>= 0.3.6)
82
+ activemodel (8.0.2.1)
83
+ activesupport (= 8.0.2.1)
84
+ activerecord (8.0.2.1)
85
+ activemodel (= 8.0.2.1)
86
+ activesupport (= 8.0.2.1)
87
+ timeout (>= 0.4.0)
88
+ activestorage (8.0.2.1)
89
+ actionpack (= 8.0.2.1)
90
+ activejob (= 8.0.2.1)
91
+ activerecord (= 8.0.2.1)
92
+ activesupport (= 8.0.2.1)
93
+ marcel (~> 1.0)
94
+ activesupport (8.0.2.1)
95
+ base64
96
+ benchmark (>= 0.3)
97
+ bigdecimal
98
+ concurrent-ruby (~> 1.0, >= 1.3.1)
99
+ connection_pool (>= 2.2.5)
100
+ drb
101
+ i18n (>= 1.6, < 2)
102
+ logger (>= 1.4.2)
103
+ minitest (>= 5.1)
104
+ securerandom (>= 0.3)
105
+ tzinfo (~> 2.0, >= 2.0.5)
106
+ uri (>= 0.13.1)
107
+ addressable (2.8.7)
108
+ public_suffix (>= 2.0.2, < 7.0)
109
+ base64 (0.3.0)
110
+ bcrypt (3.1.22)
111
+ benchmark (0.5.0)
112
+ bigdecimal (4.0.1)
113
+ builder (3.3.0)
114
+ capybara (3.40.0)
79
115
  addressable
80
- mime-types (>= 1.16)
81
- nokogiri (>= 1.3.3)
82
- rack (>= 1.0.0)
83
- rack-test (>= 0.5.4)
84
- xpath (~> 2.0)
85
- climate_control (0.1.0)
116
+ matrix
117
+ mini_mime (>= 0.1.3)
118
+ nokogiri (~> 1.11)
119
+ rack (>= 1.6.0)
120
+ rack-test (>= 0.6.3)
121
+ regexp_parser (>= 1.5, < 3.0)
122
+ xpath (~> 3.2)
123
+ childprocess (5.1.0)
124
+ logger (~> 1.5)
125
+ climate_control (0.2.0)
86
126
  cliver (0.3.2)
87
- cocaine (0.5.8)
88
- climate_control (>= 0.0.3, < 1.0)
89
- coderay (1.1.1)
127
+ coderay (1.1.3)
90
128
  coffee-script (2.4.1)
91
129
  coffee-script-source
92
130
  execjs
93
131
  coffee-script-source (1.12.2)
94
- concurrent-ruby (1.0.4)
95
- couch_potato (1.7.0)
96
- activemodel (~> 4.0)
97
- couchrest (~> 2.0.0.rc3)
98
- json (~> 1.6)
132
+ concurrent-ruby (1.3.6)
133
+ connection_pool (3.0.2)
134
+ couch_potato (1.19.2)
135
+ activemodel (>= 7.2, < 8.1)
136
+ couchrest (~> 2.0.0)
137
+ json (~> 2.3)
99
138
  couchrest (2.0.1)
100
139
  httpclient (~> 2.8)
101
140
  mime-types (>= 1.15)
102
141
  multi_json (~> 1.7)
103
- daemons (1.2.4)
104
- devise (4.2.0)
142
+ crass (1.0.6)
143
+ daemons (1.4.1)
144
+ date (3.5.1)
145
+ devise (5.0.3)
105
146
  bcrypt (~> 3.0)
106
147
  orm_adapter (~> 0.1)
107
- railties (>= 4.1.0, < 5.1)
148
+ railties (>= 7.0)
108
149
  responders
109
150
  warden (~> 1.2.3)
110
- diff-lcs (1.3)
111
- email_validator (1.6.0)
151
+ diff-lcs (1.6.2)
152
+ drb (2.2.3)
153
+ email_validator (2.2.4)
112
154
  activemodel
113
- erubis (2.7.0)
114
- eventmachine (1.2.2)
115
- execjs (2.7.0)
116
- factory_girl (4.8.0)
155
+ erb (6.0.2)
156
+ erubi (1.13.1)
157
+ eventmachine (1.2.7)
158
+ execjs (2.10.0)
159
+ factory_girl (4.9.0)
117
160
  activesupport (>= 3.0.0)
118
- factory_girl_rails (4.8.0)
119
- factory_girl (~> 4.8.0)
161
+ factory_girl_rails (4.9.0)
162
+ factory_girl (~> 4.9.0)
120
163
  railties (>= 3.0.0)
121
- font-awesome-rails (4.7.0.1)
122
- railties (>= 3.2, < 5.1)
164
+ ffi (1.17.2-aarch64-linux-gnu)
165
+ ffi (1.17.2-aarch64-linux-musl)
166
+ ffi (1.17.2-arm-linux-gnu)
167
+ ffi (1.17.2-arm-linux-musl)
168
+ ffi (1.17.2-arm64-darwin)
169
+ ffi (1.17.2-x86_64-darwin)
170
+ ffi (1.17.2-x86_64-linux-gnu)
171
+ ffi (1.17.2-x86_64-linux-musl)
172
+ font-awesome-rails (4.7.0.9)
173
+ railties (>= 3.2, < 9.0)
123
174
  foundation-rails (5.5.3.2)
124
175
  railties (>= 3.1.0)
125
176
  sass (>= 3.3.0, < 3.5)
126
- globalid (0.3.7)
127
- activesupport (>= 4.1.0)
128
- httpclient (2.8.3)
129
- i18n (0.8.0)
130
- jquery-rails (4.2.2)
177
+ globalid (1.2.1)
178
+ activesupport (>= 6.1)
179
+ httpclient (2.9.0)
180
+ mutex_m
181
+ i18n (1.14.8)
182
+ concurrent-ruby (~> 1.0)
183
+ io-console (0.8.2)
184
+ irb (1.17.0)
185
+ pp (>= 0.6.0)
186
+ prism (>= 1.3.0)
187
+ rdoc (>= 4.0.0)
188
+ reline (>= 0.4.2)
189
+ jquery-rails (4.6.0)
131
190
  rails-dom-testing (>= 1, < 3)
132
191
  railties (>= 4.2.0)
133
192
  thor (>= 0.14, < 2.0)
134
- json (1.8.6)
135
- launchy (2.4.3)
136
- addressable (~> 2.3)
137
- loofah (2.0.3)
138
- nokogiri (>= 1.5.9)
139
- mail (2.6.4)
140
- mime-types (>= 1.16, < 4)
141
- method_source (0.8.2)
142
- mime-types (3.1)
143
- mime-types-data (~> 3.2015)
144
- mime-types-data (3.2016.0521)
145
- mimemagic (0.3.2)
146
- mini_portile2 (2.1.0)
147
- minitest (5.10.1)
148
- multi_json (1.12.1)
149
- nokogiri (1.7.0.1)
150
- mini_portile2 (~> 2.1.0)
193
+ json (2.13.2)
194
+ launchy (3.1.1)
195
+ addressable (~> 2.8)
196
+ childprocess (~> 5.0)
197
+ logger (~> 1.6)
198
+ logger (1.7.0)
199
+ loofah (2.25.1)
200
+ crass (~> 1.0.2)
201
+ nokogiri (>= 1.12.0)
202
+ mail (2.8.1)
203
+ mini_mime (>= 0.1.1)
204
+ net-imap
205
+ net-pop
206
+ net-smtp
207
+ marcel (1.0.4)
208
+ matrix (0.4.3)
209
+ method_source (1.1.0)
210
+ mime-types (3.7.0)
211
+ logger
212
+ mime-types-data (~> 3.2025, >= 3.2025.0507)
213
+ mime-types-data (3.2025.0826)
214
+ mimemagic (0.3.10)
215
+ nokogiri (~> 1)
216
+ rake
217
+ mini_mime (1.1.5)
218
+ minitest (6.0.2)
219
+ drb (~> 2.0)
220
+ prism (~> 1.5)
221
+ momentjs-rails (2.29.4.1)
222
+ railties (>= 3.1)
223
+ multi_json (1.17.0)
224
+ mutex_m (0.3.0)
225
+ net-imap (0.5.10)
226
+ date
227
+ net-protocol
228
+ net-pop (0.1.2)
229
+ net-protocol
230
+ net-protocol (0.2.2)
231
+ timeout
232
+ net-smtp (0.5.1)
233
+ net-protocol
234
+ nio4r (2.7.4)
235
+ nokogiri (1.19.2-aarch64-linux-gnu)
236
+ racc (~> 1.4)
237
+ nokogiri (1.19.2-aarch64-linux-musl)
238
+ racc (~> 1.4)
239
+ nokogiri (1.19.2-arm-linux-gnu)
240
+ racc (~> 1.4)
241
+ nokogiri (1.19.2-arm-linux-musl)
242
+ racc (~> 1.4)
243
+ nokogiri (1.19.2-arm64-darwin)
244
+ racc (~> 1.4)
245
+ nokogiri (1.19.2-x86_64-darwin)
246
+ racc (~> 1.4)
247
+ nokogiri (1.19.2-x86_64-linux-gnu)
248
+ racc (~> 1.4)
249
+ nokogiri (1.19.2-x86_64-linux-musl)
250
+ racc (~> 1.4)
151
251
  orm_adapter (0.5.0)
152
- paperclip (5.1.0)
252
+ paperclip (6.1.0)
153
253
  activemodel (>= 4.2.0)
154
254
  activesupport (>= 4.2.0)
155
- cocaine (~> 0.5.5)
156
255
  mime-types
157
256
  mimemagic (~> 0.3.0)
158
- pickadate-rails (3.5.6.0)
257
+ terrapin (~> 0.6.0)
258
+ pickadate-rails (3.5.6.1)
159
259
  railties (>= 3.1.0)
160
- poltergeist (1.13.0)
161
- capybara (~> 2.1)
260
+ poltergeist (1.18.1)
261
+ capybara (>= 2.1, < 4)
162
262
  cliver (~> 0.3.1)
163
263
  websocket-driver (>= 0.2.0)
164
- pry (0.10.4)
165
- coderay (~> 1.1.0)
166
- method_source (~> 0.8.1)
167
- slop (~> 3.4)
168
- pry-rails (0.3.5)
169
- pry (>= 0.9.10)
170
- public_suffix (2.0.5)
171
- rack (1.6.5)
172
- rack-test (0.6.3)
173
- rack (>= 1.0)
174
- rails (4.2.7.1)
175
- actionmailer (= 4.2.7.1)
176
- actionpack (= 4.2.7.1)
177
- actionview (= 4.2.7.1)
178
- activejob (= 4.2.7.1)
179
- activemodel (= 4.2.7.1)
180
- activerecord (= 4.2.7.1)
181
- activesupport (= 4.2.7.1)
182
- bundler (>= 1.3.0, < 2.0)
183
- railties (= 4.2.7.1)
184
- sprockets-rails
185
- rails-deprecated_sanitizer (1.0.3)
186
- activesupport (>= 4.2.0.alpha)
187
- rails-dom-testing (1.0.8)
188
- activesupport (>= 4.2.0.beta, < 5.0)
189
- nokogiri (~> 1.6)
190
- rails-deprecated_sanitizer (>= 1.0.1)
191
- rails-html-sanitizer (1.0.3)
192
- loofah (~> 2.0)
193
- railties (4.2.7.1)
194
- actionpack (= 4.2.7.1)
195
- activesupport (= 4.2.7.1)
196
- rake (>= 0.8.7)
197
- thor (>= 0.18.1, < 2.0)
198
- rake (12.0.0)
199
- responders (2.3.0)
200
- railties (>= 4.2.0, < 5.1)
201
- rspec-core (3.5.4)
202
- rspec-support (~> 3.5.0)
203
- rspec-expectations (3.5.0)
264
+ pp (0.6.3)
265
+ prettyprint
266
+ prettyprint (0.2.0)
267
+ prism (1.9.0)
268
+ pry (0.15.2)
269
+ coderay (~> 1.1)
270
+ method_source (~> 1.0)
271
+ pry-rails (0.3.11)
272
+ pry (>= 0.13.0)
273
+ psych (5.3.1)
274
+ date
275
+ stringio
276
+ public_suffix (6.0.2)
277
+ racc (1.8.1)
278
+ rack (3.2.6)
279
+ rack-session (2.1.1)
280
+ base64 (>= 0.1.0)
281
+ rack (>= 3.0.0)
282
+ rack-test (2.2.0)
283
+ rack (>= 1.3)
284
+ rackup (2.3.1)
285
+ rack (>= 3)
286
+ rails (8.0.2.1)
287
+ actioncable (= 8.0.2.1)
288
+ actionmailbox (= 8.0.2.1)
289
+ actionmailer (= 8.0.2.1)
290
+ actionpack (= 8.0.2.1)
291
+ actiontext (= 8.0.2.1)
292
+ actionview (= 8.0.2.1)
293
+ activejob (= 8.0.2.1)
294
+ activemodel (= 8.0.2.1)
295
+ activerecord (= 8.0.2.1)
296
+ activestorage (= 8.0.2.1)
297
+ activesupport (= 8.0.2.1)
298
+ bundler (>= 1.15.0)
299
+ railties (= 8.0.2.1)
300
+ rails-dom-testing (2.3.0)
301
+ activesupport (>= 5.0.0)
302
+ minitest
303
+ nokogiri (>= 1.6)
304
+ rails-html-sanitizer (1.7.0)
305
+ loofah (~> 2.25)
306
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
307
+ railties (8.0.2.1)
308
+ actionpack (= 8.0.2.1)
309
+ activesupport (= 8.0.2.1)
310
+ irb (~> 1.13)
311
+ rackup (>= 1.0.0)
312
+ rake (>= 12.2)
313
+ thor (~> 1.0, >= 1.2.2)
314
+ zeitwerk (~> 2.6)
315
+ rake (13.3.1)
316
+ rdoc (7.2.0)
317
+ erb
318
+ psych (>= 4.0.0)
319
+ tsort
320
+ regexp_parser (2.11.2)
321
+ reline (0.6.3)
322
+ io-console (~> 0.5)
323
+ responders (3.2.0)
324
+ actionpack (>= 7.0)
325
+ railties (>= 7.0)
326
+ rspec-core (3.13.5)
327
+ rspec-support (~> 3.13.0)
328
+ rspec-expectations (3.13.5)
204
329
  diff-lcs (>= 1.2.0, < 2.0)
205
- rspec-support (~> 3.5.0)
206
- rspec-its (1.2.0)
207
- rspec-core (>= 3.0.0)
208
- rspec-expectations (>= 3.0.0)
209
- rspec-mocks (3.5.0)
330
+ rspec-support (~> 3.13.0)
331
+ rspec-its (2.0.0)
332
+ rspec-core (>= 3.13.0)
333
+ rspec-expectations (>= 3.13.0)
334
+ rspec-mocks (3.13.5)
210
335
  diff-lcs (>= 1.2.0, < 2.0)
211
- rspec-support (~> 3.5.0)
212
- rspec-rails (3.5.2)
213
- actionpack (>= 3.0)
214
- activesupport (>= 3.0)
215
- railties (>= 3.0)
216
- rspec-core (~> 3.5.0)
217
- rspec-expectations (~> 3.5.0)
218
- rspec-mocks (~> 3.5.0)
219
- rspec-support (~> 3.5.0)
220
- rspec-support (3.5.0)
221
- sass (3.4.23)
222
- sass-rails (5.0.6)
223
- railties (>= 4.0.0, < 6)
224
- sass (~> 3.1)
225
- sprockets (>= 2.8, < 4.0)
226
- sprockets-rails (>= 2.0, < 4.0)
227
- tilt (>= 1.1, < 3)
228
- slim (3.0.7)
229
- temple (~> 0.7.6)
230
- tilt (>= 1.3.3, < 2.1)
231
- slim-rails (3.1.1)
336
+ rspec-support (~> 3.13.0)
337
+ rspec-rails (8.0.2)
338
+ actionpack (>= 7.2)
339
+ activesupport (>= 7.2)
340
+ railties (>= 7.2)
341
+ rspec-core (~> 3.13)
342
+ rspec-expectations (~> 3.13)
343
+ rspec-mocks (~> 3.13)
344
+ rspec-support (~> 3.13)
345
+ rspec-support (3.13.5)
346
+ sass (3.4.25)
347
+ sass-rails (6.0.0)
348
+ sassc-rails (~> 2.1, >= 2.1.1)
349
+ sassc (2.4.0)
350
+ ffi (~> 1.9)
351
+ sassc-rails (2.1.2)
352
+ railties (>= 4.0.0)
353
+ sassc (>= 2.0)
354
+ sprockets (> 3.0)
355
+ sprockets-rails
356
+ tilt
357
+ securerandom (0.4.1)
358
+ slim (5.2.1)
359
+ temple (~> 0.10.0)
360
+ tilt (>= 2.1.0)
361
+ slim-rails (3.7.0)
232
362
  actionpack (>= 3.1)
233
363
  railties (>= 3.1)
234
- slim (~> 3.0)
235
- slop (3.6.0)
236
- sprockets (3.7.1)
364
+ slim (>= 3.0, < 6.0, != 5.0.0)
365
+ sprockets (4.2.2)
237
366
  concurrent-ruby (~> 1.0)
238
- rack (> 1, < 3)
239
- sprockets-rails (3.2.0)
240
- actionpack (>= 4.0)
241
- activesupport (>= 4.0)
367
+ logger
368
+ rack (>= 2.2.4, < 4)
369
+ sprockets-rails (3.5.2)
370
+ actionpack (>= 6.1)
371
+ activesupport (>= 6.1)
242
372
  sprockets (>= 3.0.0)
243
- temple (0.7.7)
244
- thin (1.7.0)
373
+ stringio (3.2.0)
374
+ temple (0.10.4)
375
+ terrapin (0.6.0)
376
+ climate_control (>= 0.0.3, < 1.0)
377
+ thin (2.0.1)
245
378
  daemons (~> 1.0, >= 1.0.9)
246
379
  eventmachine (~> 1.0, >= 1.0.4)
247
- rack (>= 1, < 3)
248
- thor (0.19.4)
249
- thread_safe (0.3.5)
250
- tilt (2.0.6)
251
- tinymce-rails (4.5.3)
252
- railties (>= 3.1.1)
253
- tzinfo (1.2.2)
254
- thread_safe (~> 0.1)
255
- warden (1.2.7)
256
- rack (>= 1.0)
257
- websocket-driver (0.6.5)
380
+ logger
381
+ rack (>= 1, < 4)
382
+ thor (1.5.0)
383
+ tilt (2.6.1)
384
+ timeout (0.4.3)
385
+ tsort (0.2.0)
386
+ tzinfo (2.0.6)
387
+ concurrent-ruby (~> 1.0)
388
+ uri (1.1.1)
389
+ useragent (0.16.11)
390
+ warden (1.2.9)
391
+ rack (>= 2.0.9)
392
+ websocket-driver (0.8.0)
393
+ base64
258
394
  websocket-extensions (>= 0.1.0)
259
- websocket-extensions (0.1.2)
260
- xpath (2.0.0)
261
- nokogiri (~> 1.3)
395
+ websocket-extensions (0.1.5)
396
+ xpath (3.2.0)
397
+ nokogiri (~> 1.8)
398
+ zeitwerk (2.7.5)
262
399
 
263
400
  PLATFORMS
264
- ruby
401
+ aarch64-linux-gnu
402
+ aarch64-linux-musl
403
+ arm-linux-gnu
404
+ arm-linux-musl
405
+ arm64-darwin
406
+ x86_64-darwin
407
+ x86_64-linux-gnu
408
+ x86_64-linux-musl
265
409
 
266
410
  DEPENDENCIES
267
411
  ace-rails-ap
268
- bourbon
269
412
  capybara
270
413
  cmtool!
271
414
  coffee-script
@@ -277,18 +420,18 @@ DEPENDENCIES
277
420
  foundation-rails (~> 5.5)
278
421
  jquery-rails
279
422
  launchy
423
+ momentjs-rails
280
424
  paperclip (>= 3.4, != 4.3.0)
281
425
  pickadate-rails
282
426
  poltergeist
283
427
  pry-rails
284
- rails (~> 4.2.3)
428
+ rails (~> 8.0.1)
285
429
  rspec-its
286
430
  rspec-rails
287
431
  sass-rails
288
432
  simply_stored!
289
433
  slim-rails
290
434
  thin
291
- tinymce-rails
292
435
 
293
436
  BUNDLED WITH
294
- 1.13.6
437
+ 2.7.1
data/app/assets/javascripts/cmtool/application.js.coffee CHANGED
@@ -6,6 +6,7 @@
6
6
  #= require ace/theme-monokai
7
7
  #= require ace/mode-coffee
8
8
  #= require ace/mode-handlebars
9
+ #= require ace/mode-json
9
10
  #= require ace/mode-yaml
10
11
  #= require ace/mode-haml
11
12
  #= require ace/mode-slim
data/app/assets/javascripts/cmtool/html_edit.js.coffee CHANGED
@@ -17,6 +17,10 @@ class HtmlEdit
17
17
  editor.setValue template_field.val(), -1
18
18
  editor.getSession().setMode 'ace/mode/slim'
19
19
  console.log "Editing Emblem using Slim mode for ACE editor"
20
+ else if data_mode = text_field.data('mode')
21
+ editor.setValue text_field.val(), -1
22
+ editor.getSession().setMode "ace/mode/#{data_mode}"
23
+ console.log "Editing #{data_mode} using ACE editor"
20
24
  else
21
25
  editor.setValue text_field.val(), -1
22
26
  editor.getSession().setMode 'ace/mode/handlebars'
data/app/helpers/cmtool/application_helper.rb CHANGED
@@ -15,9 +15,9 @@ module Cmtool
15
15
  end
16
16
 
17
17
  # overwrite i18n l, to handle nil values
18
- def l(*args)
18
+ def l(*args, **options)
19
19
  return '' unless args.first
20
- super(*args)
20
+ super(*args, **options)
21
21
  end
22
22
 
23
23
  def site_title
data/app/models/cmtool/image.rb CHANGED
@@ -2,6 +2,10 @@ module Cmtool
2
2
  class Image
3
3
  include SimplyStored::Couch
4
4
  include Paperclip::Glue
5
+ # TODO: Replace Paperclip with SimplyStored::HasAttachment
6
+ # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
7
+ # 2. Replace `has_attached_file :file, styles: {...}` with `has_attachment :file, styles: {...}`
8
+ # 3. Replace `validates_attachment` with standard Rails validations
5
9
 
6
10
  property :file_file_name
7
11
  property :file_content_type
data/app/models/cmtool/news.rb CHANGED
@@ -2,6 +2,9 @@ module Cmtool
2
2
  class News
3
3
  include SimplyStored::Couch
4
4
  include Paperclip::Glue
5
+ # TODO: Replace Paperclip with SimplyStored::HasAttachment
6
+ # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
7
+ # 2. Replace `has_attached_file :image, styles: {...}` with `has_attachment :image, styles: {...}`
5
8
 
6
9
  property :title
7
10
  property :active, type: :boolean, default: true
data/app/models/cmtool/quote.rb CHANGED
@@ -2,6 +2,9 @@ module Cmtool
2
2
  class Quote
3
3
  include SimplyStored::Couch
4
4
  include Paperclip::Glue
5
+ # TODO: Replace Paperclip with SimplyStored::HasAttachment
6
+ # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
7
+ # 2. Replace `has_attached_file :image, styles: {...}` with `has_attachment :image, styles: {...}`
5
8
 
6
9
  property :owner
7
10
  property :function
data/app/views/cmtool/pages/_form.html.slim CHANGED
@@ -37,6 +37,12 @@ javascript:
37
37
  .field
38
38
  = f.label :footer
39
39
  = f.text_area :footer, rows: 15, cols: 80, class: 'html-content'
40
+ = collapsible_content 'Page Settings (JSON)' do
41
+ .field
42
+ = f.label :page_settings
43
+ p.help-text JSON configuration for this page. Use Ace editor in JSON mode.
44
+ = f.text_area :page_settings, rows: 12, cols: 80, class: 'html-content', data: { mode: 'json' },
45
+ value: (f.object.page_settings.presence || {}).to_json
40
46
  .form-row
41
47
  .form-label= f.label :parent_id
42
48
  .form-field= f.select :parent_id, tree_options_for_select(Page.full_tree(@page.locale || Page.locales.first), exclude: @page.id, selected: @page.parent_id), include_blank: ' -- '
data/lib/cmtool/engine.rb CHANGED
@@ -13,28 +13,28 @@ require 'bourbon'
13
13
  module Cmtool
14
14
  class Engine < ::Rails::Engine
15
15
  isolate_namespace Cmtool
16
- initializer 'cmtool.build_menu', after: 'load_config_initializers' do |app|
17
- require 'email_validator'
18
- #require 'bourbon'
19
- require 'slim-rails'
20
- require 'paperclip'
21
- require 'devise'
22
- require 'devise_simply_stored'
23
- require 'jquery-rails'
24
- # require 'tinymce-rails'
25
-
26
- require 'page' # app/models/page.rb
27
- require 'user' # app/models/user.rb
28
- require 'cmtool/yml_file'
29
- require 'cmtool/keyword'
30
- require 'cmtool/news'
31
- require 'cmtool/faq'
32
- require 'cmtool/quote'
33
- require 'cmtool/contact_form'
34
- require 'cmtool/newsletter_subscription'
35
- require 'cmtool/image'
36
- require 'cmtool/directory'
37
- end
16
+ # initializer 'cmtool.build_menu', after: 'load_config_initializers' do |app|
17
+ # require 'email_validator'
18
+ # #require 'bourbon'
19
+ # require 'slim-rails'
20
+ # require 'paperclip'
21
+ # require 'devise'
22
+ # require 'devise_simply_stored'
23
+ # require 'jquery-rails'
24
+ # # require 'tinymce-rails'
25
+ #
26
+ # require 'page' # app/models/page.rb
27
+ # require 'user' # app/models/user.rb
28
+ # require 'cmtool/yml_file'
29
+ # require 'cmtool/keyword'
30
+ # require 'cmtool/news'
31
+ # require 'cmtool/faq'
32
+ # require 'cmtool/quote'
33
+ # require 'cmtool/contact_form'
34
+ # require 'cmtool/newsletter_subscription'
35
+ # require 'cmtool/image'
36
+ # require 'cmtool/directory'
37
+ # end
38
38
 
39
39
  config.after_initialize do
40
40
  Cmtool::Menu.register do
data/lib/cmtool/includes/page.rb CHANGED
@@ -21,6 +21,13 @@ module Cmtool
21
21
  klass.property :active, type: :boolean, default: true
22
22
  klass.property :layout
23
23
  klass.property :in_menu, type: :boolean, default: true
24
+ klass.property :page_settings, type: Hash, default: {}
25
+
26
+ # JSON string parsing (safety net until couch_potato type: Hash handles this)
27
+ klass.send(:define_method, :page_settings=) do |val|
28
+ val = JSON.parse(val) if val.is_a?(String)
29
+ super(val)
30
+ end
24
31
 
25
32
  klass.has_ancestry by_property: :locale
26
33
 
@@ -66,7 +73,7 @@ module Cmtool
66
73
  end
67
74
 
68
75
  def locales
69
- Rails.configuration.i18n.available_locales.presence || []
76
+ Rails.configuration.i18n.available_locales.presence || [:en]
70
77
  end
71
78
 
72
79
  def default_locale
data/lib/cmtool/includes/pages_controller.rb CHANGED
@@ -13,7 +13,7 @@ module Cmtool
13
13
  # General catcher for pages
14
14
  def show
15
15
  @page = ::Page.find_by_name_and_locale(params[:name], I18n.locale.to_s)
16
- not_found and return unless @page
16
+ return not_found unless @page
17
17
 
18
18
  @sub_pages = [@page] + @page.children.select{|child| child.in_menu.present? }
19
19
  template = "pages/#{@page.name}"
data/lib/cmtool/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Cmtool
2
- VERSION = "3.0.0"
2
+ VERSION = "3.1.0"
3
3
  end
data/lib/cmtool.rb CHANGED
@@ -5,6 +5,13 @@ require 'cmtool/includes/user'
5
5
  require 'cmtool/includes/page'
6
6
  require 'cmtool/includes/pages_controller'
7
7
  require 'cmtool/menu'
8
+ require 'email_validator'
9
+
10
+ # Paperclip replacement — stores file metadata as CouchDB properties,
11
+ # handles thumbnail generation via MiniMagick.
12
+ # Replace `include Paperclip::Glue` + `has_attached_file` with
13
+ # `include SimplyStored::HasAttachment` + `has_attachment`
14
+ # has_attachment now in simply_stored gem
8
15
 
9
16
  module Cmtool
10
17
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cmtool
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 3.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Benjamin ter Kuile
@@ -1372,7 +1372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1372
1372
  - !ruby/object:Gem::Version
1373
1373
  version: '0'
1374
1374
  requirements: []
1375
- rubygems_version: 3.6.2
1375
+ rubygems_version: 3.7.2
1376
1376
  specification_version: 4
1377
1377
  summary: A rails 3.2+ CMS as engine for a CouchDB backend
1378
1378
  test_files: