comfortable_mexican_sofa 1.12.11 → 2.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.codeclimate.yml +4 -0
- data/.gitattributes +2 -0
- data/.github/issue_template.md +22 -0
- data/.github/pull_request_template.md +6 -0
- data/.gitignore +3 -0
- data/.rubocop.yml +5 -0
- data/.rubocop_todo.yml +974 -0
- data/.travis.yml +2 -10
- data/Gemfile +5 -7
- data/README.md +40 -39
- data/Rakefile +1 -31
- data/app/assets/javascripts/comfy/admin/cms/application.js.coffee +7 -4
- data/app/assets/javascripts/comfy/admin/cms/base.js.coffee +23 -33
- data/app/assets/javascripts/comfy/admin/cms/lib/diff/pretty_text_diff.js +76 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr.min.js +2 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ar.js +52 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/bg.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/bn.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/cat.js +83 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/cs.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/cy.js +92 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/da.js +71 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/de.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/default.js +80 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/eo.js +73 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/es.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/et.js +73 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/fa.js +68 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/fi.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/fr.js +75 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/gr.js +74 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/he.js +57 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/hi.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/hr.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/hu.js +72 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/id.js +61 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/it.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ja.js +57 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ko.js +60 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/lt.js +72 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/lv.js +67 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/mk.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/mn.js +67 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ms.js +68 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/my.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/nl.js +75 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/no.js +73 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/pa.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/pl.js +68 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/pt-BR.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/pt.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ro.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/ru.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/si.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sk.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sl.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sq.js +65 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sr.js +69 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/sv.js +70 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/th.js +72 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/tr.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/uk.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/vn.js +66 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/zh-CN.js +61 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/zh-TW.js +61 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/redactor.js +9 -3
- data/app/assets/javascripts/comfy/admin/cms/uploader.js.coffee +9 -10
- data/app/assets/stylesheets/comfy/admin/cms/application.sass +4 -4
- data/app/assets/stylesheets/comfy/admin/cms/base.sass +215 -338
- data/app/assets/stylesheets/comfy/admin/cms/lib/flatpickr.min.css +13 -0
- data/app/assets/stylesheets/comfy/admin/cms/redactor_overrides.sass +2 -2
- data/app/controllers/comfy/admin/base_controller.rb +20 -0
- data/app/controllers/comfy/admin/cms/base_controller.rb +9 -22
- data/app/controllers/comfy/admin/cms/categories_controller.rb +2 -3
- data/app/controllers/comfy/admin/cms/files_controller.rb +50 -31
- data/app/controllers/comfy/admin/cms/layouts_controller.rb +12 -13
- data/app/controllers/comfy/admin/cms/pages_controller.rb +28 -28
- data/app/controllers/comfy/admin/cms/revisions_controller.rb +23 -14
- data/app/controllers/comfy/admin/cms/sites_controller.rb +9 -10
- data/app/controllers/comfy/admin/cms/snippets_controller.rb +11 -11
- data/app/controllers/comfy/admin/cms/translations_controller.rb +98 -0
- data/app/controllers/comfy/cms/assets_controller.rb +9 -10
- data/app/controllers/comfy/cms/base_controller.rb +0 -2
- data/app/controllers/comfy/cms/content_controller.rb +50 -31
- data/app/controllers/concerns/comfy/paginate.rb +2 -2
- data/app/helpers/comfy/admin/cms_helper.rb +29 -0
- data/app/helpers/comfy/cms_helper.rb +40 -60
- data/app/models/comfy/cms/categorization.rb +8 -11
- data/app/models/comfy/cms/category.rb +10 -14
- data/app/models/comfy/cms/file.rb +31 -47
- data/app/models/comfy/cms/fragment.rb +55 -0
- data/app/models/comfy/cms/layout.rb +45 -40
- data/app/models/comfy/cms/page.rb +47 -36
- data/app/models/comfy/cms/revision.rb +5 -8
- data/app/models/comfy/cms/site.rb +26 -51
- data/app/models/comfy/cms/snippet.rb +20 -24
- data/app/models/comfy/cms/translation.rb +37 -0
- data/app/models/concerns/comfy/cms/with_categories.rb +38 -0
- data/app/models/concerns/comfy/cms/with_fragments.rb +121 -0
- data/app/views/comfy/admin/cms/categories/_categories.html.haml +2 -1
- data/app/views/comfy/admin/cms/categories/_edit.html.haml +7 -6
- data/app/views/comfy/admin/cms/categories/_form.html.haml +8 -5
- data/app/views/comfy/admin/cms/categories/_index.html.haml +24 -20
- data/app/views/comfy/admin/cms/categories/_show.html.haml +10 -9
- data/app/views/comfy/admin/cms/categories/create.js.erb +2 -2
- data/app/views/comfy/admin/cms/categories/edit.js.erb +1 -1
- data/app/views/comfy/admin/cms/categories/update.js.erb +2 -2
- data/app/views/comfy/admin/cms/files/_file.html.haml +31 -25
- data/app/views/comfy/admin/cms/files/_form.html.haml +16 -12
- data/app/views/comfy/admin/cms/files/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/files/index.html.haml +17 -19
- data/app/views/comfy/admin/cms/files/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/layouts/_form.html.haml +10 -10
- data/app/views/comfy/admin/cms/layouts/_index_branch.html.haml +21 -19
- data/app/views/comfy/admin/cms/layouts/edit.html.haml +5 -5
- data/app/views/comfy/admin/cms/layouts/index.html.haml +4 -7
- data/app/views/comfy/admin/cms/pages/_form.html.haml +15 -21
- data/app/views/comfy/admin/cms/pages/_form_fragments.html.haml +40 -0
- data/app/views/comfy/admin/cms/pages/_fragment_attachments.html.haml +10 -0
- data/app/views/comfy/admin/cms/pages/_index_branch.html.haml +34 -26
- data/app/views/comfy/admin/cms/pages/edit.html.haml +19 -5
- data/app/views/comfy/admin/cms/pages/form_fragments.js.erb +1 -0
- data/app/views/comfy/admin/cms/pages/index.html.haml +5 -8
- data/app/views/comfy/admin/cms/pages/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/revisions/show.html.haml +29 -27
- data/app/views/comfy/admin/cms/sites/_form.html.haml +6 -8
- data/app/views/comfy/admin/cms/sites/edit.html.haml +1 -1
- data/app/views/comfy/admin/cms/sites/index.html.haml +23 -22
- data/app/views/comfy/admin/cms/sites/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/snippets/_form.html.haml +9 -9
- data/app/views/comfy/admin/cms/snippets/edit.html.haml +6 -5
- data/app/views/comfy/admin/cms/snippets/index.html.haml +25 -25
- data/app/views/comfy/admin/cms/snippets/new.html.haml +1 -1
- data/app/views/comfy/admin/cms/translations/_form.html.haml +21 -0
- data/app/views/comfy/admin/cms/translations/edit.html.haml +9 -0
- data/app/views/comfy/admin/cms/translations/form_fragments.js.erb +1 -0
- data/app/views/comfy/admin/cms/translations/new.html.haml +5 -0
- data/app/views/kaminari/comfy/_first_page.html.haml +3 -2
- data/app/views/kaminari/comfy/_gap.html.haml +2 -2
- data/app/views/kaminari/comfy/_last_page.html.haml +3 -2
- data/app/views/kaminari/comfy/_next_page.html.haml +2 -2
- data/app/views/kaminari/comfy/_page.html.haml +2 -2
- data/app/views/kaminari/comfy/_prev_page.html.haml +1 -1
- data/app/views/layouts/comfy/admin/cms/_body.html.haml +13 -15
- data/app/views/layouts/comfy/admin/cms/_footer_js.html.haml +10 -3
- data/app/views/layouts/comfy/admin/cms/_head.html.haml +7 -10
- data/app/views/layouts/comfy/admin/cms/_left.html.haml +33 -15
- data/app/views/layouts/comfy/admin/cms/_right.html.haml +2 -2
- data/comfortable_mexican_sofa.gemspec +19 -19
- data/config/application.rb +14 -8
- data/config/boot.rb +2 -2
- data/config/cms_routes.rb +3 -3
- data/config/environments/development.rb +37 -4
- data/config/environments/test.rb +12 -14
- data/config/initializers/comfortable_mexican_sofa.rb +5 -12
- data/config/locales/cs.yml +33 -7
- data/config/locales/da.yml +33 -7
- data/config/locales/de.yml +32 -6
- data/config/locales/en.yml +33 -7
- data/config/locales/es.yml +33 -7
- data/config/locales/fr.yml +33 -7
- data/config/locales/it.yml +33 -7
- data/config/locales/ja.yml +33 -7
- data/config/locales/nb.yml +33 -7
- data/config/locales/nl.yml +33 -7
- data/config/locales/pl.yml +33 -7
- data/config/locales/pt-BR.yml +33 -7
- data/config/locales/ru.yml +33 -7
- data/config/locales/sk.yml +33 -7
- data/config/locales/sv.yml +33 -7
- data/config/locales/tr.yml +33 -7
- data/config/locales/uk.yml +33 -7
- data/config/locales/zh-CN.yml +33 -7
- data/config/locales/zh-TW.yml +33 -7
- data/config/storage.yml +35 -0
- data/db/cms_seeds/sample-site/files/_default.jpg.yml +5 -0
- data/db/{cms_fixtures/sample-site/files/sample.jpg → cms_seeds/sample-site/files/default.jpg} +0 -0
- data/db/cms_seeds/sample-site/layouts/default/content.html +16 -0
- data/db/cms_seeds/sample-site/layouts/default/nested/content.html +14 -0
- data/db/cms_seeds/sample-site/pages/index/child_a/content.html +7 -0
- data/db/cms_seeds/sample-site/pages/index/child_b/content.html +6 -0
- data/db/cms_seeds/sample-site/pages/index/content.es.html +6 -0
- data/db/cms_seeds/sample-site/pages/index/content.fr.html +6 -0
- data/db/cms_seeds/sample-site/pages/index/content.html +24 -0
- data/db/{cms_fixtures/sample-site/pages/index/child/thumbnail.png → cms_seeds/sample-site/pages/index/footer.png} +0 -0
- data/db/cms_seeds/sample-site/pages/index/header.png +0 -0
- data/db/cms_seeds/sample-site/snippets/default.html +8 -0
- data/db/migrate/00_create_active_storage_tables.active_storage.rb +26 -0
- data/db/migrate/01_create_cms.rb +113 -104
- data/doc/preview.jpg +0 -0
- data/lib/comfortable_mexican_sofa.rb +10 -14
- data/lib/comfortable_mexican_sofa/configuration.rb +9 -13
- data/lib/comfortable_mexican_sofa/content.rb +28 -0
- data/lib/comfortable_mexican_sofa/content/block.rb +11 -0
- data/lib/comfortable_mexican_sofa/content/params_parser.rb +80 -0
- data/lib/comfortable_mexican_sofa/content/renderer.rb +125 -0
- data/lib/comfortable_mexican_sofa/content/tag.rb +37 -0
- data/lib/comfortable_mexican_sofa/content/tags/asset.rb +56 -0
- data/lib/comfortable_mexican_sofa/content/tags/checkbox.rb +21 -0
- data/lib/comfortable_mexican_sofa/content/tags/date.rb +22 -0
- data/lib/comfortable_mexican_sofa/content/tags/datetime.rb +22 -0
- data/lib/comfortable_mexican_sofa/content/tags/file.rb +77 -0
- data/lib/comfortable_mexican_sofa/content/tags/file_link.rb +66 -0
- data/lib/comfortable_mexican_sofa/content/tags/files.rb +39 -0
- data/lib/comfortable_mexican_sofa/content/tags/fragment.rb +54 -0
- data/lib/comfortable_mexican_sofa/content/tags/helper.rb +52 -0
- data/lib/comfortable_mexican_sofa/content/tags/markdown.rb +21 -0
- data/lib/comfortable_mexican_sofa/content/tags/number.rb +17 -0
- data/lib/comfortable_mexican_sofa/content/tags/partial.rb +42 -0
- data/lib/comfortable_mexican_sofa/content/tags/snippet.rb +31 -0
- data/lib/comfortable_mexican_sofa/content/tags/template.rb +41 -0
- data/lib/comfortable_mexican_sofa/content/tags/text.rb +17 -0
- data/lib/comfortable_mexican_sofa/content/tags/textarea.rb +17 -0
- data/lib/comfortable_mexican_sofa/content/tags/wysiwyg.rb +18 -0
- data/lib/comfortable_mexican_sofa/engine.rb +3 -2
- data/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb +33 -30
- data/lib/comfortable_mexican_sofa/extensions/has_revisions.rb +27 -23
- data/lib/comfortable_mexican_sofa/form_builder.rb +32 -104
- data/lib/comfortable_mexican_sofa/render_methods.rb +24 -21
- data/lib/comfortable_mexican_sofa/routes/cms.rb +6 -14
- data/lib/comfortable_mexican_sofa/routes/cms_admin.rb +39 -29
- data/lib/comfortable_mexican_sofa/routing.rb +1 -1
- data/lib/comfortable_mexican_sofa/seeds.rb +102 -0
- data/lib/comfortable_mexican_sofa/seeds/file/exporter.rb +40 -0
- data/lib/comfortable_mexican_sofa/seeds/file/importer.rb +61 -0
- data/lib/comfortable_mexican_sofa/seeds/layout/exporter.rb +37 -0
- data/lib/comfortable_mexican_sofa/seeds/layout/importer.rb +59 -0
- data/lib/comfortable_mexican_sofa/seeds/page/exporter.rb +88 -0
- data/lib/comfortable_mexican_sofa/seeds/page/importer.rb +213 -0
- data/lib/comfortable_mexican_sofa/seeds/snippet/exporter.rb +31 -0
- data/lib/comfortable_mexican_sofa/seeds/snippet/importer.rb +48 -0
- data/lib/comfortable_mexican_sofa/version.rb +1 -1
- data/lib/comfortable_mexican_sofa/view_hooks.rb +0 -1
- data/lib/generators/comfy/cms/assets_generator.rb +0 -1
- data/lib/generators/comfy/cms/cms_generator.rb +15 -5
- data/lib/generators/comfy/scaffold/scaffold_generator.rb +26 -20
- data/lib/generators/comfy/scaffold/templates/{controller.rb → controller.rb.tt} +10 -10
- data/lib/generators/comfy/scaffold/templates/{migration.rb → migration.rb.tt} +2 -3
- data/lib/generators/comfy/scaffold/templates/{model.rb → model.rb.tt} +7 -7
- data/lib/generators/comfy/scaffold/templates/tests/{controller.rb → controller.rb.tt} +37 -24
- data/lib/generators/comfy/scaffold/templates/tests/{fixture.yml → fixture.yml.tt} +0 -0
- data/lib/generators/comfy/scaffold/templates/tests/{model.rb → model.rb.tt} +3 -4
- data/lib/generators/comfy/scaffold/templates/views/_form.haml.tt +7 -0
- data/lib/generators/comfy/scaffold/templates/views/{edit.haml → edit.haml.tt} +1 -1
- data/lib/generators/comfy/scaffold/templates/views/index.haml.tt +21 -0
- data/lib/generators/comfy/scaffold/templates/views/{new.haml → new.haml.tt} +1 -1
- data/lib/generators/comfy/scaffold/templates/views/{show.haml → show.haml.tt} +2 -2
- data/lib/tasks/cms_seeds.rake +37 -0
- data/test/controllers/comfy/admin/cms/base_controller_test.rb +5 -6
- data/test/controllers/comfy/admin/cms/categories_controller_test.rb +27 -24
- data/test/controllers/comfy/admin/cms/files_controller_test.rb +97 -97
- data/test/controllers/comfy/admin/cms/layouts_controller_test.rb +32 -31
- data/test/controllers/comfy/admin/cms/pages_controller_test.rb +317 -263
- data/test/controllers/comfy/admin/cms/revisions_controller_test.rb +175 -65
- data/test/controllers/comfy/admin/cms/sites_controller_test.rb +27 -29
- data/test/controllers/comfy/admin/cms/snippets_controller_test.rb +54 -51
- data/test/controllers/comfy/admin/cms/translations_controller_test.rb +181 -0
- data/test/controllers/comfy/cms/assets_controller_test.rb +24 -22
- data/test/controllers/comfy/cms/content_controller_test.rb +126 -140
- data/test/fixtures/active_storage/attachments.yml +9 -0
- data/test/fixtures/active_storage/blobs.yml +13 -0
- data/test/fixtures/comfy/cms/files.yml +2 -6
- data/test/fixtures/comfy/cms/fragments.yml +25 -0
- data/test/fixtures/comfy/cms/layouts.yml +7 -13
- data/test/fixtures/comfy/cms/pages.yml +2 -17
- data/test/fixtures/comfy/cms/revisions.yml +16 -8
- data/test/fixtures/comfy/cms/sites.yml +0 -1
- data/test/fixtures/comfy/cms/snippets.yml +1 -1
- data/test/fixtures/comfy/cms/translations.yml +7 -0
- data/test/fixtures/generators/cms/application.rb +7 -0
- data/test/fixtures/generators/cms/routes.rb +4 -7
- data/test/fixtures/generators/scaffold/controller.rb +10 -10
- data/test/fixtures/generators/scaffold/migration.rb +2 -3
- data/test/fixtures/generators/scaffold/model.rb +7 -7
- data/test/fixtures/generators/scaffold/routes.rb +1 -2
- data/test/fixtures/generators/scaffold/tests/controller.rb +37 -24
- data/test/fixtures/generators/scaffold/tests/model.rb +3 -4
- data/test/fixtures/generators/scaffold/views/_form.haml +3 -2
- data/test/fixtures/generators/scaffold/views/edit.haml +1 -1
- data/test/fixtures/generators/scaffold/views/index.haml +15 -13
- data/test/fixtures/generators/scaffold/views/new.haml +1 -1
- data/test/fixtures/generators/scaffold/views/show.haml +2 -2
- data/test/gemfiles/Gemfile.rails.5.2 +32 -0
- data/test/generators/cms_assets_generator_test.rb +1 -2
- data/test/generators/cms_generator_test.rb +3 -1
- data/test/generators/cms_views_generator_test.rb +1 -1
- data/test/generators/scaffold_generator_test.rb +2 -2
- data/test/helpers/cms_helper_test.rb +52 -73
- data/test/integration/access_control_test.rb +35 -28
- data/test/integration/js_variables_test.rb +1 -2
- data/test/integration/render_cms_test.rb +37 -37
- data/test/integration/routing_test.rb +4 -5
- data/test/integration/seeds_test.rb +76 -0
- data/test/integration/sites_test.rb +35 -49
- data/test/integration/view_hooks_test.rb +12 -13
- data/test/lib/configuration_test.rb +3 -4
- data/test/lib/content/block_test.rb +26 -0
- data/test/lib/content/params_parser_test.rb +125 -0
- data/test/lib/content/renderer_test.rb +240 -0
- data/test/lib/content/tag_test.rb +48 -0
- data/test/lib/content/tags/asset_test.rb +79 -0
- data/test/lib/content/tags/checkbox_test.rb +20 -0
- data/test/lib/content/tags/date_test.rb +20 -0
- data/test/lib/content/tags/datetime_test.rb +20 -0
- data/test/lib/content/tags/file_link_test.rb +78 -0
- data/test/lib/content/tags/file_test.rb +60 -0
- data/test/lib/content/tags/files_test.rb +49 -0
- data/test/lib/content/tags/fragment_test.rb +63 -0
- data/test/lib/content/tags/helper_test.rb +52 -0
- data/test/lib/content/tags/markdown_test.rb +33 -0
- data/test/lib/content/tags/number_test.rb +13 -0
- data/test/lib/content/tags/partial_test.rb +43 -0
- data/test/lib/content/tags/snippet_test.rb +36 -0
- data/test/lib/content/tags/template_test.rb +35 -0
- data/test/lib/content/tags/text_test.rb +13 -0
- data/test/lib/content/tags/textarea_test.rb +13 -0
- data/test/lib/content/tags/wysiwyg_test.rb +13 -0
- data/test/lib/revisions_test.rb +146 -111
- data/test/lib/seeds/files_test.rb +96 -0
- data/test/lib/seeds/layouts_test.rb +155 -0
- data/test/lib/seeds/pages_test.rb +227 -0
- data/test/lib/seeds/snippets_test.rb +98 -0
- data/test/lib/seeds_test.rb +50 -0
- data/test/models/categorization_test.rb +37 -38
- data/test/models/category_test.rb +14 -14
- data/test/models/file_test.rb +23 -96
- data/test/models/fragment_test.rb +131 -0
- data/test/models/layout_test.rb +105 -74
- data/test/models/page_test.rb +352 -97
- data/test/models/site_test.rb +101 -90
- data/test/models/snippet_test.rb +29 -23
- data/test/models/translation_test.rb +60 -0
- data/test/tasks/cms_seeds_test.rb +33 -0
- data/test/test_helper.rb +49 -32
- metadata +235 -210
- data/_config.yml +0 -1
- data/app/assets/images/comfy/admin/cms/arrow_bottom.gif +0 -0
- data/app/assets/images/comfy/admin/cms/arrow_right.gif +0 -0
- data/app/assets/images/comfy/admin/cms/checkerboard.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_draft.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_file.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_layout.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_move.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_page.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_site.gif +0 -0
- data/app/assets/images/comfy/admin/cms/icon_snippet.gif +0 -0
- data/app/assets/javascripts/comfy/admin/cms/lib/bootstrap-datetimepicker.js +0 -29
- data/app/assets/javascripts/comfy/admin/cms/lib/diff.js.coffee +0 -9
- data/app/assets/javascripts/comfy/admin/cms/lib/diff/pretty_text_diff.min.js +0 -5
- data/app/assets/stylesheets/comfy/admin/cms/bootstrap_overrides.sass +0 -32
- data/app/assets/stylesheets/comfy/admin/cms/lib/bootstrap-datetimepicker.css +0 -9
- data/app/models/comfy/cms/block.rb +0 -63
- data/app/views/comfy/admin/cms/files/_page_form.html.haml +0 -10
- data/app/views/comfy/admin/cms/pages/_form_blocks.html.haml +0 -32
- data/app/views/comfy/admin/cms/pages/form_blocks.js.erb +0 -1
- data/app/views/comfy/admin/cms/partials/_body_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_file_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_file_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_files_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_files_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_html_footer.html.haml +0 -2
- data/app/views/comfy/admin/cms/partials/_html_head.html.haml +0 -2
- data/app/views/comfy/admin/cms/partials/_layout_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_layout_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_layouts_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_layouts_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_navigation_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_navigation_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_navigation_inner.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_page_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_page_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_page_form_inner.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_pages_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_pages_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_right_column_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_right_column_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_site_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_site_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_sites_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_sites_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_snippet_form_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_snippet_form_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_snippets_after.html.haml +0 -3
- data/app/views/comfy/admin/cms/partials/_snippets_before.html.haml +0 -3
- data/app/views/comfy/admin/cms/sites/_mirrors.html.haml +0 -18
- data/app/views/comfy/cms/content/render_sitemap.xml.builder +0 -14
- data/app/views/layouts/comfy/admin/cms/_footer.html.haml +0 -3
- data/config/initializers/paperclip.rb +0 -3
- data/config/initializers/secret_token.rb +0 -15
- data/db/cms_fixtures/sample-site/categories/files.yml +0 -1
- data/db/cms_fixtures/sample-site/categories/pages.yml +0 -1
- data/db/cms_fixtures/sample-site/categories/snippets.yml +0 -1
- data/db/cms_fixtures/sample-site/files/_sample.jpg.yml +0 -5
- data/db/cms_fixtures/sample-site/layouts/default/attributes.yml +0 -1
- data/db/cms_fixtures/sample-site/layouts/default/content.html +0 -5
- data/db/cms_fixtures/sample-site/layouts/default/javascript.js +0 -1
- data/db/cms_fixtures/sample-site/layouts/default/nested/attributes.yml +0 -2
- data/db/cms_fixtures/sample-site/layouts/default/nested/content.haml +0 -3
- data/db/cms_fixtures/sample-site/layouts/default/nested/javascript.js +0 -1
- data/db/cms_fixtures/sample-site/layouts/default/nested/stylesheet.css +0 -1
- data/db/cms_fixtures/sample-site/layouts/default/stylesheet.css +0 -1
- data/db/cms_fixtures/sample-site/pages/index/attributes.yml +0 -6
- data/db/cms_fixtures/sample-site/pages/index/child/attributes.yml +0 -3
- data/db/cms_fixtures/sample-site/pages/index/child/left.haml +0 -1
- data/db/cms_fixtures/sample-site/pages/index/child/right.html +0 -1
- data/db/cms_fixtures/sample-site/pages/index/content.html +0 -2
- data/db/cms_fixtures/sample-site/snippets/default/attributes.yml +0 -4
- data/db/cms_fixtures/sample-site/snippets/default/content.html +0 -1
- data/db/seeds.rb +0 -7
- data/db/upgrade_migrations/02_upgrade_to_1_1_0.rb +0 -19
- data/db/upgrade_migrations/03_upgrade_to_1_2_0.rb +0 -15
- data/db/upgrade_migrations/04_upgrade_to_1_3_0.rb +0 -23
- data/db/upgrade_migrations/05_upgrade_to_1_4_0.rb +0 -33
- data/db/upgrade_migrations/06_upgrade_to_1_5_0.rb +0 -21
- data/db/upgrade_migrations/07_upgrade_to_1_6_0.rb +0 -25
- data/db/upgrade_migrations/08_upgrade_to_1_12_0.rb +0 -83
- data/doc/preview.png +0 -0
- data/lib/comfortable_mexican_sofa/extensions/cms_manageable.rb +0 -106
- data/lib/comfortable_mexican_sofa/extensions/is_categorized.rb +0 -49
- data/lib/comfortable_mexican_sofa/extensions/is_mirrored.rb +0 -86
- data/lib/comfortable_mexican_sofa/extensions/rails.rb +0 -17
- data/lib/comfortable_mexican_sofa/fixture.rb +0 -82
- data/lib/comfortable_mexican_sofa/fixture/category.rb +0 -42
- data/lib/comfortable_mexican_sofa/fixture/file.rb +0 -85
- data/lib/comfortable_mexican_sofa/fixture/layout.rb +0 -95
- data/lib/comfortable_mexican_sofa/fixture/page.rb +0 -129
- data/lib/comfortable_mexican_sofa/fixture/snippet.rb +0 -75
- data/lib/comfortable_mexican_sofa/tag.rb +0 -154
- data/lib/comfortable_mexican_sofa/tags/asset.rb +0 -30
- data/lib/comfortable_mexican_sofa/tags/collection.rb +0 -64
- data/lib/comfortable_mexican_sofa/tags/field_boolean.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_datetime.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_integer.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_rich_text.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_string.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/field_text.rb +0 -17
- data/lib/comfortable_mexican_sofa/tags/file.rb +0 -29
- data/lib/comfortable_mexican_sofa/tags/helper.rb +0 -24
- data/lib/comfortable_mexican_sofa/tags/page_datetime.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/page_file.rb +0 -62
- data/lib/comfortable_mexican_sofa/tags/page_files.rb +0 -51
- data/lib/comfortable_mexican_sofa/tags/page_integer.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/page_markdown.rb +0 -16
- data/lib/comfortable_mexican_sofa/tags/page_rich_text.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/page_string.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/page_text.rb +0 -13
- data/lib/comfortable_mexican_sofa/tags/partial.rb +0 -23
- data/lib/comfortable_mexican_sofa/tags/snippet.rb +0 -19
- data/lib/comfortable_mexican_sofa/tags/template.rb +0 -22
- data/lib/generators/comfy/scaffold/templates/views/_form.haml +0 -6
- data/lib/generators/comfy/scaffold/templates/views/index.haml +0 -23
- data/lib/tasks/comfortable_mexican_sofa.rake +0 -37
- data/test/fixtures/comfy/cms/blocks.yml +0 -12
- data/test/gemfiles/Gemfile.rails.4.1 +0 -22
- data/test/gemfiles/Gemfile.rails.4.2 +0 -22
- data/test/gemfiles/Gemfile.rails.5.0 +0 -23
- data/test/gemfiles/Gemfile.rails.master +0 -23
- data/test/integration/fixtures_test.rb +0 -65
- data/test/integration/mirrors_test.rb +0 -72
- data/test/lib/fixtures/categories_test.rb +0 -36
- data/test/lib/fixtures/files_test.rb +0 -109
- data/test/lib/fixtures/layouts_test.rb +0 -135
- data/test/lib/fixtures/pages_test.rb +0 -168
- data/test/lib/fixtures/snippets_test.rb +0 -106
- data/test/lib/fixtures_test.rb +0 -43
- data/test/lib/mirrors_test.rb +0 -254
- data/test/lib/tag_test.rb +0 -309
- data/test/lib/tags/asset_test.rb +0 -95
- data/test/lib/tags/collection_test.rb +0 -117
- data/test/lib/tags/field_boolean_test.rb +0 -49
- data/test/lib/tags/field_datetime_test.rb +0 -50
- data/test/lib/tags/field_integer_test.rb +0 -49
- data/test/lib/tags/field_rich_text_test.rb +0 -49
- data/test/lib/tags/field_string_test.rb +0 -52
- data/test/lib/tags/field_text_test.rb +0 -48
- data/test/lib/tags/file_test.rb +0 -67
- data/test/lib/tags/helper_test.rb +0 -86
- data/test/lib/tags/page_datetime_test.rb +0 -50
- data/test/lib/tags/page_file_test.rb +0 -119
- data/test/lib/tags/page_files_test.rb +0 -117
- data/test/lib/tags/page_integer_test.rb +0 -49
- data/test/lib/tags/page_markdown_test.rb +0 -48
- data/test/lib/tags/page_rich_text_test.rb +0 -49
- data/test/lib/tags/page_string_test.rb +0 -49
- data/test/lib/tags/page_text_test.rb +0 -52
- data/test/lib/tags/partial_test.rb +0 -76
- data/test/lib/tags/snippet_test.rb +0 -45
- data/test/lib/tags/template_test.rb +0 -56
- data/test/models/block_test.rb +0 -233
@@ -1 +0,0 @@
|
|
1
|
-
label: Default Fixture Layout
|
@@ -1 +0,0 @@
|
|
1
|
-
// default js
|
@@ -1 +0,0 @@
|
|
1
|
-
// nested js
|
@@ -1 +0,0 @@
|
|
1
|
-
div{float:left}
|
@@ -1 +0,0 @@
|
|
1
|
-
body{color: red}
|
@@ -1 +0,0 @@
|
|
1
|
-
= "Child Page Left Fixture Content"
|
@@ -1 +0,0 @@
|
|
1
|
-
Child Page Right Fixture Content
|
@@ -1 +0,0 @@
|
|
1
|
-
Fixture Content for Default Snippet
|
data/db/seeds.rb
DELETED
@@ -1,7 +0,0 @@
|
|
1
|
-
# This file should contain all the record creation needed to seed the database with its default values.
|
2
|
-
# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
|
3
|
-
#
|
4
|
-
# Examples:
|
5
|
-
#
|
6
|
-
# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
|
7
|
-
# Mayor.create(:name => 'Daley', :city => cities.first)
|
@@ -1,19 +0,0 @@
|
|
1
|
-
class UpgradeTo110 < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
rename_column :cms_layouts, :cms_site_id, :site_id
|
4
|
-
rename_column :cms_pages, :cms_site_id, :site_id
|
5
|
-
rename_column :cms_pages, :cms_layout_id, :layout_id
|
6
|
-
rename_column :cms_blocks, :cms_page_id, :page_id
|
7
|
-
rename_column :cms_snippets, :cms_site_id, :site_id
|
8
|
-
rename_column :cms_uploads, :cms_site_id, :site_id
|
9
|
-
end
|
10
|
-
|
11
|
-
def self.down
|
12
|
-
rename_column :cms_uploads, :site_id, :cms_site_id
|
13
|
-
rename_column :cms_snippets, :site_id, :cms_site_id
|
14
|
-
rename_column :cms_blocks, :page_id, :cms_page_id
|
15
|
-
rename_column :cms_layouts, :site_id, :cms_site_id
|
16
|
-
rename_column :cms_pages, :layout_id, :cms_layout_id
|
17
|
-
rename_column :cms_pages, :site_id, :cms_site_id
|
18
|
-
end
|
19
|
-
end
|
@@ -1,15 +0,0 @@
|
|
1
|
-
class UpgradeTo120 < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
create_table :cms_revisions, :force => true do |t|
|
4
|
-
t.string :record_type
|
5
|
-
t.integer :record_id
|
6
|
-
t.text :data
|
7
|
-
t.datetime :created_at
|
8
|
-
end
|
9
|
-
add_index :cms_revisions, [:record_type, :record_id, :created_at]
|
10
|
-
end
|
11
|
-
|
12
|
-
def self.down
|
13
|
-
drop_table :cms_revisions
|
14
|
-
end
|
15
|
-
end
|
@@ -1,23 +0,0 @@
|
|
1
|
-
class UpgradeTo130 < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
add_column :cms_sites, :is_mirrored, :boolean, :null => false, :default => false
|
4
|
-
add_column :cms_sites, :path, :string
|
5
|
-
add_column :cms_sites, :locale, :string, :null => false, :default => 'en'
|
6
|
-
add_index :cms_sites, :is_mirrored
|
7
|
-
|
8
|
-
add_column :cms_layouts, :is_shared, :boolean, :null => false, :default => false
|
9
|
-
add_column :cms_pages, :is_shared, :boolean, :null => false, :default => false
|
10
|
-
add_column :cms_snippets, :is_shared, :boolean, :null => false, :default => false
|
11
|
-
end
|
12
|
-
|
13
|
-
def self.down
|
14
|
-
remove_index :cms_sites, :is_mirrored
|
15
|
-
remove_column :cms_sites, :path
|
16
|
-
remove_column :cms_sites, :is_mirrored
|
17
|
-
remove_column :cms_sites, :locale
|
18
|
-
|
19
|
-
remove_column :cms_layouts, :is_shared
|
20
|
-
remove_column :cms_pages, :is_shared
|
21
|
-
remove_column :cms_snippets, :is_shared
|
22
|
-
end
|
23
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
class UpgradeTo140 < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
rename_table :cms_uploads, :cms_files
|
4
|
-
add_column :cms_files, :label, :string
|
5
|
-
add_column :cms_files, :description, :string, :limit => 2048
|
6
|
-
add_index :cms_files, [:site_id, :label]
|
7
|
-
|
8
|
-
# -- Categories ---------------------------------------------------------
|
9
|
-
create_table :cms_categories, :force => true do |t|
|
10
|
-
t.string :label
|
11
|
-
t.string :categorized_type
|
12
|
-
end
|
13
|
-
add_index :cms_categories, [:categorized_type, :label], :unique => true
|
14
|
-
|
15
|
-
create_table :cms_categorizations, :force => true do |t|
|
16
|
-
t.integer :category_id
|
17
|
-
t.string :categorized_type
|
18
|
-
t.integer :categorized_id
|
19
|
-
end
|
20
|
-
add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
|
21
|
-
:name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
|
22
|
-
end
|
23
|
-
|
24
|
-
def self.down
|
25
|
-
remove_index :cms_files, [:site_id, :label]
|
26
|
-
remove_column :cms_files, :description
|
27
|
-
remove_column :cms_files, :label
|
28
|
-
rename_table :cms_files, :cms_uploads
|
29
|
-
|
30
|
-
drop_table :cms_categories
|
31
|
-
drop_table :cms_categorizations
|
32
|
-
end
|
33
|
-
end
|
@@ -1,21 +0,0 @@
|
|
1
|
-
class UpgradeTo150 < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
add_column :cms_snippets, :position, :integer, :null => false, :default => 0
|
4
|
-
add_column :cms_files, :position, :integer, :null => false, :default => 0
|
5
|
-
add_column :cms_files, :block_id, :integer
|
6
|
-
|
7
|
-
add_index :cms_snippets, [:site_id, :position]
|
8
|
-
add_index :cms_files, [:site_id, :position]
|
9
|
-
add_index :cms_files, [:site_id, :block_id]
|
10
|
-
end
|
11
|
-
|
12
|
-
def self.down
|
13
|
-
remove_index :cms_snippets, [:site_id, :position]
|
14
|
-
remove_index :cms_files, [:site_id, :position]
|
15
|
-
remove_index :cms_files, [:site_id, :block_id]
|
16
|
-
|
17
|
-
remove_column :cms_snippets, :position
|
18
|
-
remove_column :cms_files, :position
|
19
|
-
remove_column :cms_files, :block_id
|
20
|
-
end
|
21
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
class UpgradeTo160 < ActiveRecord::Migration
|
2
|
-
def self.up
|
3
|
-
add_column :cms_sites, :identifier, :string
|
4
|
-
add_index :cms_sites, :identifier
|
5
|
-
|
6
|
-
rename_column :cms_layouts, :slug, :identifier
|
7
|
-
rename_column :cms_blocks, :label, :identifier
|
8
|
-
rename_column :cms_snippets, :slug, :identifier
|
9
|
-
|
10
|
-
add_column :cms_categories, :site_id, :integer, :null => :false
|
11
|
-
add_index :cms_categories, [:site_id, :categorized_type, :label], :unique => true
|
12
|
-
end
|
13
|
-
|
14
|
-
def self.down
|
15
|
-
remove_index :cms_categories, [:site_id, :categorized_type, :label], :unique => true
|
16
|
-
remove_column :cms_categories, :site_id
|
17
|
-
|
18
|
-
rename_column :cms_snippets, :identifier, :slug
|
19
|
-
rename_column :cms_blocks, :identifier, :label
|
20
|
-
rename_column :cms_layouts, :identifier, :slug
|
21
|
-
|
22
|
-
remove_index :cms_sites, :identifier
|
23
|
-
remove_column :cms_sites, :identifier
|
24
|
-
end
|
25
|
-
end
|
@@ -1,83 +0,0 @@
|
|
1
|
-
class UpgradeTo1120 < ActiveRecord::Migration
|
2
|
-
|
3
|
-
COMFY_CLASSES = %w(Block Category Categorization File Layout Page Revision Site Snippet)
|
4
|
-
|
5
|
-
def self.up
|
6
|
-
add_column :cms_blocks, :blockable_type, :string
|
7
|
-
add_index :cms_blocks, :blockable_type
|
8
|
-
|
9
|
-
rename_column :cms_blocks, :page_id, :blockable_id
|
10
|
-
execute("UPDATE cms_blocks SET blockable_type = 'Comfy::Cms::Page'")
|
11
|
-
|
12
|
-
rename_column :cms_pages, :content, :content_cache
|
13
|
-
|
14
|
-
rename_table :cms_sites, :comfy_cms_sites
|
15
|
-
rename_table :cms_layouts, :comfy_cms_layouts
|
16
|
-
rename_table :cms_pages, :comfy_cms_pages
|
17
|
-
rename_table :cms_blocks, :comfy_cms_blocks
|
18
|
-
rename_table :cms_snippets, :comfy_cms_snippets
|
19
|
-
rename_table :cms_files, :comfy_cms_files
|
20
|
-
rename_index :cms_revisions,
|
21
|
-
'index_cms_revisions_on_record_type_and_record_id_and_created_at',
|
22
|
-
'index_cms_revisions_on_record_type_id_and_created'
|
23
|
-
rename_table :cms_revisions, :comfy_cms_revisions
|
24
|
-
rename_index :cms_categories,
|
25
|
-
'index_cms_categories_on_site_id_and_categorized_type_and_label',
|
26
|
-
'index_cms_categories_on_site_id_and_cat_type_and_label'
|
27
|
-
rename_table :cms_categories, :comfy_cms_categories
|
28
|
-
rename_table :cms_categorizations, :comfy_cms_categorizations
|
29
|
-
|
30
|
-
COMFY_CLASSES.each do |klass|
|
31
|
-
execute("
|
32
|
-
UPDATE comfy_cms_categories SET categorized_type = 'Comfy::Cms::#{klass}'
|
33
|
-
WHERE categorized_type = 'Cms::#{klass}'
|
34
|
-
")
|
35
|
-
execute("
|
36
|
-
UPDATE comfy_cms_categorizations SET categorized_type = 'Comfy::Cms::#{klass}'
|
37
|
-
WHERE categorized_type = 'Cms::#{klass}'
|
38
|
-
")
|
39
|
-
execute("
|
40
|
-
UPDATE comfy_cms_revisions SET record_type = 'Comfy::Cms::#{klass}'
|
41
|
-
WHERE record_type = 'Cms::#{klass}'
|
42
|
-
")
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
def self.down
|
47
|
-
COMFY_CLASSES.each do |klass|
|
48
|
-
execute("
|
49
|
-
UPDATE comfy_cms_revisions SET record_type = 'Cms::#{klass}'
|
50
|
-
WHERE record_type = 'Comfy::Cms::#{klass}'
|
51
|
-
")
|
52
|
-
execute("
|
53
|
-
UPDATE comfy_cms_categorizations SET categorized_type = 'Cms::#{klass}'
|
54
|
-
WHERE categorized_type = 'Comfy::Cms::#{klass}'
|
55
|
-
")
|
56
|
-
execute("
|
57
|
-
UPDATE comfy_cms_categories SET categorized_type = 'Cms::#{klass}'
|
58
|
-
WHERE categorized_type = 'Comfy::Cms::#{klass}'
|
59
|
-
")
|
60
|
-
end
|
61
|
-
|
62
|
-
rename_table :comfy_cms_sites, :cms_sites
|
63
|
-
rename_table :comfy_cms_layouts, :cms_layouts
|
64
|
-
rename_table :comfy_cms_pages, :cms_pages
|
65
|
-
rename_table :comfy_cms_blocks, :cms_blocks
|
66
|
-
rename_table :comfy_cms_snippets, :cms_snippets
|
67
|
-
rename_table :comfy_cms_files, :cms_files
|
68
|
-
rename_index :comfy_cms_revisions,
|
69
|
-
'index_cms_revisions_on_record_type_id_and_created',
|
70
|
-
'index_cms_revisions_on_record_type_and_record_id_and_created_at'
|
71
|
-
rename_table :comfy_cms_revisions, :cms_revisions
|
72
|
-
rename_index :comfy_cms_categories,
|
73
|
-
'index_cms_categories_on_site_id_and_cat_type_and_label',
|
74
|
-
'index_cms_categories_on_site_id_and_categorized_type_and_label'
|
75
|
-
rename_table :comfy_cms_categories, :cms_categories
|
76
|
-
rename_table :comfy_cms_categorizations, :cms_categorizations
|
77
|
-
|
78
|
-
remove_index :cms_blocks, :blockable_type
|
79
|
-
remove_column :cms_blocks, :blockable_type
|
80
|
-
rename_column :cms_blocks, :blockable_id, :page_id
|
81
|
-
rename_column :cms_pages, :content_cache, :content
|
82
|
-
end
|
83
|
-
end
|
data/doc/preview.png
DELETED
Binary file
|
@@ -1,106 +0,0 @@
|
|
1
|
-
# ActsAsCms is the module that drives all the logic around blocks and
|
2
|
-
# blocks_attributes.
|
3
|
-
module ComfortableMexicanSofa::CmsManageable
|
4
|
-
|
5
|
-
def self.included(base)
|
6
|
-
base.send :extend, ClassMethods
|
7
|
-
end
|
8
|
-
|
9
|
-
module ClassMethods
|
10
|
-
|
11
|
-
def cms_manageable
|
12
|
-
|
13
|
-
include ComfortableMexicanSofa::CmsManageable::InstanceMethods
|
14
|
-
|
15
|
-
attr_accessor :blocks_attributes_changed
|
16
|
-
|
17
|
-
# -- Relationships ----------------------------------------------------
|
18
|
-
has_many :blocks,
|
19
|
-
:autosave => true,
|
20
|
-
:dependent => :destroy,
|
21
|
-
:as => :blockable,
|
22
|
-
:class_name => 'Comfy::Cms::Block'
|
23
|
-
|
24
|
-
# -- Callbacks --------------------------------------------------------
|
25
|
-
before_save :clear_content_cache
|
26
|
-
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
module InstanceMethods
|
31
|
-
|
32
|
-
# Transforms existing cms_block information into a hash that can be used
|
33
|
-
# during form processing. That's the only way to modify cms_blocks.
|
34
|
-
def blocks_attributes(was = false)
|
35
|
-
self.blocks.collect do |block|
|
36
|
-
block_attr = {}
|
37
|
-
block_attr[:identifier] = block.identifier
|
38
|
-
block_attr[:content] = was ? block.content_was : block.content
|
39
|
-
block_attr
|
40
|
-
end
|
41
|
-
end
|
42
|
-
|
43
|
-
# Array of block hashes in the following format:
|
44
|
-
# [
|
45
|
-
# { :identifier => 'block_1', :content => 'block content' },
|
46
|
-
# { :identifier => 'block_2', :content => 'block content' }
|
47
|
-
# ]
|
48
|
-
def blocks_attributes=(block_hashes = [])
|
49
|
-
block_hashes = block_hashes.values if block_hashes.is_a?(Hash)
|
50
|
-
block_hashes.each do |block_hash|
|
51
|
-
block_hash.symbolize_keys! unless block_hash.is_a?(HashWithIndifferentAccess)
|
52
|
-
block =
|
53
|
-
self.blocks.detect{|b| b.identifier == block_hash[:identifier]} ||
|
54
|
-
self.blocks.build(:identifier => block_hash[:identifier])
|
55
|
-
block.content = block_hash[:content]
|
56
|
-
self.blocks_attributes_changed = self.blocks_attributes_changed || block.content_changed?
|
57
|
-
end
|
58
|
-
end
|
59
|
-
|
60
|
-
# Processing content will return rendered content and will populate
|
61
|
-
# self.cms_tags with instances of CmsTag
|
62
|
-
def render
|
63
|
-
@tags = [] # resetting
|
64
|
-
return '' unless layout
|
65
|
-
|
66
|
-
ComfortableMexicanSofa::Tag.process_content(
|
67
|
-
self, ComfortableMexicanSofa::Tag.sanitize_irb(layout.merged_content)
|
68
|
-
)
|
69
|
-
end
|
70
|
-
|
71
|
-
def tags=(tags)
|
72
|
-
@tags = tags
|
73
|
-
end
|
74
|
-
|
75
|
-
# Array of cms_tags for a page. Content generation is called if forced.
|
76
|
-
# These also include initialized cms_blocks if present
|
77
|
-
def tags(force_reload = false)
|
78
|
-
self.render if force_reload
|
79
|
-
@tags ||= []
|
80
|
-
end
|
81
|
-
|
82
|
-
# Method to collect prevous state of blocks for revisions
|
83
|
-
def blocks_attributes_was
|
84
|
-
blocks_attributes(true)
|
85
|
-
end
|
86
|
-
|
87
|
-
# Cached content accessor
|
88
|
-
def content_cache
|
89
|
-
if (@content_cache = read_attribute(:content_cache)).nil?
|
90
|
-
@content_cache = self.render
|
91
|
-
update_column(:content_cache, @content_cache) unless self.new_record?
|
92
|
-
end
|
93
|
-
@content_cache
|
94
|
-
end
|
95
|
-
|
96
|
-
def clear_content_cache!
|
97
|
-
self.update_column(:content_cache, nil)
|
98
|
-
end
|
99
|
-
|
100
|
-
def clear_content_cache
|
101
|
-
write_attribute(:content_cache, nil) if self.has_attribute?(:content_cache)
|
102
|
-
end
|
103
|
-
end
|
104
|
-
end
|
105
|
-
|
106
|
-
ActiveRecord::Base.send :include, ComfortableMexicanSofa::CmsManageable
|
@@ -1,49 +0,0 @@
|
|
1
|
-
module ComfortableMexicanSofa::IsCategorized
|
2
|
-
|
3
|
-
def self.included(base)
|
4
|
-
base.send :extend, ClassMethods
|
5
|
-
end
|
6
|
-
|
7
|
-
module ClassMethods
|
8
|
-
def cms_is_categorized
|
9
|
-
include ComfortableMexicanSofa::IsCategorized::InstanceMethods
|
10
|
-
|
11
|
-
has_many :categorizations,
|
12
|
-
:as => :categorized,
|
13
|
-
:class_name => 'Comfy::Cms::Categorization',
|
14
|
-
:dependent => :destroy
|
15
|
-
has_many :categories,
|
16
|
-
:through => :categorizations,
|
17
|
-
:class_name => 'Comfy::Cms::Category'
|
18
|
-
|
19
|
-
attr_accessor :category_ids
|
20
|
-
|
21
|
-
after_save :sync_categories
|
22
|
-
|
23
|
-
scope :for_category, lambda { |*categories|
|
24
|
-
if (categories = [categories].flatten.compact).present?
|
25
|
-
self.distinct.
|
26
|
-
joins(:categorizations => :category).
|
27
|
-
where('comfy_cms_categories.label' => categories)
|
28
|
-
end
|
29
|
-
}
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
module InstanceMethods
|
34
|
-
def sync_categories
|
35
|
-
(self.category_ids || {}).each do |category_id, flag|
|
36
|
-
case flag.to_i
|
37
|
-
when 1
|
38
|
-
if category = Comfy::Cms::Category.find_by_id(category_id)
|
39
|
-
category.categorizations.create(:categorized => self)
|
40
|
-
end
|
41
|
-
when 0
|
42
|
-
self.categorizations.where(:category_id => category_id).destroy_all
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
|
49
|
-
ActiveRecord::Base.send :include, ComfortableMexicanSofa::IsCategorized
|