kuhsaft 1.8.6 → 2.0.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.
- checksums.yaml +4 -4
- data/README.md +3 -8
- data/Rakefile +4 -25
- data/app/assets/javascripts/kuhsaft/cms/application.js.coffee +2 -2
- data/app/assets/stylesheets/kuhsaft/cms/application.css.sass +4 -8
- data/app/controllers/kuhsaft/cms/admin_controller.rb +4 -4
- data/app/controllers/kuhsaft/pages_controller.rb +1 -2
- data/app/models/kuhsaft/asset.rb +2 -2
- data/app/models/kuhsaft/brick_type.rb +3 -3
- data/app/models/kuhsaft/page.rb +5 -7
- data/app/uploaders/kuhsaft/asset_brick_asset_uploader.rb +1 -1
- data/app/uploaders/kuhsaft/image_brick_image_uploader.rb +1 -1
- data/app/views/kuhsaft/cms/pages/_form.html.haml +0 -1
- data/app/views/kuhsaft/pages/show.html.haml +2 -7
- data/config/locales/kuhsaft.de.yml +1 -4
- data/config/locales/kuhsaft.en.yml +0 -3
- data/config/locales/models/kuhsaft/page/de.yml +0 -1
- data/config/routes.rb +1 -1
- data/lib/kuhsaft.rb +3 -2
- data/lib/kuhsaft/searchable.rb +1 -3
- data/lib/kuhsaft/version.rb +1 -1
- data/spec/controllers/kuhsaft/pages_controller_spec.rb +25 -13
- data/spec/dummy/app/assets/javascripts/kuhsaft/cms/customizations.js.coffee +0 -0
- data/spec/dummy/app/assets/stylesheets/kuhsaft/cms/customizations.css.sass +0 -0
- data/spec/dummy/app/views/layouts/application.html.erb +1 -1
- data/spec/dummy/bin/bundle +3 -0
- data/spec/dummy/bin/rails +4 -0
- data/spec/dummy/bin/rake +4 -0
- data/spec/dummy/config/application.rb +6 -52
- data/spec/dummy/config/boot.rb +3 -9
- data/spec/dummy/config/environment.rb +2 -2
- data/spec/dummy/config/environments/development.rb +11 -19
- data/spec/dummy/config/environments/production.rb +41 -27
- data/spec/dummy/config/environments/test.rb +13 -14
- data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
- data/spec/dummy/config/initializers/inflections.rb +6 -5
- data/spec/dummy/config/initializers/kuhsaft.rb +5 -0
- data/spec/dummy/config/initializers/secret_token.rb +7 -2
- data/spec/dummy/config/initializers/session_store.rb +0 -5
- data/spec/dummy/config/initializers/wrap_parameters.rb +6 -6
- data/spec/dummy/config/locales/en.yml +20 -2
- data/spec/dummy/config/routes.rb +1 -1
- data/spec/features/search_spec.rb +2 -2
- data/spec/spec_helper.rb +10 -0
- metadata +72 -49
- data/db/migrate/13_add_page_title_to_pages.rb +0 -7
- data/db/migrate/14_move_kuhsaft_assets.rb +0 -22
- data/spec/support/default_url_options.rb +0 -36
data/spec/spec_helper.rb
CHANGED
@@ -36,8 +36,18 @@ RSpec.configure do |config|
|
|
36
36
|
config.include FactoryGirl::Syntax::Methods
|
37
37
|
|
38
38
|
config.before :suite do
|
39
|
+
|
40
|
+
load File.expand_path("../dummy/Rakefile", __FILE__)
|
41
|
+
Dir.chdir(File.join(File.dirname(__FILE__), './dummy')) do
|
42
|
+
Rake::Task['kuhsaft:install:migrations'].invoke
|
43
|
+
Rails::Generators.invoke('kuhsaft:install:assets')
|
44
|
+
end
|
45
|
+
|
39
46
|
DatabaseCleaner.strategy = :transaction
|
40
47
|
DatabaseCleaner.clean_with(:truncation)
|
48
|
+
# Drop all records and run any available migration
|
49
|
+
ActiveRecord::Base.connection.tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
|
50
|
+
ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
|
41
51
|
end
|
42
52
|
|
43
53
|
config.after :suite do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kuhsaft
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Immanuel Häussermann
|
@@ -12,7 +12,7 @@ authors:
|
|
12
12
|
autorequire:
|
13
13
|
bindir: bin
|
14
14
|
cert_chain: []
|
15
|
-
date: 2013-
|
15
|
+
date: 2013-07-15 00:00:00.000000000 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
name: rspec
|
@@ -32,16 +32,16 @@ dependencies:
|
|
32
32
|
name: rspec-rails
|
33
33
|
requirement: !ruby/object:Gem::Requirement
|
34
34
|
requirements:
|
35
|
-
- -
|
35
|
+
- - ~>
|
36
36
|
- !ruby/object:Gem::Version
|
37
|
-
version: '
|
37
|
+
version: '2.13'
|
38
38
|
type: :development
|
39
39
|
prerelease: false
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
41
41
|
requirements:
|
42
|
-
- -
|
42
|
+
- - ~>
|
43
43
|
- !ruby/object:Gem::Version
|
44
|
-
version: '
|
44
|
+
version: '2.13'
|
45
45
|
- !ruby/object:Gem::Dependency
|
46
46
|
name: factory_girl_rails
|
47
47
|
requirement: !ruby/object:Gem::Requirement
|
@@ -113,49 +113,49 @@ dependencies:
|
|
113
113
|
- !ruby/object:Gem::Version
|
114
114
|
version: '0'
|
115
115
|
- !ruby/object:Gem::Dependency
|
116
|
-
name: rails
|
116
|
+
name: coffee-rails
|
117
117
|
requirement: !ruby/object:Gem::Requirement
|
118
118
|
requirements:
|
119
|
-
- -
|
119
|
+
- - '>='
|
120
120
|
- !ruby/object:Gem::Version
|
121
|
-
version:
|
121
|
+
version: '0'
|
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
|
-
version:
|
128
|
+
version: '0'
|
129
129
|
- !ruby/object:Gem::Dependency
|
130
130
|
name: haml
|
131
131
|
requirement: !ruby/object:Gem::Requirement
|
132
132
|
requirements:
|
133
133
|
- - '>='
|
134
134
|
- !ruby/object:Gem::Version
|
135
|
-
version:
|
135
|
+
version: 4.0.3
|
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
|
-
version:
|
142
|
+
version: 4.0.3
|
143
143
|
- !ruby/object:Gem::Dependency
|
144
|
-
name:
|
144
|
+
name: carrierwave
|
145
145
|
requirement: !ruby/object:Gem::Requirement
|
146
146
|
requirements:
|
147
147
|
- - '>='
|
148
148
|
- !ruby/object:Gem::Version
|
149
|
-
version: 0
|
149
|
+
version: '0'
|
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
|
-
version: 0
|
156
|
+
version: '0'
|
157
157
|
- !ruby/object:Gem::Dependency
|
158
|
-
name:
|
158
|
+
name: mini_magick
|
159
159
|
requirement: !ruby/object:Gem::Requirement
|
160
160
|
requirements:
|
161
161
|
- - '>='
|
@@ -169,7 +169,7 @@ dependencies:
|
|
169
169
|
- !ruby/object:Gem::Version
|
170
170
|
version: '0'
|
171
171
|
- !ruby/object:Gem::Dependency
|
172
|
-
name:
|
172
|
+
name: rdiscount
|
173
173
|
requirement: !ruby/object:Gem::Requirement
|
174
174
|
requirements:
|
175
175
|
- - '>='
|
@@ -183,63 +183,63 @@ dependencies:
|
|
183
183
|
- !ruby/object:Gem::Version
|
184
184
|
version: '0'
|
185
185
|
- !ruby/object:Gem::Dependency
|
186
|
-
name:
|
186
|
+
name: ancestry
|
187
187
|
requirement: !ruby/object:Gem::Requirement
|
188
188
|
requirements:
|
189
189
|
- - '>='
|
190
190
|
- !ruby/object:Gem::Version
|
191
|
-
version: '
|
191
|
+
version: '0'
|
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
|
-
version: '
|
198
|
+
version: '0'
|
199
199
|
- !ruby/object:Gem::Dependency
|
200
|
-
name:
|
200
|
+
name: bootstrap-sass
|
201
201
|
requirement: !ruby/object:Gem::Requirement
|
202
202
|
requirements:
|
203
203
|
- - '>='
|
204
204
|
- !ruby/object:Gem::Version
|
205
|
-
version: 0
|
205
|
+
version: '0'
|
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
|
-
version: 0
|
212
|
+
version: '0'
|
213
213
|
- !ruby/object:Gem::Dependency
|
214
|
-
name:
|
214
|
+
name: ckeditor
|
215
215
|
requirement: !ruby/object:Gem::Requirement
|
216
216
|
requirements:
|
217
|
-
- - '
|
217
|
+
- - '='
|
218
218
|
- !ruby/object:Gem::Version
|
219
|
-
version:
|
219
|
+
version: 4.0.2
|
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
|
-
version:
|
226
|
+
version: 4.0.2
|
227
227
|
- !ruby/object:Gem::Dependency
|
228
|
-
name:
|
228
|
+
name: pg_search
|
229
229
|
requirement: !ruby/object:Gem::Requirement
|
230
230
|
requirements:
|
231
231
|
- - '>='
|
232
232
|
- !ruby/object:Gem::Version
|
233
|
-
version: '
|
233
|
+
version: '0'
|
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
|
-
version: '
|
240
|
+
version: '0'
|
241
241
|
- !ruby/object:Gem::Dependency
|
242
|
-
name:
|
242
|
+
name: htmlentities
|
243
243
|
requirement: !ruby/object:Gem::Requirement
|
244
244
|
requirements:
|
245
245
|
- - '>='
|
@@ -253,35 +253,35 @@ dependencies:
|
|
253
253
|
- !ruby/object:Gem::Version
|
254
254
|
version: '0'
|
255
255
|
- !ruby/object:Gem::Dependency
|
256
|
-
name:
|
256
|
+
name: rails
|
257
257
|
requirement: !ruby/object:Gem::Requirement
|
258
258
|
requirements:
|
259
|
-
- -
|
259
|
+
- - ~>
|
260
260
|
- !ruby/object:Gem::Version
|
261
|
-
version:
|
261
|
+
version: 4.0.0
|
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
|
-
version:
|
268
|
+
version: 4.0.0
|
269
269
|
- !ruby/object:Gem::Dependency
|
270
|
-
name:
|
270
|
+
name: simple_form
|
271
271
|
requirement: !ruby/object:Gem::Requirement
|
272
272
|
requirements:
|
273
273
|
- - '='
|
274
274
|
- !ruby/object:Gem::Version
|
275
|
-
version:
|
275
|
+
version: 3.0.0.rc
|
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
|
-
version:
|
282
|
+
version: 3.0.0.rc
|
283
283
|
- !ruby/object:Gem::Dependency
|
284
|
-
name:
|
284
|
+
name: protected_attributes
|
285
285
|
requirement: !ruby/object:Gem::Requirement
|
286
286
|
requirements:
|
287
287
|
- - '>='
|
@@ -295,7 +295,21 @@ dependencies:
|
|
295
295
|
- !ruby/object:Gem::Version
|
296
296
|
version: '0'
|
297
297
|
- !ruby/object:Gem::Dependency
|
298
|
-
name:
|
298
|
+
name: jquery-ui-rails
|
299
|
+
requirement: !ruby/object:Gem::Requirement
|
300
|
+
requirements:
|
301
|
+
- - '>='
|
302
|
+
- !ruby/object:Gem::Version
|
303
|
+
version: '0'
|
304
|
+
type: :runtime
|
305
|
+
prerelease: false
|
306
|
+
version_requirements: !ruby/object:Gem::Requirement
|
307
|
+
requirements:
|
308
|
+
- - '>='
|
309
|
+
- !ruby/object:Gem::Version
|
310
|
+
version: '0'
|
311
|
+
- !ruby/object:Gem::Dependency
|
312
|
+
name: bourbon
|
299
313
|
requirement: !ruby/object:Gem::Requirement
|
300
314
|
requirements:
|
301
315
|
- - '>='
|
@@ -449,8 +463,6 @@ files:
|
|
449
463
|
- db/migrate/10_add_redirect_url_to_kuhsaft_pages.rb
|
450
464
|
- db/migrate/11_update_url_and_redirect_url_value.rb
|
451
465
|
- db/migrate/12_regenerate_fulltext.rb
|
452
|
-
- db/migrate/13_add_page_title_to_pages.rb
|
453
|
-
- db/migrate/14_move_kuhsaft_assets.rb
|
454
466
|
- db/seeds.rb
|
455
467
|
- lib/generators/kuhsaft/assets/install_generator.rb
|
456
468
|
- lib/generators/kuhsaft/translations/add_generator.rb
|
@@ -477,10 +489,15 @@ files:
|
|
477
489
|
- spec/dummy/app/assets/images/spec-image.png
|
478
490
|
- spec/dummy/app/assets/javascripts/application.js
|
479
491
|
- spec/dummy/app/assets/javascripts/kuhsaft/cms/ck-config.js.coffee
|
492
|
+
- spec/dummy/app/assets/javascripts/kuhsaft/cms/customizations.js.coffee
|
480
493
|
- spec/dummy/app/assets/stylesheets/application.css
|
494
|
+
- spec/dummy/app/assets/stylesheets/kuhsaft/cms/customizations.css.sass
|
481
495
|
- spec/dummy/app/controllers/application_controller.rb
|
482
496
|
- spec/dummy/app/helpers/application_helper.rb
|
483
497
|
- spec/dummy/app/views/layouts/application.html.erb
|
498
|
+
- spec/dummy/bin/bundle
|
499
|
+
- spec/dummy/bin/rails
|
500
|
+
- spec/dummy/bin/rake
|
484
501
|
- spec/dummy/config.ru
|
485
502
|
- spec/dummy/config/application.rb
|
486
503
|
- spec/dummy/config/boot.rb
|
@@ -490,7 +507,9 @@ files:
|
|
490
507
|
- spec/dummy/config/environments/production.rb
|
491
508
|
- spec/dummy/config/environments/test.rb
|
492
509
|
- spec/dummy/config/initializers/backtrace_silencers.rb
|
510
|
+
- spec/dummy/config/initializers/filter_parameter_logging.rb
|
493
511
|
- spec/dummy/config/initializers/inflections.rb
|
512
|
+
- spec/dummy/config/initializers/kuhsaft.rb
|
494
513
|
- spec/dummy/config/initializers/mime_types.rb
|
495
514
|
- spec/dummy/config/initializers/secret_token.rb
|
496
515
|
- spec/dummy/config/initializers/session_store.rb
|
@@ -536,11 +555,9 @@ files:
|
|
536
555
|
- spec/models/two_column_brick_spec.rb
|
537
556
|
- spec/models/video_brick_spec.rb
|
538
557
|
- spec/spec_helper.rb
|
539
|
-
- spec/support/default_url_options.rb
|
540
558
|
- spec/support/kuhsaft_spec_helper.rb
|
541
559
|
homepage: http://github.com/screenconcept/kuhsaft
|
542
|
-
licenses:
|
543
|
-
- MIT
|
560
|
+
licenses: []
|
544
561
|
metadata: {}
|
545
562
|
post_install_message:
|
546
563
|
rdoc_options: []
|
@@ -568,10 +585,15 @@ test_files:
|
|
568
585
|
- spec/dummy/app/assets/images/spec-image.png
|
569
586
|
- spec/dummy/app/assets/javascripts/application.js
|
570
587
|
- spec/dummy/app/assets/javascripts/kuhsaft/cms/ck-config.js.coffee
|
588
|
+
- spec/dummy/app/assets/javascripts/kuhsaft/cms/customizations.js.coffee
|
571
589
|
- spec/dummy/app/assets/stylesheets/application.css
|
590
|
+
- spec/dummy/app/assets/stylesheets/kuhsaft/cms/customizations.css.sass
|
572
591
|
- spec/dummy/app/controllers/application_controller.rb
|
573
592
|
- spec/dummy/app/helpers/application_helper.rb
|
574
593
|
- spec/dummy/app/views/layouts/application.html.erb
|
594
|
+
- spec/dummy/bin/bundle
|
595
|
+
- spec/dummy/bin/rails
|
596
|
+
- spec/dummy/bin/rake
|
575
597
|
- spec/dummy/config.ru
|
576
598
|
- spec/dummy/config/application.rb
|
577
599
|
- spec/dummy/config/boot.rb
|
@@ -581,7 +603,9 @@ test_files:
|
|
581
603
|
- spec/dummy/config/environments/production.rb
|
582
604
|
- spec/dummy/config/environments/test.rb
|
583
605
|
- spec/dummy/config/initializers/backtrace_silencers.rb
|
606
|
+
- spec/dummy/config/initializers/filter_parameter_logging.rb
|
584
607
|
- spec/dummy/config/initializers/inflections.rb
|
608
|
+
- spec/dummy/config/initializers/kuhsaft.rb
|
585
609
|
- spec/dummy/config/initializers/mime_types.rb
|
586
610
|
- spec/dummy/config/initializers/secret_token.rb
|
587
611
|
- spec/dummy/config/initializers/session_store.rb
|
@@ -627,5 +651,4 @@ test_files:
|
|
627
651
|
- spec/models/two_column_brick_spec.rb
|
628
652
|
- spec/models/video_brick_spec.rb
|
629
653
|
- spec/spec_helper.rb
|
630
|
-
- spec/support/default_url_options.rb
|
631
654
|
- spec/support/kuhsaft_spec_helper.rb
|
@@ -1,22 +0,0 @@
|
|
1
|
-
class MoveKuhsaftAssets < ActiveRecord::Migration
|
2
|
-
def old_kuhsaft_assets_dir
|
3
|
-
File.join(Rails.root,'public/uploads/kuhsaft')
|
4
|
-
end
|
5
|
-
|
6
|
-
def new_kuhsaft_assets_dir
|
7
|
-
File.join(Rails.root,'public/uploads/cms')
|
8
|
-
end
|
9
|
-
|
10
|
-
def up
|
11
|
-
if File.exists? old_kuhsaft_assets_dir
|
12
|
-
puts "Moving Kuhsaft Assets from #{old_kuhsaft_assets_dir} to #{new_kuhsaft_assets_dir}"
|
13
|
-
File.rename old_kuhsaft_assets_dir, new_kuhsaft_assets_dir
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
17
|
-
def down
|
18
|
-
if File.exists? new_kuhsaft_assets_dir
|
19
|
-
File.rename new_kuhsaft_assets_dir, old_kuhsaft_assets_dir
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
@@ -1,36 +0,0 @@
|
|
1
|
-
class ActionView::TestCase::TestController
|
2
|
-
def default_url_options(options={})
|
3
|
-
{ :locale => I18n.locale }.merge options
|
4
|
-
end
|
5
|
-
end
|
6
|
-
|
7
|
-
# The following snippet breaks url_for
|
8
|
-
# as described by franca
|
9
|
-
# https://github.com/screenconcept/shoestrap/issues/23
|
10
|
-
# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
11
|
-
#class ActionDispatch::Routing::RouteSet
|
12
|
-
#def default_url_options(options={})
|
13
|
-
#{ :locale => I18n.locale }
|
14
|
-
#end
|
15
|
-
#end
|
16
|
-
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
|
17
|
-
|
18
|
-
# Fixes the missing default locale problem in controller specs
|
19
|
-
# See http://www.ruby-forum.com/topic/3448797#1041659
|
20
|
-
class ActionController::TestCase
|
21
|
-
module Behavior
|
22
|
-
def process_with_default_locale(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
|
23
|
-
parameters = { :locale => I18n.locale }.merge( parameters || {} )
|
24
|
-
process_without_default_locale(action, parameters, session, flash, http_method)
|
25
|
-
end
|
26
|
-
alias_method_chain :process, :default_locale
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
module ActionDispatch::Assertions::RoutingAssertions
|
31
|
-
def assert_recognizes_with_default_locale(expected_options, path, extras = {}, message=nil)
|
32
|
-
expected_options = { :locale => I18n.locale.to_s }.merge(expected_options || {} )
|
33
|
-
assert_recognizes_without_default_locale(expected_options, path, extras, message)
|
34
|
-
end
|
35
|
-
alias_method_chain :assert_recognizes, :default_locale
|
36
|
-
end
|