comfortable_mexican_sofa 1.1.2 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (50) hide show
  1. data/Gemfile +2 -6
  2. data/Gemfile.lock +3 -4
  3. data/VERSION +1 -1
  4. data/app/controllers/cms_admin/base_controller.rb +1 -1
  5. data/app/controllers/cms_admin/layouts_controller.rb +2 -2
  6. data/app/controllers/cms_admin/pages_controller.rb +2 -2
  7. data/app/controllers/cms_admin/revisions_controller.rb +57 -0
  8. data/app/controllers/cms_admin/sites_controller.rb +2 -2
  9. data/app/controllers/cms_admin/snippets_controller.rb +2 -2
  10. data/app/models/cms/layout.rb +2 -0
  11. data/app/models/cms/page.rb +29 -9
  12. data/app/models/cms/revision.rb +13 -0
  13. data/app/models/cms/snippet.rb +2 -5
  14. data/app/views/cms_admin/layouts/_form.html.erb +0 -1
  15. data/app/views/cms_admin/layouts/edit.html.erb +1 -0
  16. data/app/views/cms_admin/pages/_form.html.erb +0 -1
  17. data/app/views/cms_admin/pages/edit.html.erb +1 -0
  18. data/app/views/cms_admin/revisions/show.html.erb +36 -0
  19. data/app/views/cms_admin/sites/_form.html.erb +0 -1
  20. data/app/views/cms_admin/snippets/_form.html.erb +0 -1
  21. data/app/views/cms_admin/snippets/edit.html.erb +1 -0
  22. data/app/views/layouts/cms_admin/_body.html.erb +4 -0
  23. data/app/views/layouts/cms_admin/_left.html.erb +9 -7
  24. data/comfortable_mexican_sofa.gemspec +19 -12
  25. data/config/initializers/comfortable_mexican_sofa.rb +5 -0
  26. data/config/routes.rb +13 -2
  27. data/db/migrate/01_create_cms.rb +11 -0
  28. data/db/migrate/upgrades/03_upgrade_to_1_2_0.rb +15 -0
  29. data/lib/comfortable_mexican_sofa.rb +3 -1
  30. data/lib/comfortable_mexican_sofa/configuration.rb +4 -0
  31. data/lib/comfortable_mexican_sofa/form_builder.rb +0 -1
  32. data/lib/comfortable_mexican_sofa/has_revisions.rb +64 -0
  33. data/lib/comfortable_mexican_sofa/http_auth.rb +1 -0
  34. data/lib/comfortable_mexican_sofa/version.rb +7 -0
  35. data/public/stylesheets/comfortable_mexican_sofa/content.css +42 -0
  36. data/public/stylesheets/comfortable_mexican_sofa/structure.css +31 -6
  37. data/public/stylesheets/comfortable_mexican_sofa/typography.css +8 -0
  38. data/test/fixtures/cms/revisions.yml +21 -0
  39. data/test/functional/cms_admin/layouts_controller_test.rb +2 -31
  40. data/test/functional/cms_admin/pages_controller_test.rb +7 -48
  41. data/test/functional/cms_admin/revisions_controller_test.rb +135 -0
  42. data/test/functional/cms_admin/sites_controller_test.rb +4 -29
  43. data/test/functional/cms_admin/snippets_controller_test.rb +2 -31
  44. data/test/test_helper.rb +1 -0
  45. data/test/unit/configuration_test.rb +5 -0
  46. data/test/unit/models/page_test.rb +0 -1
  47. data/test/unit/models/snippet_test.rb +0 -5
  48. data/test/unit/revisions_test.rb +185 -0
  49. metadata +18 -19
  50. data/config/initializers/mime_types.rb +0 -5
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: comfortable_mexican_sofa
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.1.2
5
+ version: 1.2.0
6
6
  platform: ruby
7
7
  authors:
8
8
  - Oleg Khabarov
@@ -11,7 +11,7 @@ autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
13
 
14
- date: 2011-05-05 00:00:00 Z
14
+ date: 2011-05-10 00:00:00 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
@@ -20,7 +20,7 @@ dependencies:
20
20
  requirements:
21
21
  - - ">="
22
22
  - !ruby/object:Gem::Version
23
- version: 3.0.3
23
+ version: 3.0.0
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: *id001
@@ -31,7 +31,7 @@ dependencies:
31
31
  requirements:
32
32
  - - ">="
33
33
  - !ruby/object:Gem::Version
34
- version: 0.0.6
34
+ version: 0.0.7
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: *id002
@@ -46,20 +46,9 @@ dependencies:
46
46
  type: :runtime
47
47
  prerelease: false
48
48
  version_requirements: *id003
49
- - !ruby/object:Gem::Dependency
50
- name: mime-types
51
- requirement: &id004 !ruby/object:Gem::Requirement
52
- none: false
53
- requirements:
54
- - - ">="
55
- - !ruby/object:Gem::Version
56
- version: "0"
57
- type: :runtime
58
- prerelease: false
59
- version_requirements: *id004
60
49
  - !ruby/object:Gem::Dependency
61
50
  name: sqlite3
62
- requirement: &id005 !ruby/object:Gem::Requirement
51
+ requirement: &id004 !ruby/object:Gem::Requirement
63
52
  none: false
64
53
  requirements:
65
54
  - - ">="
@@ -67,7 +56,7 @@ dependencies:
67
56
  version: "0"
68
57
  type: :development
69
58
  prerelease: false
70
- version_requirements: *id005
59
+ version_requirements: *id004
71
60
  description: ""
72
61
  email: oleg@theworkinggroup.ca
73
62
  executables: []
@@ -89,6 +78,7 @@ files:
89
78
  - app/controllers/cms_admin/base_controller.rb
90
79
  - app/controllers/cms_admin/layouts_controller.rb
91
80
  - app/controllers/cms_admin/pages_controller.rb
81
+ - app/controllers/cms_admin/revisions_controller.rb
92
82
  - app/controllers/cms_admin/sites_controller.rb
93
83
  - app/controllers/cms_admin/snippets_controller.rb
94
84
  - app/controllers/cms_admin/uploads_controller.rb
@@ -96,6 +86,7 @@ files:
96
86
  - app/models/cms/block.rb
97
87
  - app/models/cms/layout.rb
98
88
  - app/models/cms/page.rb
89
+ - app/models/cms/revision.rb
99
90
  - app/models/cms/site.rb
100
91
  - app/models/cms/snippet.rb
101
92
  - app/models/cms/upload.rb
@@ -112,6 +103,7 @@ files:
112
103
  - app/views/cms_admin/pages/index.html.erb
113
104
  - app/views/cms_admin/pages/new.html.erb
114
105
  - app/views/cms_admin/pages/toggle_branch.js.erb
106
+ - app/views/cms_admin/revisions/show.html.erb
115
107
  - app/views/cms_admin/sites/_form.html.erb
116
108
  - app/views/cms_admin/sites/edit.html.erb
117
109
  - app/views/cms_admin/sites/index.html.erb
@@ -139,7 +131,6 @@ files:
139
131
  - config/environments/production.rb
140
132
  - config/environments/test.rb
141
133
  - config/initializers/comfortable_mexican_sofa.rb
142
- - config/initializers/mime_types.rb
143
134
  - config/initializers/paperclip.rb
144
135
  - config/locales/en.yml
145
136
  - config/routes.rb
@@ -160,6 +151,7 @@ files:
160
151
  - db/cms_fixtures/example.com/snippets/default/content.html
161
152
  - db/migrate/01_create_cms.rb
162
153
  - db/migrate/upgrades/02_upgrade_to_1_1_0.rb
154
+ - db/migrate/upgrades/03_upgrade_to_1_2_0.rb
163
155
  - db/seeds.rb
164
156
  - doc/page_editing.png
165
157
  - doc/sofa.png
@@ -170,6 +162,7 @@ files:
170
162
  - lib/comfortable_mexican_sofa/engine.rb
171
163
  - lib/comfortable_mexican_sofa/fixtures.rb
172
164
  - lib/comfortable_mexican_sofa/form_builder.rb
165
+ - lib/comfortable_mexican_sofa/has_revisions.rb
173
166
  - lib/comfortable_mexican_sofa/http_auth.rb
174
167
  - lib/comfortable_mexican_sofa/rails_extensions.rb
175
168
  - lib/comfortable_mexican_sofa/tag.rb
@@ -185,6 +178,7 @@ files:
185
178
  - lib/comfortable_mexican_sofa/tags/page_text.rb
186
179
  - lib/comfortable_mexican_sofa/tags/partial.rb
187
180
  - lib/comfortable_mexican_sofa/tags/snippet.rb
181
+ - lib/comfortable_mexican_sofa/version.rb
188
182
  - lib/comfortable_mexican_sofa/view_hooks.rb
189
183
  - lib/comfortable_mexican_sofa/view_methods.rb
190
184
  - lib/generators/README
@@ -270,6 +264,7 @@ files:
270
264
  - test/fixtures/cms/blocks.yml
271
265
  - test/fixtures/cms/layouts.yml
272
266
  - test/fixtures/cms/pages.yml
267
+ - test/fixtures/cms/revisions.yml
273
268
  - test/fixtures/cms/sites.yml
274
269
  - test/fixtures/cms/snippets.yml
275
270
  - test/fixtures/cms/uploads.yml
@@ -279,6 +274,7 @@ files:
279
274
  - test/fixtures/views/_nav_hook_2.html.erb
280
275
  - test/functional/cms_admin/layouts_controller_test.rb
281
276
  - test/functional/cms_admin/pages_controller_test.rb
277
+ - test/functional/cms_admin/revisions_controller_test.rb
282
278
  - test/functional/cms_admin/sites_controller_test.rb
283
279
  - test/functional/cms_admin/snippets_controller_test.rb
284
280
  - test/functional/cms_admin/uploads_controller_test.rb
@@ -298,6 +294,7 @@ files:
298
294
  - test/unit/models/site_test.rb
299
295
  - test/unit/models/snippet_test.rb
300
296
  - test/unit/models/upload_test.rb
297
+ - test/unit/revisions_test.rb
301
298
  - test/unit/tag_test.rb
302
299
  - test/unit/tags/field_datetime_test.rb
303
300
  - test/unit/tags/field_integer_test.rb
@@ -325,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
325
322
  requirements:
326
323
  - - ">="
327
324
  - !ruby/object:Gem::Version
328
- hash: 4034917359107191682
325
+ hash: 3455940093554441845
329
326
  segments:
330
327
  - 0
331
328
  version: "0"
@@ -345,6 +342,7 @@ summary: ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 appl
345
342
  test_files:
346
343
  - test/functional/cms_admin/layouts_controller_test.rb
347
344
  - test/functional/cms_admin/pages_controller_test.rb
345
+ - test/functional/cms_admin/revisions_controller_test.rb
348
346
  - test/functional/cms_admin/sites_controller_test.rb
349
347
  - test/functional/cms_admin/snippets_controller_test.rb
350
348
  - test/functional/cms_admin/uploads_controller_test.rb
@@ -364,6 +362,7 @@ test_files:
364
362
  - test/unit/models/site_test.rb
365
363
  - test/unit/models/snippet_test.rb
366
364
  - test/unit/models/upload_test.rb
365
+ - test/unit/revisions_test.rb
367
366
  - test/unit/tag_test.rb
368
367
  - test/unit/tags/field_datetime_test.rb
369
368
  - test/unit/tags/field_integer_test.rb
@@ -1,5 +0,0 @@
1
- # Be sure to restart your server when you modify this file.
2
-
3
- # Add new mime types for use in respond_to blocks:
4
- # Mime::Type.register "text/richtext", :rtf
5
- # Mime::Type.register_alias "text/html", :iphone