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
@@ -0,0 +1,98 @@
|
|
1
|
+
require_relative '../../test_helper'
|
2
|
+
|
3
|
+
class SeedsSnippetsTest < ActiveSupport::TestCase
|
4
|
+
|
5
|
+
setup do
|
6
|
+
@site = comfy_cms_sites(:default)
|
7
|
+
@snippet = comfy_cms_snippets(:default)
|
8
|
+
end
|
9
|
+
|
10
|
+
def test_creation
|
11
|
+
Comfy::Cms::Snippet.delete_all
|
12
|
+
|
13
|
+
assert_count_difference [Comfy::Cms::Snippet] do
|
14
|
+
ComfortableMexicanSofa::Seeds::Snippet::Importer.new('sample-site', 'default-site').import!
|
15
|
+
end
|
16
|
+
|
17
|
+
snippet = Comfy::Cms::Snippet.last
|
18
|
+
|
19
|
+
assert_equal "default", snippet.identifier
|
20
|
+
assert_equal "Default Seed Snippet", snippet.label
|
21
|
+
assert_equal "Default Seed Snippet Content\n", snippet.content
|
22
|
+
|
23
|
+
assert_equal %w(category_a category_b), snippet.categories.map{|c| c.label}
|
24
|
+
end
|
25
|
+
|
26
|
+
def test_update
|
27
|
+
@snippet.update_column(:updated_at, 10.years.ago)
|
28
|
+
assert_equal 'default', @snippet.identifier
|
29
|
+
assert_equal 'Default Snippet', @snippet.label
|
30
|
+
assert_equal 'snippet content', @snippet.content
|
31
|
+
|
32
|
+
assert_count_no_difference [Comfy::Cms::Snippet] do
|
33
|
+
ComfortableMexicanSofa::Seeds::Snippet::Importer.new('sample-site', 'default-site').import!
|
34
|
+
end
|
35
|
+
|
36
|
+
@snippet.reload
|
37
|
+
assert_equal 'default', @snippet.identifier
|
38
|
+
assert_equal "Default Seed Snippet", @snippet.label
|
39
|
+
assert_equal "Default Seed Snippet Content\n", @snippet.content
|
40
|
+
end
|
41
|
+
|
42
|
+
def test_delete
|
43
|
+
old_snippet = @snippet
|
44
|
+
old_snippet.update_column(:identifier, 'old')
|
45
|
+
|
46
|
+
assert_count_no_difference [Comfy::Cms::Snippet] do
|
47
|
+
ComfortableMexicanSofa::Seeds::Snippet::Importer.new('sample-site', 'default-site').import!
|
48
|
+
end
|
49
|
+
|
50
|
+
assert snippet = Comfy::Cms::Snippet.last
|
51
|
+
assert_equal 'default', snippet.identifier
|
52
|
+
assert_equal 'Default Seed Snippet', snippet.label
|
53
|
+
assert_equal "Default Seed Snippet Content\n", snippet.content
|
54
|
+
|
55
|
+
assert_nil Comfy::Cms::Snippet.where(id: old_snippet.id).first
|
56
|
+
end
|
57
|
+
|
58
|
+
def test_update_ignoring
|
59
|
+
snippet_path = File.join(ComfortableMexicanSofa.config.seeds_path, 'sample-site', 'snippets')
|
60
|
+
content_path = File.join(snippet_path, 'default.html')
|
61
|
+
|
62
|
+
assert @snippet.updated_at >= File.mtime(content_path)
|
63
|
+
|
64
|
+
ComfortableMexicanSofa::Seeds::Snippet::Importer.new('sample-site', 'default-site').import!
|
65
|
+
@snippet.reload
|
66
|
+
assert_equal 'default', @snippet.identifier
|
67
|
+
assert_equal 'Default Snippet', @snippet.label
|
68
|
+
assert_equal 'snippet content', @snippet.content
|
69
|
+
end
|
70
|
+
|
71
|
+
def test_export
|
72
|
+
comfy_cms_categories(:default).categorizations.create!(
|
73
|
+
categorized: @snippet
|
74
|
+
)
|
75
|
+
|
76
|
+
host_path = File.join(ComfortableMexicanSofa.config.seeds_path, 'test-site')
|
77
|
+
content_path = File.join(host_path, "snippets/default.html")
|
78
|
+
|
79
|
+
ComfortableMexicanSofa::Seeds::Snippet::Exporter.new('default-site', 'test-site').export!
|
80
|
+
|
81
|
+
assert File.exist?(content_path)
|
82
|
+
out = <<-TEXT.strip_heredoc
|
83
|
+
[attributes]
|
84
|
+
---
|
85
|
+
label: Default Snippet
|
86
|
+
categories:
|
87
|
+
- Default
|
88
|
+
position: 0
|
89
|
+
|
90
|
+
[content]
|
91
|
+
snippet content
|
92
|
+
TEXT
|
93
|
+
assert_equal out, IO.read(content_path)
|
94
|
+
|
95
|
+
ensure
|
96
|
+
FileUtils.rm_rf(host_path)
|
97
|
+
end
|
98
|
+
end
|
@@ -0,0 +1,50 @@
|
|
1
|
+
require_relative '../test_helper'
|
2
|
+
|
3
|
+
class SeedsTest < ActiveSupport::TestCase
|
4
|
+
|
5
|
+
def test_import_all
|
6
|
+
Comfy::Cms::Page.destroy_all
|
7
|
+
Comfy::Cms::Layout.destroy_all
|
8
|
+
Comfy::Cms::Snippet.destroy_all
|
9
|
+
|
10
|
+
assert_count_difference [Comfy::Cms::Layout], 2 do
|
11
|
+
assert_count_difference [Comfy::Cms::Page], 3 do
|
12
|
+
assert_count_difference [Comfy::Cms::Snippet], 1 do
|
13
|
+
ComfortableMexicanSofa::Seeds::Importer.new('sample-site', 'default-site').import!
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
def test_import_all_with_no_site
|
20
|
+
comfy_cms_sites(:default).destroy
|
21
|
+
|
22
|
+
assert_exception_raised ActiveRecord::RecordNotFound do
|
23
|
+
ComfortableMexicanSofa::Seeds::Importer.new('sample-site', 'default-site').import!
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
def test_import_all_with_no_folder
|
28
|
+
assert_exception_raised ComfortableMexicanSofa::Seeds::Error do
|
29
|
+
ComfortableMexicanSofa::Seeds::Importer.new('invalid', 'default-site').import!
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
def test_export_all
|
34
|
+
ActiveStorage::Blob.any_instance.stubs(:download).returns(
|
35
|
+
File.read(File.join(Rails.root, 'db/cms_seeds/sample-site/files/default.jpg'))
|
36
|
+
)
|
37
|
+
|
38
|
+
host_path = File.join(ComfortableMexicanSofa.config.seeds_path, 'test-site')
|
39
|
+
ComfortableMexicanSofa::Seeds::Exporter.new('default-site', 'test-site').export!
|
40
|
+
FileUtils.rm_rf(host_path)
|
41
|
+
end
|
42
|
+
|
43
|
+
def test_export_all_with_no_site
|
44
|
+
comfy_cms_sites(:default).destroy
|
45
|
+
|
46
|
+
assert_exception_raised ActiveRecord::RecordNotFound do
|
47
|
+
ComfortableMexicanSofa::Seeds::Exporter.new('sample-site', 'default-site').export!
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
@@ -1,76 +1,75 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "../test_helper"
|
2
2
|
|
3
3
|
class CmsCategorizationTest < ActiveSupport::TestCase
|
4
|
-
|
4
|
+
|
5
5
|
def test_fixtures_validity
|
6
6
|
Comfy::Cms::Categorization.all.each do |categorization|
|
7
7
|
assert categorization.valid?, categorization.errors.full_messages.to_s
|
8
8
|
end
|
9
9
|
end
|
10
|
-
|
10
|
+
|
11
11
|
def test_validation
|
12
12
|
category = Comfy::Cms::Categorization.new
|
13
13
|
assert category.invalid?
|
14
|
-
assert_has_errors_on category, :
|
14
|
+
assert_has_errors_on category, :category, :categorized
|
15
15
|
end
|
16
|
-
|
16
|
+
|
17
17
|
def test_creation
|
18
|
-
assert_difference
|
19
|
-
|
20
|
-
:
|
18
|
+
assert_difference "Comfy::Cms::Categorization.count" do
|
19
|
+
comfy_cms_categories(:default).categorizations.create!(
|
20
|
+
categorized: comfy_cms_pages(:default)
|
21
21
|
)
|
22
22
|
end
|
23
23
|
end
|
24
|
-
|
24
|
+
|
25
25
|
def test_categorized_relationship
|
26
26
|
file = comfy_cms_files(:default)
|
27
27
|
assert file.respond_to?(:category_ids)
|
28
28
|
assert_equal 1, file.categories.count
|
29
29
|
assert_equal comfy_cms_categories(:default), file.categories.first
|
30
|
-
|
31
|
-
assert comfy_cms_snippets(:default).respond_to?(:category_ids)
|
32
|
-
assert_equal 0, comfy_cms_snippets(:default).categories.count
|
30
|
+
|
33
31
|
assert comfy_cms_pages(:default).respond_to?(:category_ids)
|
34
32
|
assert_equal 0, comfy_cms_pages(:default).categories.count
|
35
33
|
end
|
36
|
-
|
34
|
+
|
37
35
|
def test_categorized_destruction
|
38
|
-
|
39
|
-
|
40
|
-
file.destroy
|
36
|
+
assert_count_difference [Comfy::Cms::File, Comfy::Cms::Categorization], -1 do
|
37
|
+
comfy_cms_files(:default).destroy
|
41
38
|
end
|
42
39
|
end
|
43
|
-
|
40
|
+
|
44
41
|
def test_categorized_syncing
|
45
|
-
|
46
|
-
assert_equal 0,
|
47
|
-
|
48
|
-
|
42
|
+
page = comfy_cms_pages(:default)
|
43
|
+
assert_equal 0, page.categories.count
|
44
|
+
|
45
|
+
page.update_attributes(:category_ids => {
|
49
46
|
comfy_cms_categories(:default).id => 1,
|
50
|
-
|
47
|
+
"invalid" => 1
|
51
48
|
})
|
52
|
-
|
53
|
-
assert_equal 1,
|
54
|
-
|
55
|
-
|
49
|
+
page.reload
|
50
|
+
assert_equal 1, page.categories.count
|
51
|
+
|
52
|
+
page.update_attributes(:category_ids => {
|
56
53
|
comfy_cms_categories(:default).id => 0,
|
57
|
-
|
54
|
+
"invalid" => 0
|
58
55
|
})
|
59
|
-
|
60
|
-
assert_equal 0,
|
56
|
+
page.reload
|
57
|
+
assert_equal 0, page.categories.count
|
61
58
|
end
|
62
|
-
|
59
|
+
|
63
60
|
def test_scope_for_category
|
64
61
|
category = comfy_cms_categories(:default)
|
65
62
|
assert_equal 1, Comfy::Cms::File.for_category(category.label).count
|
66
|
-
assert_equal 0, Comfy::Cms::File.for_category(
|
67
|
-
assert_equal 1, Comfy::Cms::File.for_category(category.label,
|
63
|
+
assert_equal 0, Comfy::Cms::File.for_category("invalid").count
|
64
|
+
assert_equal 1, Comfy::Cms::File.for_category(category.label, "invalid").count
|
68
65
|
assert_equal 1, Comfy::Cms::File.for_category(nil).count
|
69
|
-
|
70
|
-
new_category = comfy_cms_sites(:default).categories.create!(
|
71
|
-
|
66
|
+
|
67
|
+
new_category = comfy_cms_sites(:default).categories.create!(
|
68
|
+
label: "Test Category",
|
69
|
+
categorized_type: "Comfy::Cms::File"
|
70
|
+
)
|
71
|
+
new_category.categorizations.create!(categorized: comfy_cms_pages(:default))
|
72
72
|
assert_equal 1, Comfy::Cms::File.for_category(category.label, new_category.label).to_a.size
|
73
|
-
assert_equal 1, Comfy::Cms::File.for_category(category.label, new_category.label).distinct.count(
|
73
|
+
assert_equal 1, Comfy::Cms::File.for_category(category.label, new_category.label).distinct.count("comfy_cms_files.id")
|
74
74
|
end
|
75
|
-
|
76
|
-
end
|
75
|
+
end
|
@@ -1,39 +1,39 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "../test_helper"
|
2
2
|
|
3
3
|
class CmsCategoryTest < ActiveSupport::TestCase
|
4
|
-
|
4
|
+
|
5
5
|
def test_fixtures_validity
|
6
6
|
Comfy::Cms::Category.all.each do |category|
|
7
7
|
assert category.valid?, category.errors.full_messages.to_s
|
8
8
|
end
|
9
9
|
end
|
10
|
-
|
10
|
+
|
11
11
|
def test_validation
|
12
12
|
category = Comfy::Cms::Category.new
|
13
13
|
assert category.invalid?
|
14
|
-
assert_has_errors_on category,
|
14
|
+
assert_has_errors_on category, :site, :label, :categorized_type
|
15
15
|
end
|
16
|
-
|
16
|
+
|
17
17
|
def test_creation
|
18
|
-
assert_difference
|
18
|
+
assert_difference "Comfy::Cms::Category.count" do
|
19
19
|
comfy_cms_sites(:default).categories.create(
|
20
|
-
:
|
21
|
-
:
|
20
|
+
label: "Test Category",
|
21
|
+
categorized_type: "Comfy::Cms::Snippet"
|
22
22
|
)
|
23
23
|
end
|
24
24
|
end
|
25
|
-
|
25
|
+
|
26
26
|
def test_destruction
|
27
27
|
category = comfy_cms_categories(:default)
|
28
28
|
assert_equal 1, category.categorizations.count
|
29
|
-
assert_difference [
|
29
|
+
assert_difference ["Comfy::Cms::Category.count", "Comfy::Cms::Categorization.count"], -1 do
|
30
30
|
category.destroy
|
31
31
|
end
|
32
32
|
end
|
33
|
-
|
33
|
+
|
34
34
|
def test_scope_of_type
|
35
|
-
assert_equal 1, Comfy::Cms::Category.of_type(
|
36
|
-
assert_equal 0, Comfy::Cms::Category.of_type(
|
35
|
+
assert_equal 1, Comfy::Cms::Category.of_type("Comfy::Cms::File").count
|
36
|
+
assert_equal 0, Comfy::Cms::Category.of_type("Invalid").count
|
37
37
|
end
|
38
|
-
|
38
|
+
|
39
39
|
end
|
data/test/models/file_test.rb
CHANGED
@@ -1,116 +1,43 @@
|
|
1
|
-
require_relative
|
1
|
+
require_relative "../test_helper"
|
2
|
+
|
2
3
|
|
3
4
|
class CmsFileTest < ActiveSupport::TestCase
|
4
|
-
|
5
|
+
|
5
6
|
def test_fixtures_validity
|
6
|
-
# stubbing out Paperclip 4.0 mimetype validation
|
7
|
-
if defined? Paperclip::Validators::MediaTypeSpoofDetectionValidator
|
8
|
-
Paperclip::Validators::MediaTypeSpoofDetectionValidator.any_instance.stubs(:validate_each).returns(true)
|
9
|
-
end
|
10
|
-
|
11
7
|
Comfy::Cms::File.all.each do |file|
|
12
8
|
assert file.valid?, file.errors.full_messages.to_s
|
9
|
+
assert file.attachment
|
10
|
+
assert file.attachment.blob
|
13
11
|
end
|
14
12
|
end
|
15
|
-
|
13
|
+
|
16
14
|
def test_validations
|
17
15
|
file = Comfy::Cms::File.new
|
18
16
|
assert file.invalid?
|
19
|
-
assert_has_errors_on file, :
|
20
|
-
end
|
21
|
-
|
22
|
-
def test_validations_uniqueness
|
23
|
-
comfy_cms_files(:default).update_column(:file_file_name, 'image.jpg')
|
24
|
-
file = comfy_cms_sites(:default).files.new(
|
25
|
-
:file => fixture_file_upload('files/image.jpg', 'image/jpeg')
|
26
|
-
)
|
27
|
-
assert file.invalid?
|
28
|
-
assert_has_errors_on file, :file_file_name
|
29
|
-
|
30
|
-
file = comfy_cms_sites(:default).files.new(
|
31
|
-
:block_id => comfy_cms_blocks(:default_field_text).id,
|
32
|
-
:file => fixture_file_upload('files/image.jpg', 'image/jpeg')
|
33
|
-
)
|
34
|
-
assert file.valid?
|
17
|
+
assert_has_errors_on file, :site, :file
|
35
18
|
end
|
36
|
-
|
37
|
-
def
|
38
|
-
assert_difference
|
39
|
-
upload = fixture_file_upload('files/image.jpg', 'image/jpeg')
|
40
|
-
|
19
|
+
|
20
|
+
def test_creation
|
21
|
+
assert_difference ["Comfy::Cms::File.count", "ActiveStorage::Attachment.count"] do
|
41
22
|
file = comfy_cms_sites(:default).files.create(
|
42
|
-
:
|
43
|
-
|
44
|
-
|
45
|
-
assert_equal 'image.jpg', file.file_file_name
|
46
|
-
assert_equal 'image/jpeg', file.file_content_type
|
47
|
-
assert_equal upload.size, file.file_file_size
|
48
|
-
assert_equal 1, file.position
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
|
-
def test_create_with_dimensions
|
53
|
-
assert_difference 'Comfy::Cms::File.count' do
|
54
|
-
upload = fixture_file_upload('files/image.jpg', 'image/jpeg')
|
55
|
-
|
56
|
-
file = comfy_cms_sites(:default).files.create!(
|
57
|
-
:dimensions => '10x10#',
|
58
|
-
:file => upload
|
23
|
+
label: "test",
|
24
|
+
description: "test file",
|
25
|
+
file: fixture_file_upload("files/image.jpg", "image/jpeg")
|
59
26
|
)
|
60
|
-
assert_equal 'Image', file.label
|
61
|
-
assert_equal 'image.jpg', file.file_file_name
|
62
|
-
assert_equal 'image/jpeg', file.file_content_type
|
63
|
-
# assert file.file_file_size < upload.size
|
64
27
|
assert_equal 1, file.position
|
65
28
|
end
|
66
29
|
end
|
67
|
-
|
68
|
-
def
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
)
|
73
|
-
assert_equal 'Data', file.label
|
74
|
-
assert_equal 'data.zip', file.file_file_name
|
75
|
-
assert_equal 'application/zip', file.file_content_type
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
def test_create_failure
|
80
|
-
assert_no_difference 'Comfy::Cms::File.count' do
|
81
|
-
comfy_cms_sites(:default).files.create
|
82
|
-
end
|
83
|
-
end
|
84
|
-
|
85
|
-
def test_image_mimetypes
|
86
|
-
assert_equal %w(image/gif image/jpeg image/pjpeg image/png image/tiff),
|
87
|
-
Comfy::Cms::File::IMAGE_MIMETYPES
|
88
|
-
end
|
89
|
-
|
90
|
-
def test_scope_images
|
91
|
-
file = comfy_cms_files(:default)
|
92
|
-
assert_equal 'image/jpeg', file.file_content_type
|
93
|
-
assert_equal 1, Comfy::Cms::File.images.count
|
94
|
-
assert_equal 0, Comfy::Cms::File.not_images.count
|
95
|
-
|
96
|
-
file.update_columns(:file_content_type => 'application/pdf')
|
97
|
-
assert_equal 0, Comfy::Cms::File.images.count
|
98
|
-
assert_equal 1, Comfy::Cms::File.not_images.count
|
99
|
-
end
|
100
|
-
|
101
|
-
def test_scope_not_page_file
|
102
|
-
file = comfy_cms_files(:default)
|
103
|
-
assert file.block.blank?
|
104
|
-
assert_equal 1, Comfy::Cms::File.not_page_file.count
|
105
|
-
|
106
|
-
file.update_attribute(:block, comfy_cms_blocks(:default_field_text))
|
107
|
-
assert_equal 0, Comfy::Cms::File.not_page_file.count
|
30
|
+
|
31
|
+
def test_scope_with_images
|
32
|
+
assert_equal 1, Comfy::Cms::File.with_attached_attachment.with_images.count
|
33
|
+
active_storage_blobs(:default).update_column(:content_type, "application/pdf")
|
34
|
+
assert_equal 0, Comfy::Cms::File.with_attached_attachment.with_images.count
|
108
35
|
end
|
109
|
-
|
110
|
-
def
|
36
|
+
|
37
|
+
def test_label
|
111
38
|
file = comfy_cms_files(:default)
|
112
|
-
assert_equal
|
113
|
-
|
39
|
+
assert_equal "default file", file.label
|
40
|
+
file.update_column(:label, "")
|
41
|
+
assert_equal "default.jpg", file.label
|
114
42
|
end
|
115
|
-
|
116
43
|
end
|