constructor-cms 0.5.8 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (56) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -3
  3. data/README.md +1 -1
  4. data/{script → bin}/rails +1 -1
  5. data/constructor-cms.gemspec +1 -3
  6. data/core/app/controllers/constructor_core/application_controller.rb +1 -1
  7. data/core/app/controllers/constructor_core/users_controller.rb +2 -2
  8. data/core/app/models/constructor_core/user.rb +0 -1
  9. data/core/config/initializers/devise.rb +8 -8
  10. data/core/constructor-core.gemspec +2 -2
  11. data/core/lib/constructor_core/version.rb +1 -1
  12. data/pages/app/controllers/constructor_pages/fields_controller.rb +11 -2
  13. data/pages/app/controllers/constructor_pages/pages_controller.rb +20 -12
  14. data/pages/app/controllers/constructor_pages/templates_controller.rb +13 -7
  15. data/pages/app/models/constructor_pages/field.rb +1 -3
  16. data/pages/app/models/constructor_pages/page.rb +15 -21
  17. data/pages/app/models/constructor_pages/template.rb +0 -3
  18. data/pages/app/models/constructor_pages/types/boolean_type.rb +1 -2
  19. data/pages/app/models/constructor_pages/types/date_type.rb +1 -6
  20. data/pages/app/models/constructor_pages/types/float_type.rb +1 -2
  21. data/pages/app/models/constructor_pages/types/html_type.rb +1 -2
  22. data/pages/app/models/constructor_pages/types/image_type.rb +3 -2
  23. data/pages/app/models/constructor_pages/types/integer_type.rb +1 -2
  24. data/pages/app/models/constructor_pages/types/string_type.rb +1 -2
  25. data/pages/app/models/constructor_pages/types/text_type.rb +1 -2
  26. data/pages/app/views/constructor_pages/fields/types/_date.haml +1 -1
  27. data/pages/app/views/constructor_pages/pages/_form.haml +2 -2
  28. data/pages/app/views/constructor_pages/pages/index.haml +4 -4
  29. data/pages/app/views/constructor_pages/templates/_form.haml +2 -2
  30. data/pages/config/locales/ru.yml +0 -1
  31. data/pages/constructor-pages.gemspec +2 -1
  32. data/spec/dummy/README.rdoc +15 -248
  33. data/spec/dummy/Rakefile +0 -1
  34. data/spec/dummy/app/controllers/application_controller.rb +1 -1
  35. data/spec/dummy/bin/bundle +3 -0
  36. data/spec/dummy/bin/rails +4 -0
  37. data/spec/dummy/bin/rake +4 -0
  38. data/spec/dummy/config.ru +1 -1
  39. data/spec/dummy/config/application.rb +4 -43
  40. data/spec/dummy/config/boot.rb +2 -3
  41. data/spec/dummy/config/environment.rb +2 -2
  42. data/spec/dummy/config/environments/development.rb +11 -19
  43. data/spec/dummy/config/environments/production.rb +40 -27
  44. data/spec/dummy/config/environments/test.rb +13 -14
  45. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  46. data/spec/dummy/config/initializers/inflections.rb +6 -5
  47. data/spec/dummy/config/initializers/secret_token.rb +7 -2
  48. data/spec/dummy/config/initializers/session_store.rb +0 -5
  49. data/spec/dummy/config/initializers/wrap_parameters.rb +6 -6
  50. data/spec/dummy/config/routes.rb +2 -57
  51. data/spec/dummy/public/404.html +48 -16
  52. data/spec/dummy/public/422.html +48 -16
  53. data/spec/dummy/public/500.html +48 -16
  54. data/spec/dummy/public/robots.txt +1 -1
  55. metadata +19 -27
  56. data/spec/dummy/script/rails +0 -6
data/spec/dummy/public/422.html CHANGED
@@ -1,26 +1,58 @@
1
1
  <!DOCTYPE html>
2
2
  <html>
3
3
  <head>
4
- <title>The change you wanted was rejected (422)</title>
5
- <style type="text/css">
6
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7
- div.dialog {
8
- width: 25em;
9
- padding: 0 4em;
10
- margin: 4em auto 0 auto;
11
- border: 1px solid #ccc;
12
- border-right-color: #999;
13
- border-bottom-color: #999;
14
- }
15
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16
- </style>
4
+ <title>The change you wanted was rejected (422)</title>
5
+ <style>
6
+ body {
7
+ background-color: #EFEFEF;
8
+ color: #2E2F30;
9
+ text-align: center;
10
+ font-family: arial, sans-serif;
11
+ }
12
+
13
+ div.dialog {
14
+ width: 25em;
15
+ margin: 4em auto 0 auto;
16
+ border: 1px solid #CCC;
17
+ border-right-color: #999;
18
+ border-left-color: #999;
19
+ border-bottom-color: #BBB;
20
+ border-top: #B00100 solid 4px;
21
+ border-top-left-radius: 9px;
22
+ border-top-right-radius: 9px;
23
+ background-color: white;
24
+ padding: 7px 4em 0 4em;
25
+ }
26
+
27
+ h1 {
28
+ font-size: 100%;
29
+ color: #730E15;
30
+ line-height: 1.5em;
31
+ }
32
+
33
+ body > p {
34
+ width: 33em;
35
+ margin: 0 auto 1em;
36
+ padding: 1em 0;
37
+ background-color: #F7F7F7;
38
+ border: 1px solid #CCC;
39
+ border-right-color: #999;
40
+ border-bottom-color: #999;
41
+ border-bottom-left-radius: 4px;
42
+ border-bottom-right-radius: 4px;
43
+ border-top-color: #DADADA;
44
+ color: #666;
45
+ box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
46
+ }
47
+ </style>
17
48
  </head>
18
49
 
19
50
  <body>
20
- <!-- This file lives in public/422.html -->
21
- <div class="dialog">
51
+ <!-- This file lives in public/422.html -->
52
+ <div class="dialog">
22
53
  <h1>The change you wanted was rejected.</h1>
23
54
  <p>Maybe you tried to change something you didn't have access to.</p>
24
- </div>
55
+ </div>
56
+ <p>If you are the application owner check the logs for more information.</p>
25
57
  </body>
26
58
  </html>
data/spec/dummy/public/500.html CHANGED
@@ -1,25 +1,57 @@
1
1
  <!DOCTYPE html>
2
2
  <html>
3
3
  <head>
4
- <title>We're sorry, but something went wrong (500)</title>
5
- <style type="text/css">
6
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
7
- div.dialog {
8
- width: 25em;
9
- padding: 0 4em;
10
- margin: 4em auto 0 auto;
11
- border: 1px solid #ccc;
12
- border-right-color: #999;
13
- border-bottom-color: #999;
14
- }
15
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
16
- </style>
4
+ <title>We're sorry, but something went wrong (500)</title>
5
+ <style>
6
+ body {
7
+ background-color: #EFEFEF;
8
+ color: #2E2F30;
9
+ text-align: center;
10
+ font-family: arial, sans-serif;
11
+ }
12
+
13
+ div.dialog {
14
+ width: 25em;
15
+ margin: 4em auto 0 auto;
16
+ border: 1px solid #CCC;
17
+ border-right-color: #999;
18
+ border-left-color: #999;
19
+ border-bottom-color: #BBB;
20
+ border-top: #B00100 solid 4px;
21
+ border-top-left-radius: 9px;
22
+ border-top-right-radius: 9px;
23
+ background-color: white;
24
+ padding: 7px 4em 0 4em;
25
+ }
26
+
27
+ h1 {
28
+ font-size: 100%;
29
+ color: #730E15;
30
+ line-height: 1.5em;
31
+ }
32
+
33
+ body > p {
34
+ width: 33em;
35
+ margin: 0 auto 1em;
36
+ padding: 1em 0;
37
+ background-color: #F7F7F7;
38
+ border: 1px solid #CCC;
39
+ border-right-color: #999;
40
+ border-bottom-color: #999;
41
+ border-bottom-left-radius: 4px;
42
+ border-bottom-right-radius: 4px;
43
+ border-top-color: #DADADA;
44
+ color: #666;
45
+ box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
46
+ }
47
+ </style>
17
48
  </head>
18
49
 
19
50
  <body>
20
- <!-- This file lives in public/500.html -->
21
- <div class="dialog">
51
+ <!-- This file lives in public/500.html -->
52
+ <div class="dialog">
22
53
  <h1>We're sorry, but something went wrong.</h1>
23
- </div>
54
+ </div>
55
+ <p>If you are the application owner check the logs for more information.</p>
24
56
  </body>
25
57
  </html>
data/spec/dummy/public/robots.txt CHANGED
@@ -1,5 +1,5 @@
1
1
  # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
2
2
  #
3
3
  # To ban all spiders from the entire site uncomment the next two lines:
4
- # User-Agent: *
4
+ # User-agent: *
5
5
  # Disallow: /
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: constructor-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.8
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Zotov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-06-18 00:00:00.000000000 Z
11
+ date: 2013-06-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: constructor-core
@@ -16,42 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.5.8
19
+ version: 0.6.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.5.8
26
+ version: 0.6.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: constructor-pages
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.5.8
33
+ version: 0.6.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.5.8
41
- - !ruby/object:Gem::Dependency
42
- name: russian
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - '>='
46
- - !ruby/object:Gem::Version
47
- version: '0'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - '>='
53
- - !ruby/object:Gem::Version
54
- version: '0'
40
+ version: 0.6.0
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: sqlite3
57
43
  requirement: !ruby/object:Gem::Requirement
@@ -70,16 +56,16 @@ dependencies:
70
56
  name: rspec-rails
71
57
  requirement: !ruby/object:Gem::Requirement
72
58
  requirements:
73
- - - '>='
59
+ - - '='
74
60
  - !ruby/object:Gem::Version
75
- version: '0'
61
+ version: 2.14.0.rc1
76
62
  type: :development
77
63
  prerelease: false
78
64
  version_requirements: !ruby/object:Gem::Requirement
79
65
  requirements:
80
- - - '>='
66
+ - - '='
81
67
  - !ruby/object:Gem::Version
82
- version: '0'
68
+ version: 2.14.0.rc1
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: database_cleaner
85
71
  requirement: !ruby/object:Gem::Requirement
@@ -123,6 +109,7 @@ files:
123
109
  - LICENSE.md
124
110
  - README.md
125
111
  - Rakefile
112
+ - bin/rails
126
113
  - config.ru
127
114
  - config/routes.rb
128
115
  - constructor-cms.gemspec
@@ -406,7 +393,6 @@ files:
406
393
  - pages/spec/models/constructor_pages/page_model_spec.rb
407
394
  - pages/spec/models/constructor_pages/template_model_spec.rb
408
395
  - pages/spec/requests/constructor_pages/pages_controller_spec.rb
409
- - script/rails
410
396
  - spec/dummy/README.rdoc
411
397
  - spec/dummy/Rakefile
412
398
  - spec/dummy/app/assets/javascripts/application.js
@@ -417,6 +403,9 @@ files:
417
403
  - spec/dummy/app/models/.gitkeep
418
404
  - spec/dummy/app/views/html_templates/page.haml
419
405
  - spec/dummy/app/views/layouts/application.html.erb
406
+ - spec/dummy/bin/bundle
407
+ - spec/dummy/bin/rails
408
+ - spec/dummy/bin/rake
420
409
  - spec/dummy/config.ru
421
410
  - spec/dummy/config/application.rb
422
411
  - spec/dummy/config/boot.rb
@@ -426,6 +415,7 @@ files:
426
415
  - spec/dummy/config/environments/production.rb
427
416
  - spec/dummy/config/environments/test.rb
428
417
  - spec/dummy/config/initializers/backtrace_silencers.rb
418
+ - spec/dummy/config/initializers/filter_parameter_logging.rb
429
419
  - spec/dummy/config/initializers/inflections.rb
430
420
  - spec/dummy/config/initializers/mime_types.rb
431
421
  - spec/dummy/config/initializers/secret_token.rb
@@ -443,7 +433,6 @@ files:
443
433
  - spec/dummy/public/500.html
444
434
  - spec/dummy/public/favicon.ico
445
435
  - spec/dummy/public/robots.txt
446
- - spec/dummy/script/rails
447
436
  - spec/spec_helper.rb
448
437
  homepage: http://ivanzotov.github.com/constructor
449
438
  licenses: []
@@ -479,6 +468,9 @@ test_files:
479
468
  - spec/dummy/app/models/.gitkeep
480
469
  - spec/dummy/app/views/html_templates/page.haml
481
470
  - spec/dummy/app/views/layouts/application.html.erb
471
+ - spec/dummy/bin/bundle
472
+ - spec/dummy/bin/rails
473
+ - spec/dummy/bin/rake
482
474
  - spec/dummy/config.ru
483
475
  - spec/dummy/config/application.rb
484
476
  - spec/dummy/config/boot.rb
@@ -488,6 +480,7 @@ test_files:
488
480
  - spec/dummy/config/environments/production.rb
489
481
  - spec/dummy/config/environments/test.rb
490
482
  - spec/dummy/config/initializers/backtrace_silencers.rb
483
+ - spec/dummy/config/initializers/filter_parameter_logging.rb
491
484
  - spec/dummy/config/initializers/inflections.rb
492
485
  - spec/dummy/config/initializers/mime_types.rb
493
486
  - spec/dummy/config/initializers/secret_token.rb
@@ -505,6 +498,5 @@ test_files:
505
498
  - spec/dummy/public/500.html
506
499
  - spec/dummy/public/favicon.ico
507
500
  - spec/dummy/public/robots.txt
508
- - spec/dummy/script/rails
509
501
  - spec/spec_helper.rb
510
502
  has_rdoc:
data/spec/dummy/script/rails DELETED
@@ -1,6 +0,0 @@
1
- #!/usr/bin/env ruby
2
- # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
3
-
4
- APP_PATH = File.expand_path('../../config/application', __FILE__)
5
- require File.expand_path('../../config/boot', __FILE__)
6
- require 'rails/commands'