archangel 0.3.0 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.codeclimate.yml +5 -1
- data/.erb-lint.yml +23 -0
- data/.eslintrc.json +1 -1
- data/.nvmrc +1 -1
- data/.rubocop.yml +7 -1
- data/.rubocop_exclude.yml +0 -1
- data/.sass-lint.yml +8 -0
- data/.travis.yml +13 -5
- data/Gemfile +19 -13
- data/README.md +10 -6
- data/app/assets/javascripts/archangel/input/datetimepicker.js +31 -77
- data/app/assets/javascripts/archangel/input/meta_keywords.js +0 -12
- data/app/assets/javascripts/archangel/input/wysiwyg.js.erb +51 -36
- data/app/assets/javascripts/archangel/object/flash.js +11 -8
- data/app/assets/javascripts/archangel/object/routes/backend.js +10 -10
- data/app/controllers/archangel/application_controller.rb +23 -13
- data/app/controllers/archangel/auth/invitations_controller.rb +22 -0
- data/app/controllers/archangel/auth/registrations_controller.rb +7 -3
- data/app/controllers/archangel/auth_controller.rb +8 -3
- data/app/controllers/archangel/backend/assets_controller.rb +9 -11
- data/app/controllers/archangel/backend/collections_controller.rb +3 -3
- data/app/controllers/archangel/backend/dashboards_controller.rb +1 -1
- data/app/controllers/archangel/backend/designs_controller.rb +43 -0
- data/app/controllers/archangel/backend/entries_controller.rb +25 -40
- data/app/controllers/archangel/backend/pages_controller.rb +7 -5
- data/app/controllers/archangel/backend/profiles_controller.rb +3 -2
- data/app/controllers/archangel/backend/sites_controller.rb +8 -14
- data/app/controllers/archangel/backend/users_controller.rb +6 -11
- data/app/controllers/archangel/backend/widgets_controller.rb +3 -3
- data/app/controllers/archangel/backend_controller.rb +6 -4
- data/app/controllers/archangel/frontend/homepages_controller.rb +33 -0
- data/app/controllers/archangel/frontend/pages_controller.rb +32 -43
- data/app/controllers/archangel/frontend_controller.rb +25 -1
- data/app/controllers/concerns/archangel/controllers/authenticatable_concern.rb +19 -0
- data/app/controllers/concerns/archangel/controllers/authorizable_concern.rb +19 -0
- data/app/controllers/concerns/archangel/controllers/metatagable_concern.rb +45 -0
- data/app/controllers/concerns/archangel/controllers/paginatable_concern.rb +43 -0
- data/app/controllers/concerns/archangel/controllers/resourceful_concern.rb +63 -26
- data/app/controllers/concerns/archangel/controllers/skip_authorizable_concern.rb +19 -0
- data/app/controllers/concerns/archangel/controllers/themable_concern.rb +34 -0
- data/app/controllers/concerns/archangel/helpers/actionable_concern.rb +76 -0
- data/app/helpers/archangel/application_helper.rb +35 -1
- data/app/helpers/archangel/backend/metatags_helper.rb +52 -0
- data/app/models/archangel/asset.rb +1 -1
- data/app/models/archangel/collection.rb +4 -7
- data/app/models/archangel/{template.rb → design.rb} +5 -13
- data/app/models/archangel/entry.rb +8 -28
- data/app/models/archangel/field.rb +1 -1
- data/app/models/archangel/page.rb +12 -48
- data/app/models/archangel/site.rb +17 -11
- data/app/models/archangel/user.rb +14 -7
- data/app/models/archangel/widget.rb +4 -4
- data/app/models/concerns/archangel/models/entry_validatable_concern.rb +74 -0
- data/app/models/concerns/archangel/models/metatagable_concern.rb +22 -0
- data/app/models/concerns/archangel/models/publishable_concern.rb +57 -0
- data/app/{helpers/archangel/auth_helper.rb → policies/archangel/design_policy.rb} +2 -2
- data/app/policies/archangel/site_policy.rb +0 -9
- data/app/services/archangel/{template_render_service.rb → design_render_service.rb} +3 -3
- data/app/services/archangel/render_service.rb +1 -1
- data/app/themes/default/assets/javascripts/default/auth.js +10 -13
- data/app/themes/default/assets/javascripts/default/backend.js +16 -37
- data/app/themes/default/assets/javascripts/default/backend/archangel.js +25 -0
- data/app/themes/default/assets/javascripts/default/backend/entries/sorting.js +37 -0
- data/app/themes/default/assets/javascripts/default/backend/misc/metatags.js +16 -0
- data/app/themes/default/assets/javascripts/default/common/flash.js +4 -43
- data/app/themes/default/assets/javascripts/default/frontend.js +11 -13
- data/app/themes/default/assets/stylesheets/default/_theme.scss +13 -0
- data/app/themes/default/assets/stylesheets/default/_variables.scss +113 -0
- data/app/themes/default/assets/stylesheets/default/auth.css +15 -13
- data/app/themes/default/assets/stylesheets/default/auth/_flash.scss +9 -0
- data/app/themes/default/assets/stylesheets/default/auth/default.scss +7 -0
- data/app/themes/default/assets/stylesheets/default/backend.css +10 -9
- data/app/themes/default/assets/stylesheets/default/backend/_entries.scss +25 -0
- data/app/themes/default/assets/stylesheets/default/backend/_flash.scss +19 -0
- data/app/themes/default/assets/stylesheets/default/backend/_footer.scss +15 -0
- data/app/themes/default/assets/stylesheets/default/backend/_global.scss +22 -0
- data/app/themes/default/assets/stylesheets/default/backend/_sidebar.scss +60 -0
- data/app/themes/default/assets/stylesheets/default/backend/_tables.scss +18 -0
- data/app/themes/default/assets/stylesheets/default/backend/_top.scss +25 -0
- data/app/themes/default/assets/stylesheets/default/backend/default.scss +16 -0
- data/app/themes/default/assets/stylesheets/default/common/_borders.scss +7 -0
- data/app/themes/default/assets/stylesheets/default/common/_cards.scss +15 -0
- data/app/themes/default/assets/stylesheets/default/common/_forms.scss +5 -0
- data/app/themes/default/assets/stylesheets/default/common/_global.scss +8 -0
- data/app/themes/default/assets/stylesheets/default/common/_mixins.scss +38 -0
- data/app/themes/default/assets/stylesheets/default/common/_navbar.scss +90 -0
- data/app/themes/default/assets/stylesheets/default/frontend.css +15 -13
- data/app/themes/default/assets/stylesheets/default/frontend/default.scss +5 -0
- data/app/themes/default/views/layouts/auth.html.erb +10 -8
- data/app/themes/default/views/layouts/backend.html.erb +16 -9
- data/app/themes/default/views/layouts/backend/_footer.html.erb +10 -6
- data/app/themes/default/views/layouts/backend/_header.html.erb +28 -24
- data/app/themes/default/views/layouts/backend/_sidebar.html.erb +65 -45
- data/app/themes/default/views/layouts/frontend.html.erb +20 -0
- data/app/views/archangel/backend/assets/_asset.html.erb +14 -7
- data/app/views/archangel/backend/assets/_buttons.html.erb +7 -5
- data/app/views/archangel/backend/assets/_form.html.erb +1 -1
- data/app/views/archangel/backend/assets/edit.html.erb +8 -14
- data/app/views/archangel/backend/assets/index.html.erb +36 -44
- data/app/views/archangel/backend/assets/new.html.erb +8 -14
- data/app/views/archangel/backend/assets/show.html.erb +33 -39
- data/app/views/archangel/backend/collections/_buttons.html.erb +8 -6
- data/app/views/archangel/backend/collections/_collection.html.erb +5 -4
- data/app/views/archangel/backend/collections/_form.html.erb +1 -1
- data/app/views/archangel/backend/collections/edit.html.erb +8 -14
- data/app/views/archangel/backend/collections/index.html.erb +34 -42
- data/app/views/archangel/backend/collections/new.html.erb +8 -14
- data/app/views/archangel/backend/collections/show.html.erb +21 -27
- data/app/views/archangel/backend/dashboards/show.html.erb +7 -17
- data/app/views/archangel/backend/designs/_buttons.html.erb +20 -0
- data/app/views/archangel/backend/designs/_design.html.erb +11 -0
- data/app/views/archangel/backend/{templates → designs}/_form.html.erb +2 -2
- data/app/views/archangel/backend/designs/edit.html.erb +15 -0
- data/app/views/archangel/backend/designs/index.html.erb +43 -0
- data/app/views/archangel/backend/designs/new.html.erb +15 -0
- data/app/views/archangel/backend/designs/show.html.erb +23 -0
- data/app/views/archangel/backend/entries/_buttons.html.erb +8 -6
- data/app/views/archangel/backend/entries/_entry.html.erb +17 -9
- data/app/views/archangel/backend/entries/_form.html.erb +6 -11
- data/app/views/archangel/backend/entries/edit.html.erb +8 -14
- data/app/views/archangel/backend/entries/index.html.erb +39 -47
- data/app/views/archangel/backend/entries/new.html.erb +8 -14
- data/app/views/archangel/backend/entries/show.html.erb +14 -20
- data/app/views/archangel/backend/pages/_buttons.html.erb +7 -5
- data/app/views/archangel/backend/pages/_form.html.erb +4 -3
- data/app/views/archangel/backend/pages/_metatag_fields.html.erb +3 -3
- data/app/views/archangel/backend/pages/_page.html.erb +13 -8
- data/app/views/archangel/backend/pages/edit.html.erb +8 -14
- data/app/views/archangel/backend/pages/index.html.erb +35 -43
- data/app/views/archangel/backend/pages/new.html.erb +8 -14
- data/app/views/archangel/backend/pages/show.html.erb +15 -31
- data/app/views/archangel/backend/profiles/_buttons.html.erb +7 -2
- data/app/views/archangel/backend/profiles/_form.html.erb +4 -2
- data/app/views/archangel/backend/profiles/edit.html.erb +8 -14
- data/app/views/archangel/backend/profiles/show.html.erb +20 -26
- data/app/views/archangel/backend/sites/_buttons.html.erb +2 -2
- data/app/views/archangel/backend/sites/_form.html.erb +10 -2
- data/app/views/archangel/backend/sites/_metatag_fields.html.erb +3 -3
- data/app/views/archangel/backend/sites/edit.html.erb +8 -14
- data/app/views/archangel/backend/sites/show.html.erb +22 -28
- data/app/views/archangel/backend/users/_buttons.html.erb +7 -5
- data/app/views/archangel/backend/users/_form.html.erb +1 -1
- data/app/views/archangel/backend/users/_user.html.erb +10 -6
- data/app/views/archangel/backend/users/edit.html.erb +8 -14
- data/app/views/archangel/backend/users/index.html.erb +35 -43
- data/app/views/archangel/backend/users/new.html.erb +8 -14
- data/app/views/archangel/backend/users/show.html.erb +16 -27
- data/app/views/archangel/backend/widgets/_buttons.html.erb +7 -5
- data/app/views/archangel/backend/widgets/_form.html.erb +2 -2
- data/app/views/archangel/backend/widgets/_widget.html.erb +5 -4
- data/app/views/archangel/backend/widgets/edit.html.erb +8 -14
- data/app/views/archangel/backend/widgets/index.html.erb +34 -42
- data/app/views/archangel/backend/widgets/new.html.erb +8 -14
- data/app/views/archangel/backend/widgets/show.html.erb +20 -31
- data/app/views/archangel/frontend/pages/show.json.jbuilder +4 -3
- data/app/views/archangel/shared/_flash_messages.html.erb +5 -2
- data/app/views/devise/confirmations/new.html.erb +10 -8
- data/app/views/devise/invitations/edit.html.erb +17 -0
- data/app/views/devise/invitations/new.html.erb +15 -0
- data/app/views/devise/mailer/invitation_instructions.html.erb +11 -0
- data/app/views/devise/mailer/invitation_instructions.text.erb +11 -0
- data/app/views/devise/passwords/edit.html.erb +14 -18
- data/app/views/devise/passwords/new.html.erb +8 -8
- data/app/views/devise/registrations/edit.html.erb +18 -28
- data/app/views/devise/registrations/new.html.erb +19 -31
- data/app/views/devise/sessions/new.html.erb +11 -19
- data/app/views/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/devise/shared/_links.html.erb +19 -35
- data/app/views/devise/unlocks/new.html.erb +9 -8
- data/archangel.gemspec +12 -14
- data/config/initializers/devise.rb +1 -1
- data/config/initializers/simple_form.rb +18 -6
- data/config/initializers/simple_form_bootstrap.rb +520 -88
- data/config/locales/active_record.en.yml +14 -10
- data/config/locales/en.yml +10 -43
- data/config/locales/simple_form.en.yml +8 -7
- data/config/routes.rb +27 -40
- data/db/migrate/20190408164034_rename_archangel_pages_path_to_permalink.rb +5 -0
- data/db/migrate/20190417194514_add_settings_to_archangel_sites.rb +5 -0
- data/db/migrate/20190418150532_rename_archangel_templates_to_archangel_designs.rb +5 -0
- data/db/migrate/20190418150533_rename_archangel_pages_template_id_to_design_id.rb +5 -0
- data/db/migrate/20190418150534_rename_archangel_widgets_template_id_to_design_id.rb +5 -0
- data/db/migrate/20190421165525_rename_archangel_entries_available_at_to_published_at.rb +5 -0
- data/db/seeds.rb +41 -46
- data/docs/Developers.md +9 -7
- data/docs/Extension/Controllers.md +1 -1
- data/docs/Extension/Uploaders.md +1 -1
- data/lib/archangel.rb +2 -11
- data/lib/archangel/commands/base_command.rb +4 -8
- data/lib/archangel/commands/extension_command.rb +14 -14
- data/lib/archangel/commands/templates/common/Gemfile +24 -0
- data/lib/archangel/commands/templates/{extension → common}/Rakefile +1 -1
- data/lib/archangel/commands/templates/{extension → common}/bin/rails.tt +0 -0
- data/lib/archangel/commands/templates/{extension → common}/lib/%extension_name%.rb.tt +0 -0
- data/lib/archangel/commands/templates/{extension → common}/lib/%extension_name%/engine.rb.tt +0 -0
- data/lib/archangel/commands/templates/{extension → common}/lib/%extension_name%/version.rb.tt +0 -0
- data/lib/archangel/commands/templates/common/spec/rails_helper.rb.tt +0 -4
- data/lib/archangel/commands/templates/extension/lib/generators/%extension_name%/install/install_generator.rb.tt +10 -10
- data/lib/archangel/commands/templates/theme/README.md +2 -2
- data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/config/locales/en.yml.tt +1 -1
- data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/views/layouts/frontend.html.erb +20 -0
- data/lib/archangel/commands/templates/theme/theme.gemspec.tt +3 -3
- data/lib/archangel/commands/theme_command.rb +30 -27
- data/lib/archangel/config.rb +1 -2
- data/lib/archangel/constants/theme.rb +1 -1
- data/lib/archangel/engine.rb +3 -1
- data/lib/archangel/i18n.rb +5 -1
- data/lib/archangel/liquid/drop.rb +3 -45
- data/lib/archangel/liquid/drops/page_drop.rb +4 -4
- data/lib/archangel/liquid/drops/site_drop.rb +1 -0
- data/lib/archangel/liquid/tags/asset_tag.rb +4 -5
- data/lib/archangel/liquid/tags/collection_tag.rb +3 -5
- data/lib/archangel/liquid/tags/collectionfor_tag.rb +3 -4
- data/lib/archangel/liquid/tags/gist_tag.rb +3 -3
- data/lib/archangel/liquid/tags/noembed_tag.rb +1 -1
- data/lib/archangel/liquid/tags/vimeo_tag.rb +15 -9
- data/lib/archangel/liquid/tags/widget_tag.rb +9 -12
- data/lib/archangel/liquid/tags/youtube_tag.rb +44 -30
- data/lib/archangel/testing_support/factories/{archangel_templates.rb → archangel_designs.rb} +4 -4
- data/lib/archangel/testing_support/factories/archangel_entries.rb +5 -5
- data/lib/archangel/testing_support/factories/archangel_pages.rb +3 -3
- data/lib/archangel/testing_support/factories/archangel_users.rb +6 -0
- data/lib/archangel/testing_support/factories/archangel_widgets.rb +3 -3
- data/lib/archangel/testing_support/helpers/authorization_helpers.rb +5 -29
- data/lib/archangel/testing_support/helpers/fill_in_auth_form_helpers.rb +34 -0
- data/lib/archangel/testing_support/helpers/fill_in_form_helpers.rb +21 -0
- data/lib/archangel/testing_support/support/capybara.rb +0 -3
- data/lib/archangel/testing_support/support/shoulda.rb +0 -1
- data/lib/archangel/version.rb +5 -1
- data/lib/generators/archangel/install/install_generator.rb +15 -33
- data/lib/generators/archangel/install/templates/config/archangel.yml +0 -5
- data/lib/templates/erb/scaffold/_form.html.erb +2 -2
- data/package.json +5 -12
- data/spec/features/auth/invitation_spec.rb +86 -0
- data/spec/features/auth/log_in/attempts_spec.rb +50 -0
- data/spec/features/auth/log_in/locked_spec.rb +29 -0
- data/spec/features/auth/log_in/log_in_spec.rb +51 -0
- data/spec/features/auth/log_in/unconfirmed_spec.rb +22 -0
- data/spec/features/auth/log_out_spec.rb +11 -4
- data/spec/features/auth/password_reset_spec.rb +28 -0
- data/spec/features/auth/registration_spec.rb +28 -16
- data/spec/features/backend/assets/create_spec.rb +68 -0
- data/spec/features/backend/assets/delete_spec.rb +32 -0
- data/spec/features/backend/assets/listing_spec.rb +83 -0
- data/spec/features/backend/assets/show_spec.rb +57 -0
- data/spec/features/backend/collections/create_spec.rb +97 -0
- data/spec/features/backend/collections/delete_spec.rb +32 -0
- data/spec/features/backend/collections/listing_spec.rb +93 -0
- data/spec/features/backend/collections/show_spec.rb +43 -0
- data/spec/features/backend/dashboard/show_spec.rb +17 -0
- data/spec/features/backend/designs/create_spec.rb +76 -0
- data/spec/features/backend/designs/delete_spec.rb +32 -0
- data/spec/features/backend/designs/listing_spec.rb +77 -0
- data/spec/features/backend/designs/show_spec.rb +48 -0
- data/spec/features/backend/entries/create_spec.rb +98 -0
- data/spec/features/backend/entries/delete_spec.rb +35 -0
- data/spec/features/backend/entries/listing_sorting_spec.rb +32 -0
- data/spec/features/backend/entries/listing_spec.rb +100 -0
- data/spec/features/backend/entries/show_spec.rb +62 -0
- data/spec/features/backend/pages/create_metatags_spec.rb +59 -0
- data/spec/features/backend/pages/create_spec.rb +143 -0
- data/spec/features/backend/pages/delete_spec.rb +32 -0
- data/spec/features/backend/pages/liquid_tags_spec.rb +159 -0
- data/spec/features/backend/pages/listing_spec.rb +75 -0
- data/spec/features/backend/pages/show_spec.rb +47 -0
- data/spec/features/backend/profile/delete_spec.rb +41 -0
- data/spec/features/backend/profile/show_spec.rb +46 -0
- data/spec/features/backend/profile/update_spec.rb +144 -0
- data/spec/features/backend/site/show_spec.rb +46 -0
- data/spec/features/backend/site/update_spec.rb +46 -0
- data/spec/features/backend/site/update_with_metatags_spec.rb +45 -0
- data/spec/features/backend/users/create_spec.rb +90 -0
- data/spec/features/backend/users/delete_spec.rb +32 -0
- data/spec/features/backend/users/listing_spec.rb +69 -0
- data/spec/features/backend/users/show_spec.rb +87 -0
- data/spec/features/backend/users/update_spec.rb +49 -0
- data/spec/features/backend/widgets/create_spec.rb +111 -0
- data/spec/features/backend/widgets/delete_spec.rb +42 -0
- data/spec/features/backend/widgets/listing_spec.rb +89 -0
- data/spec/features/backend/widgets/show_spec.rb +47 -0
- data/spec/features/frontend/liquid/filters/link_to_spec.rb +49 -0
- data/spec/features/frontend/liquid/tags/asset_spec.rb +81 -0
- data/spec/features/frontend/liquid/tags/collection_tag_spec.rb +94 -0
- data/spec/features/frontend/liquid/tags/collectionfor_tag_spec.rb +159 -0
- data/spec/features/frontend/liquid/tags/gist_spec.rb +57 -0
- data/spec/features/frontend/liquid/tags/noembed_tag_spec.rb +106 -0
- data/spec/features/frontend/liquid/tags/vimeo_spec.rb +79 -0
- data/spec/features/frontend/liquid/tags/widget_spec.rb +40 -0
- data/spec/features/frontend/liquid/tags/youtube_spec.rb +89 -0
- data/spec/features/frontend/liquid/variables/current_page_spec.rb +74 -0
- data/spec/features/frontend/liquid/variables/page_spec.rb +58 -0
- data/spec/features/frontend/liquid/variables/site_spec.rb +46 -0
- data/spec/features/frontend/liquid/variables/unknown_spec.rb +19 -0
- data/spec/features/frontend/metatags/default_spec.rb +46 -0
- data/spec/features/frontend/metatags/page_spec.rb +58 -0
- data/spec/features/frontend/metatags/site_spec.rb +42 -0
- data/spec/fixtures/schemas/backend/assets/wysiwyg_error.json +11 -0
- data/spec/fixtures/schemas/backend/assets/wysiwyg_url.json +11 -0
- data/spec/fixtures/schemas/frontend/errors/not_found.json +11 -0
- data/spec/fixtures/schemas/frontend/pages/show.json +25 -0
- data/spec/requests/backend/assets_spec.rb +81 -0
- data/spec/requests/backend/designs_spec.rb +115 -0
- data/spec/requests/backend/entries_spec.rb +32 -0
- data/spec/requests/backend/pages_spec.rb +113 -0
- data/spec/requests/backend/site_spec.rb +65 -0
- data/spec/requests/backend/widgets_spec.rb +109 -0
- data/spec/requests/frontend/html/homepage_spec.rb +70 -0
- data/spec/requests/frontend/html/nested_page_spec.rb +97 -0
- data/spec/requests/frontend/html/page_spec.rb +78 -0
- data/spec/requests/frontend/json/homepage_spec.rb +80 -0
- data/spec/requests/frontend/json/nested_page_spec.rb +111 -0
- data/spec/requests/frontend/json/page_spec.rb +92 -0
- data/spec/support/helpers/ajax_helpers.rb +27 -0
- data/spec/support/helpers/json_response.rb +18 -0
- data/{lib/archangel/testing_support → spec/support}/matchers/have_meta.rb +0 -0
- data/{lib/archangel/testing_support → spec/support}/matchers/have_title.rb +0 -0
- data/spec/support/matchers/match_response_schema.rb +12 -0
- data/spec/support/missing_translation.rb +13 -0
- data/spec/support/selenium.rb +26 -0
- data/spec/support/timecop.rb +15 -0
- data/spec/unit/helpers/archangel/application_helper_spec.rb +65 -0
- data/spec/unit/helpers/archangel/flash_helper_spec.rb +41 -0
- data/spec/{inputs → unit/inputs}/archangel/date_picker_input_spec.rb +0 -0
- data/spec/{inputs → unit/inputs}/archangel/date_time_picker_input_spec.rb +0 -0
- data/spec/{inputs → unit/inputs}/archangel/field_classification_input_spec.rb +0 -0
- data/spec/{inputs → unit/inputs}/archangel/language_input_spec.rb +0 -0
- data/spec/{inputs → unit/inputs}/archangel/meta_keywords_input_spec.rb +0 -0
- data/spec/{inputs → unit/inputs}/archangel/role_input_spec.rb +0 -0
- data/spec/{inputs → unit/inputs}/archangel/theme_input_spec.rb +0 -0
- data/spec/{inputs → unit/inputs}/archangel/time_picker_input_spec.rb +0 -0
- data/spec/{inputs → unit/inputs}/archangel/wysiwyg_input_spec.rb +0 -0
- data/spec/{jobs → unit/jobs}/archangel/application_job_spec.rb +0 -0
- data/spec/{lib → unit/lib}/archangel/commands/extension_command_spec.rb +11 -6
- data/spec/{lib → unit/lib}/archangel/commands/theme_command_spec.rb +11 -6
- data/spec/{lib → unit/lib}/tasks/archangel/version_task_spec.rb +0 -0
- data/spec/{mailers → unit/mailers}/archangel/application_mailer_spec.rb +0 -0
- data/spec/{models → unit/models}/archangel/asset_spec.rb +7 -15
- data/spec/{models → unit/models}/archangel/collection_spec.rb +3 -16
- data/spec/unit/models/archangel/design_spec.rb +22 -0
- data/spec/unit/models/archangel/entry_spec.rb +104 -0
- data/spec/{models → unit/models}/archangel/field_spec.rb +5 -7
- data/spec/{models → unit/models}/archangel/metatag_spec.rb +1 -5
- data/spec/{models → unit/models}/archangel/page_spec.rb +46 -44
- data/spec/{models → unit/models}/archangel/site_spec.rb +15 -8
- data/spec/{models → unit/models}/archangel/user_spec.rb +29 -39
- data/spec/{models → unit/models}/archangel/widget_spec.rb +5 -20
- data/spec/{policies → unit/policies}/archangel/asset_policy_spec.rb +0 -0
- data/spec/{policies → unit/policies}/archangel/collection_policy_spec.rb +0 -0
- data/spec/{policies/archangel/template_policy_spec.rb → unit/policies/archangel/design_policy_spec.rb} +2 -2
- data/spec/{policies → unit/policies}/archangel/entries_policy_spec.rb +0 -0
- data/spec/{policies → unit/policies}/archangel/page_policy_spec.rb +0 -0
- data/spec/{policies → unit/policies}/archangel/site_policy_spec.rb +2 -6
- data/spec/{policies → unit/policies}/archangel/user_policy_spec.rb +0 -0
- data/spec/{policies → unit/policies}/archangel/widget_policy_spec.rb +0 -0
- data/spec/unit/services/archangel/design_render_service_spec.rb +46 -0
- data/spec/unit/services/archangel/render_service_spec.rb +43 -0
- data/spec/{uploaders → unit/uploaders}/archangel/application_uploader_spec.rb +4 -2
- data/spec/{uploaders → unit/uploaders}/archangel/asset_uploader_spec.rb +5 -3
- data/vendor/assets/javascripts/flatpickr/flatpickr.js +2 -0
- data/vendor/assets/javascripts/jodit/jodit.js +9 -0
- data/vendor/assets/javascripts/select2/select2.js +5891 -0
- data/vendor/assets/javascripts/sortable/sortable.js +2 -2
- data/vendor/assets/stylesheets/flatpickr/flatpickr.css +13 -0
- data/vendor/assets/stylesheets/jodit/jodit.css +296 -0
- data/vendor/assets/stylesheets/select2/select2.css +480 -0
- metadata +227 -322
- data/.editorconfig +0 -19
- data/.hound.yml +0 -21
- data/.jshintignore +0 -5
- data/.jshintrc +0 -30
- data/.rubocop_todo.yml +0 -3
- data/.scss-lint.yml +0 -22
- data/app/assets/javascripts/archangel/object/translate/datetimepicker.js.erb +0 -41
- data/app/assets/javascripts/archangel/object/translate/sortable.js.erb +0 -10
- data/app/assets/javascripts/archangel/sortable.js +0 -72
- data/app/controllers/archangel/backend/templates_controller.rb +0 -43
- data/app/controllers/concerns/archangel/actionable_concern.rb +0 -161
- data/app/controllers/concerns/archangel/authenticatable_concern.rb +0 -14
- data/app/controllers/concerns/archangel/authorizable_concern.rb +0 -14
- data/app/controllers/concerns/archangel/controllers/backend/resourceful_concern.rb +0 -28
- data/app/controllers/concerns/archangel/paginatable_concern.rb +0 -36
- data/app/controllers/concerns/archangel/seoable_concern.rb +0 -40
- data/app/controllers/concerns/archangel/skip_authorizable_concern.rb +0 -14
- data/app/controllers/concerns/archangel/themable_concern.rb +0 -27
- data/app/helpers/archangel/backend/assets_helper.rb +0 -14
- data/app/helpers/archangel/backend/collections_helper.rb +0 -14
- data/app/helpers/archangel/backend/dashboards_helper.rb +0 -14
- data/app/helpers/archangel/backend/entries_helper.rb +0 -14
- data/app/helpers/archangel/backend/pages_helper.rb +0 -14
- data/app/helpers/archangel/backend/sites_helper.rb +0 -14
- data/app/helpers/archangel/backend/templates_helper.rb +0 -14
- data/app/helpers/archangel/backend/users_helper.rb +0 -14
- data/app/helpers/archangel/backend/widgets_helper.rb +0 -14
- data/app/helpers/archangel/backend_helper.rb +0 -9
- data/app/helpers/archangel/frontend/pages_helper.rb +0 -14
- data/app/helpers/archangel/frontend_helper.rb +0 -9
- data/app/policies/archangel/template_policy.rb +0 -9
- data/app/themes/default/assets/javascripts/default/backend/core.js +0 -76
- data/app/themes/default/assets/javascripts/default/backend/templates.js +0 -26
- data/app/themes/default/assets/javascripts/default/common/cards.js +0 -28
- data/app/themes/default/assets/stylesheets/default/auth/core.scss +0 -20
- data/app/themes/default/assets/stylesheets/default/backend/bootstrap/_tables.scss +0 -40
- data/app/themes/default/assets/stylesheets/default/backend/core.scss +0 -23
- data/app/themes/default/assets/stylesheets/default/common/_bootstrap.scss +0 -49
- data/app/themes/default/assets/stylesheets/default/common/_selectize.scss +0 -348
- data/app/themes/default/assets/stylesheets/default/common/_variables.scss +0 -82
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_animate.scss +0 -27
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_aside.scss +0 -67
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_avatars.scss +0 -42
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_badge.scss +0 -3
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_breadcrumb-menu.scss +0 -36
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_breadcrumb.scss +0 -4
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_buttons.scss +0 -408
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_callout.scss +0 -58
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_card.scss +0 -199
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_charts.scss +0 -9
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_dropdown-menu-right.scss +0 -8
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_dropdown.scss +0 -70
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_footer.scss +0 -9
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_forms.scss +0 -4
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_grid.scss +0 -15
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_input-group.scss +0 -5
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_layout.scss +0 -390
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_loading.scss +0 -128
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_mixins.scss +0 -1
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_mobile.scss +0 -0
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_modal.scss +0 -12
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_nav.scss +0 -39
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_navbar.scss +0 -122
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_others.scss +0 -4
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_progress.scss +0 -15
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_rtl.scss +0 -287
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_sidebar.scss +0 -462
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_switches.scss +0 -286
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_tables.scss +0 -20
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_temp.scss +0 -39
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_typography.scss +0 -36
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_utilities.scss +0 -3
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_variables.scss +0 -208
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/_widgets.scss +0 -251
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/mixins/_all.scss +0 -117
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/utilities/_background.scss +0 -20
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/utilities/_borders.scss +0 -17
- data/app/themes/default/assets/stylesheets/default/common/bootstrap/utilities/_display.scss +0 -14
- data/app/themes/default/assets/stylesheets/default/frontend/core.scss +0 -20
- data/app/themes/default/views/layouts/frontend.liquid +0 -22
- data/app/views/archangel/backend/dashboards/_buttons.html.erb +0 -3
- data/app/views/archangel/backend/sites/_additional_colors.html.erb +0 -49
- data/app/views/archangel/backend/sites/_alerts.html.erb +0 -130
- data/app/views/archangel/backend/sites/_badge.html.erb +0 -99
- data/app/views/archangel/backend/sites/_button.html.erb +0 -243
- data/app/views/archangel/backend/sites/_buttons_group.html.erb +0 -230
- data/app/views/archangel/backend/sites/_cards.html.erb +0 -441
- data/app/views/archangel/backend/sites/_carousel.html.erb +0 -159
- data/app/views/archangel/backend/sites/_colors.html.erb +0 -41
- data/app/views/archangel/backend/sites/_display_headings.html.erb +0 -41
- data/app/views/archangel/backend/sites/_dl.html.erb +0 -38
- data/app/views/archangel/backend/sites/_dropdowns.html.erb +0 -475
- data/app/views/archangel/backend/sites/_forms.html.erb +0 -1176
- data/app/views/archangel/backend/sites/_grays.html.erb +0 -21
- data/app/views/archangel/backend/sites/_headings.html.erb +0 -21
- data/app/views/archangel/backend/sites/_inline_text.html.erb +0 -45
- data/app/views/archangel/backend/sites/_jumbotron.html.erb +0 -45
- data/app/views/archangel/backend/sites/_list_group.html.erb +0 -254
- data/app/views/archangel/backend/sites/_modals.html.erb +0 -41
- data/app/views/archangel/backend/sites/_navs.html.erb +0 -389
- data/app/views/archangel/backend/sites/_pagination.html.erb +0 -160
- data/app/views/archangel/backend/sites/_social_buttons.html.erb +0 -746
- data/app/views/archangel/backend/sites/_tables.html.erb +0 -372
- data/app/views/archangel/backend/sites/sample.html.erb +0 -38
- data/app/views/archangel/backend/templates/_buttons.html.erb +0 -18
- data/app/views/archangel/backend/templates/_template.html.erb +0 -10
- data/app/views/archangel/backend/templates/edit.html.erb +0 -21
- data/app/views/archangel/backend/templates/index.html.erb +0 -49
- data/app/views/archangel/backend/templates/new.html.erb +0 -21
- data/app/views/archangel/backend/templates/show.html.erb +0 -34
- data/config/initializers/liquid.rb +0 -4
- data/lib/archangel/commands/templates/common/.editorconfig +0 -19
- data/lib/archangel/commands/templates/common/.rubocop.yml +0 -32
- data/lib/archangel/commands/templates/extension/Gemfile +0 -27
- data/lib/archangel/commands/templates/extension/app/assets/javascripts/archangel/auth/%extension_name%.js.tt +0 -3
- data/lib/archangel/commands/templates/extension/app/assets/javascripts/archangel/backend/%extension_name%.js.tt +0 -3
- data/lib/archangel/commands/templates/extension/app/assets/javascripts/archangel/frontend/%extension_name%.js.tt +0 -3
- data/lib/archangel/commands/templates/extension/app/assets/stylesheets/archangel/auth/%extension_name%.css.tt +0 -5
- data/lib/archangel/commands/templates/extension/app/assets/stylesheets/archangel/backend/%extension_name%.css.tt +0 -5
- data/lib/archangel/commands/templates/extension/app/assets/stylesheets/archangel/frontend/%extension_name%.css.tt +0 -5
- data/lib/archangel/commands/templates/theme/Gemfile +0 -27
- data/lib/archangel/commands/templates/theme/Rakefile +0 -29
- data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/assets/javascripts/%theme_base_name%/auth.js +0 -2
- data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/assets/javascripts/%theme_base_name%/backend.js +0 -2
- data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/assets/stylesheets/%theme_base_name%/auth.css +0 -4
- data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/assets/stylesheets/%theme_base_name%/backend.css +0 -4
- data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/views/layouts/frontend.liquid +0 -18
- data/lib/archangel/commands/templates/theme/bin/rails.tt +0 -11
- data/lib/archangel/commands/templates/theme/lib/%theme_name%.rb.tt +0 -9
- data/lib/archangel/commands/templates/theme/lib/%theme_name%/engine.rb.tt +0 -29
- data/lib/archangel/commands/templates/theme/lib/%theme_name%/version.rb.tt +0 -5
- data/lib/archangel/liquid/tags/csrf_meta_tags_tag.rb +0 -29
- data/lib/archangel/liquid/tags/locale_tag.rb +0 -28
- data/lib/archangel/liquid/tags/meta_tags_tag.rb +0 -31
- data/lib/archangel/liquid/tags/text_direction_tag.rb +0 -29
- data/lib/archangel/liquid/tags/theme_javascript_tag.rb +0 -31
- data/lib/archangel/liquid/tags/theme_stylesheet_tag.rb +0 -31
- data/lib/archangel/liquid_view.rb +0 -68
- data/lib/archangel/testing_support/context/view_controller_context.rb +0 -55
- data/lib/archangel/testing_support/helpers/controller_helpers.rb +0 -20
- data/lib/archangel/testing_support/helpers/form_helpers.rb +0 -18
- data/lib/archangel/testing_support/helpers/routing_helpers.rb +0 -22
- data/lib/archangel/testing_support/support/controller.rb +0 -11
- data/lib/archangel/testing_support/support/liquid_filters.rb +0 -23
- data/lib/archangel/testing_support/support/liquid_tags.rb +0 -23
- data/lib/archangel/testing_support/support/verify_partial_doubles.rb +0 -21
- data/spec/controllers/archangel/application_controller_spec.rb +0 -183
- data/spec/controllers/archangel/auth/registrations_controller_spec.rb +0 -10
- data/spec/controllers/archangel/auth_controller_spec.rb +0 -8
- data/spec/controllers/archangel/backend/assets_controller_spec.rb +0 -226
- data/spec/controllers/archangel/backend/collections_controller_spec.rb +0 -252
- data/spec/controllers/archangel/backend/dashboards_controller_spec.rb +0 -27
- data/spec/controllers/archangel/backend/entries_controller_spec.rb +0 -273
- data/spec/controllers/archangel/backend/pages_controller_spec.rb +0 -220
- data/spec/controllers/archangel/backend/profiles_controller_spec.rb +0 -115
- data/spec/controllers/archangel/backend/sites_controller_spec.rb +0 -121
- data/spec/controllers/archangel/backend/templates_controller_spec.rb +0 -190
- data/spec/controllers/archangel/backend/users_controller_spec.rb +0 -181
- data/spec/controllers/archangel/backend/widgets_controller_spec.rb +0 -190
- data/spec/controllers/archangel/backend_controller_spec.rb +0 -8
- data/spec/controllers/archangel/frontend/pages_controller_spec.rb +0 -51
- data/spec/controllers/archangel/frontend_controller_spec.rb +0 -8
- data/spec/controllers/concerns/archangel/controllers/backend/resourceful_concern_spec.rb +0 -90
- data/spec/features/auth/log_in_spec.rb +0 -126
- data/spec/features/backend/pages/duplicate_slugs_spec.rb +0 -41
- data/spec/features/frontend/liquid_drop_variables_spec.rb +0 -133
- data/spec/features/frontend/pages/homepage_redirect_spec.rb +0 -15
- data/spec/features/frontend/pages/metatags_spec.rb +0 -73
- data/spec/helpers/archangel/application_helper_spec.rb +0 -30
- data/spec/helpers/archangel/auth_helper_spec.rb +0 -8
- data/spec/helpers/archangel/backend/assets_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend/collections_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend/dashboards_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend/entries_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend/pages_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend/sites_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend/templates_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend/users_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend/widgets_helper_spec.rb +0 -10
- data/spec/helpers/archangel/backend_helper_spec.rb +0 -8
- data/spec/helpers/archangel/flash_helper_spec.rb +0 -47
- data/spec/helpers/archangel/frontend/pages_helper_spec.rb +0 -10
- data/spec/helpers/archangel/frontend_helper_spec.rb +0 -8
- data/spec/lib/archangel/liquid/drop_spec.rb +0 -10
- data/spec/lib/archangel/liquid/drops/page_drop_spec.rb +0 -69
- data/spec/lib/archangel/liquid/drops/site_drop_spec.rb +0 -63
- data/spec/lib/archangel/liquid/filters/link_to_filter_spec.rb +0 -59
- data/spec/lib/archangel/liquid/tags/application_tag_spec.rb +0 -12
- data/spec/lib/archangel/liquid/tags/asset_tag_spec.rb +0 -91
- data/spec/lib/archangel/liquid/tags/collection_tag_spec.rb +0 -104
- data/spec/lib/archangel/liquid/tags/collectionfor_tag_spec.rb +0 -163
- data/spec/lib/archangel/liquid/tags/csrf_meta_tags_tag_spec.rb +0 -33
- data/spec/lib/archangel/liquid/tags/gist_tag_spec.rb +0 -42
- data/spec/lib/archangel/liquid/tags/locale_tag_spec.rb +0 -22
- data/spec/lib/archangel/liquid/tags/meta_tags_tag_spec.rb +0 -24
- data/spec/lib/archangel/liquid/tags/noembed_tag_spec.rb +0 -76
- data/spec/lib/archangel/liquid/tags/text_direction_tag_spec.rb +0 -32
- data/spec/lib/archangel/liquid/tags/theme_javascript_tag_spec.rb +0 -26
- data/spec/lib/archangel/liquid/tags/theme_stylesheet_tag_spec.rb +0 -28
- data/spec/lib/archangel/liquid/tags/vimeo_tag_spec.rb +0 -39
- data/spec/lib/archangel/liquid/tags/widget_tag_spec.rb +0 -59
- data/spec/lib/archangel/liquid/tags/youtube_tag_spec.rb +0 -39
- data/spec/models/archangel/entry_spec.rb +0 -62
- data/spec/models/archangel/template_spec.rb +0 -45
- data/spec/policies/archangel/application_policy_spec.rb +0 -8
- data/spec/services/archangel/render_service_spec.rb +0 -37
- data/spec/services/archangel/template_render_service_spec.rb +0 -42
- data/spec/support/.keep +0 -0
- data/spec/uploaders/archangel/avatar_uploader_spec.rb +0 -50
- data/spec/uploaders/archangel/logo_uploader_spec.rb +0 -50
- data/vendor/assets/icons/trumbowyg/icons.svg +0 -1
- data/vendor/assets/javascripts/daterangepicker/daterangepicker.js +0 -1529
- data/vendor/assets/javascripts/trumbowyg/plugins/allowtagsfrompaste/trumbowyg.allowtagsfrompaste.js +0 -143
- data/vendor/assets/javascripts/trumbowyg/plugins/base64/trumbowyg.base64.js +0 -129
- data/vendor/assets/javascripts/trumbowyg/plugins/cleanpaste/trumbowyg.cleanpaste.js +0 -110
- data/vendor/assets/javascripts/trumbowyg/plugins/colors/trumbowyg.colors.js +0 -183
- data/vendor/assets/javascripts/trumbowyg/plugins/noembed/trumbowyg.noembed.js +0 -104
- data/vendor/assets/javascripts/trumbowyg/plugins/upload/trumbowyg.upload.js +0 -261
- data/vendor/assets/javascripts/trumbowyg/trumbowyg.js +0 -1765
- data/vendor/assets/stylesheets/daterangepicker/_daterangepicker.scss +0 -405
- data/vendor/assets/stylesheets/trumbowyg/_trumbowyg.scss +0 -831
- data/vendor/assets/stylesheets/trumbowyg/plugins/colors/_trumbowyg.colors.scss +0 -38
@@ -0,0 +1,52 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Archangel
|
4
|
+
##
|
5
|
+
# Backend helpers
|
6
|
+
#
|
7
|
+
module Backend
|
8
|
+
##
|
9
|
+
# Metatags helpers
|
10
|
+
#
|
11
|
+
module MetatagsHelper
|
12
|
+
##
|
13
|
+
# Suggested site metatags
|
14
|
+
#
|
15
|
+
# @return [Array] suggested site metatags
|
16
|
+
#
|
17
|
+
def suggested_site_metatags
|
18
|
+
%w[description keywords author copyright viewport
|
19
|
+
google-site-verification] +
|
20
|
+
suggested_bot_metatags +
|
21
|
+
suggested_og_metatags +
|
22
|
+
suggested_twitter_metatags
|
23
|
+
end
|
24
|
+
|
25
|
+
##
|
26
|
+
# Suggested metatags
|
27
|
+
#
|
28
|
+
# @return [Array] suggested metatags
|
29
|
+
#
|
30
|
+
def suggested_metatags
|
31
|
+
%w[description keywords] +
|
32
|
+
suggested_bot_metatags +
|
33
|
+
suggested_og_metatags +
|
34
|
+
suggested_twitter_metatags
|
35
|
+
end
|
36
|
+
|
37
|
+
protected
|
38
|
+
|
39
|
+
def suggested_bot_metatags
|
40
|
+
%w[googlebot robots]
|
41
|
+
end
|
42
|
+
|
43
|
+
def suggested_og_metatags
|
44
|
+
%w[og:title og:image og:description]
|
45
|
+
end
|
46
|
+
|
47
|
+
def suggested_twitter_metatags
|
48
|
+
%w[twitter:card twitter:description twitter:image twitter:title]
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
@@ -14,17 +14,14 @@ module Archangel
|
|
14
14
|
validates :name, presence: true
|
15
15
|
validates :slug, presence: true, uniqueness: { scope: :site_id }
|
16
16
|
|
17
|
-
|
18
|
-
|
17
|
+
belongs_to :site
|
18
|
+
|
19
|
+
has_many :entries, dependent: :destroy
|
20
|
+
has_many :fields, dependent: :destroy
|
19
21
|
|
20
22
|
accepts_nested_attributes_for :fields, reject_if: :all_blank,
|
21
23
|
allow_destroy: true
|
22
24
|
|
23
|
-
belongs_to :site
|
24
|
-
|
25
|
-
has_many :entries
|
26
|
-
has_many :fields
|
27
|
-
|
28
25
|
##
|
29
26
|
# Overwrite resource id to `slug`
|
30
27
|
#
|
@@ -2,9 +2,9 @@
|
|
2
2
|
|
3
3
|
module Archangel
|
4
4
|
##
|
5
|
-
#
|
5
|
+
# Design model
|
6
6
|
#
|
7
|
-
class
|
7
|
+
class Design < ApplicationRecord
|
8
8
|
acts_as_paranoid
|
9
9
|
|
10
10
|
validates :content, presence: true
|
@@ -14,19 +14,11 @@ module Archangel
|
|
14
14
|
validate :valid_liquid_content
|
15
15
|
|
16
16
|
belongs_to :parent, -> { where(partial: false) },
|
17
|
-
class_name: "Archangel::
|
17
|
+
class_name: "Archangel::Design",
|
18
|
+
inverse_of: false,
|
18
19
|
optional: true
|
19
20
|
belongs_to :site
|
20
21
|
|
21
|
-
##
|
22
|
-
# Return string of partial status.
|
23
|
-
#
|
24
|
-
# @return [String] partial status
|
25
|
-
#
|
26
|
-
def status
|
27
|
-
partial? ? "partial" : "full"
|
28
|
-
end
|
29
|
-
|
30
22
|
protected
|
31
23
|
|
32
24
|
def valid_liquid_content
|
@@ -39,7 +31,7 @@ module Archangel
|
|
39
31
|
::Liquid::Template.parse(content)
|
40
32
|
|
41
33
|
true
|
42
|
-
rescue ::Liquid::SyntaxError
|
34
|
+
rescue ::Liquid::SyntaxError
|
43
35
|
false
|
44
36
|
end
|
45
37
|
end
|
@@ -5,45 +5,25 @@ module Archangel
|
|
5
5
|
# Entry model
|
6
6
|
#
|
7
7
|
class Entry < ApplicationRecord
|
8
|
-
|
8
|
+
include Archangel::Models::EntryValidatableConcern
|
9
|
+
include Archangel::Models::PublishableConcern
|
9
10
|
|
10
|
-
|
11
|
+
acts_as_paranoid
|
11
12
|
|
12
13
|
acts_as_list scope: :collection_id, top_of_list: 0, add_new_at: :top
|
13
14
|
|
14
15
|
validates :collection_id, presence: true
|
15
|
-
validates :available_at, allow_blank: true, date: true
|
16
|
-
validates :value, presence: true
|
17
16
|
|
18
17
|
belongs_to :collection
|
19
18
|
|
20
19
|
default_scope { order(position: :asc) }
|
21
20
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
# @return [Boolean] if available
|
27
|
-
#
|
28
|
-
def available?
|
29
|
-
available_at.present?
|
30
|
-
end
|
21
|
+
protected
|
22
|
+
|
23
|
+
def resource_value_fields
|
24
|
+
return [] if try(:collection).try(:fields).blank?
|
31
25
|
|
32
|
-
|
33
|
-
# Return string of availability status.
|
34
|
-
#
|
35
|
-
# @return [String] available status
|
36
|
-
#
|
37
|
-
def status
|
38
|
-
if available?
|
39
|
-
if available_at > Time.now
|
40
|
-
"future-available"
|
41
|
-
else
|
42
|
-
"available"
|
43
|
-
end
|
44
|
-
else
|
45
|
-
"unavailable"
|
46
|
-
end
|
26
|
+
collection.fields
|
47
27
|
end
|
48
28
|
end
|
49
29
|
end
|
@@ -5,6 +5,9 @@ module Archangel
|
|
5
5
|
# Page model
|
6
6
|
#
|
7
7
|
class Page < ApplicationRecord
|
8
|
+
include Archangel::Models::MetatagableConcern
|
9
|
+
include Archangel::Models::PublishableConcern
|
10
|
+
|
8
11
|
extend ActsAsTree::TreeView
|
9
12
|
|
10
13
|
acts_as_tree order: :title
|
@@ -12,7 +15,7 @@ module Archangel
|
|
12
15
|
|
13
16
|
before_validation :parameterize_slug
|
14
17
|
|
15
|
-
before_save :
|
18
|
+
before_save :build_page_permalink
|
16
19
|
|
17
20
|
after_save :homepage_reset
|
18
21
|
|
@@ -20,8 +23,7 @@ module Archangel
|
|
20
23
|
|
21
24
|
validates :content, presence: true
|
22
25
|
validates :homepage, inclusion: { in: [true, false] }
|
23
|
-
validates :
|
24
|
-
validates :published_at, allow_blank: true, date: true
|
26
|
+
validates :permalink, uniqueness: { scope: :site_id }
|
25
27
|
validates :slug, presence: true,
|
26
28
|
uniqueness: { scope: %i[parent_id site_id] }
|
27
29
|
validates :title, presence: true
|
@@ -29,52 +31,14 @@ module Archangel
|
|
29
31
|
validate :valid_liquid_content
|
30
32
|
validate :within_valid_path
|
31
33
|
|
34
|
+
belongs_to :design, -> { where(partial: false) },
|
35
|
+
inverse_of: false,
|
36
|
+
optional: true
|
32
37
|
belongs_to :parent, class_name: "Archangel::Page", optional: true
|
33
38
|
belongs_to :site
|
34
|
-
belongs_to :template, -> { where(partial: false) }, optional: true
|
35
|
-
|
36
|
-
has_many :metatags, as: :metatagable
|
37
|
-
|
38
|
-
accepts_nested_attributes_for :metatags, reject_if: :all_blank,
|
39
|
-
allow_destroy: true
|
40
|
-
|
41
|
-
scope :published, (lambda do
|
42
|
-
where.not(published_at: nil).where("published_at <= ?", Time.now)
|
43
|
-
end)
|
44
|
-
|
45
|
-
scope :unpublished, (lambda do
|
46
|
-
where("published_at IS NULL OR published_at > ?", Time.now)
|
47
|
-
end)
|
48
39
|
|
49
40
|
scope :homepage, (-> { where(homepage: true) })
|
50
41
|
|
51
|
-
##
|
52
|
-
# Check if Page is published. Published in the past, present and future.
|
53
|
-
# Future publication date is also considered published.
|
54
|
-
#
|
55
|
-
# @return [Boolean] if published
|
56
|
-
#
|
57
|
-
def published?
|
58
|
-
published_at.present?
|
59
|
-
end
|
60
|
-
|
61
|
-
##
|
62
|
-
# Return string of publication status.
|
63
|
-
#
|
64
|
-
# @return [String] publication status
|
65
|
-
#
|
66
|
-
def status
|
67
|
-
if published?
|
68
|
-
if published_at > Time.now
|
69
|
-
"future-published"
|
70
|
-
else
|
71
|
-
"published"
|
72
|
-
end
|
73
|
-
else
|
74
|
-
"unpublished"
|
75
|
-
end
|
76
|
-
end
|
77
|
-
|
78
42
|
##
|
79
43
|
# Liquid object for Page
|
80
44
|
#
|
@@ -102,10 +66,10 @@ module Archangel
|
|
102
66
|
self.slug = slug.to_s.downcase.parameterize
|
103
67
|
end
|
104
68
|
|
105
|
-
def
|
106
|
-
|
69
|
+
def build_page_permalink
|
70
|
+
parent_permalink = parent.blank? ? nil : parent.permalink
|
107
71
|
|
108
|
-
self.
|
72
|
+
self.permalink = [parent_permalink, slug].compact.join("/")
|
109
73
|
end
|
110
74
|
|
111
75
|
def homepage_reset
|
@@ -127,7 +91,7 @@ module Archangel
|
|
127
91
|
::Liquid::Template.parse(content)
|
128
92
|
|
129
93
|
true
|
130
|
-
rescue ::Liquid::SyntaxError
|
94
|
+
rescue ::Liquid::SyntaxError
|
131
95
|
false
|
132
96
|
end
|
133
97
|
|
@@ -5,10 +5,18 @@ module Archangel
|
|
5
5
|
# Site model
|
6
6
|
#
|
7
7
|
class Site < ApplicationRecord
|
8
|
+
include Archangel::Models::MetatagableConcern
|
9
|
+
|
8
10
|
acts_as_paranoid
|
9
11
|
|
10
12
|
mount_uploader :logo, Archangel::LogoUploader
|
11
13
|
|
14
|
+
typed_store :settings, coder: JSON do |setting|
|
15
|
+
setting.boolean :allow_registration, default: false
|
16
|
+
setting.boolean :homepage_redirect, default: false
|
17
|
+
setting.datetime :preferred_at, default: Time.current, accessor: false
|
18
|
+
end
|
19
|
+
|
12
20
|
validates :locale, presence: true, inclusion: { in: Archangel::LANGUAGES }
|
13
21
|
validates :logo, file_size: {
|
14
22
|
less_than_or_equal_to: Archangel.config.image_maximum_file_size
|
@@ -16,21 +24,19 @@ module Archangel
|
|
16
24
|
validates :name, presence: true
|
17
25
|
validates :theme, inclusion: { in: Archangel.themes }, allow_blank: true
|
18
26
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
has_many :
|
23
|
-
has_many :
|
24
|
-
has_many :
|
27
|
+
validates :allow_registration, inclusion: { in: [true, false] }
|
28
|
+
validates :homepage_redirect, inclusion: { in: [true, false] }
|
29
|
+
|
30
|
+
has_many :assets, dependent: :destroy
|
31
|
+
has_many :collections, dependent: :destroy
|
32
|
+
has_many :designs, dependent: :destroy
|
33
|
+
has_many :pages, dependent: :destroy
|
34
|
+
has_many :users, dependent: :destroy
|
35
|
+
has_many :widgets, dependent: :destroy
|
25
36
|
|
26
37
|
has_many :entries, through: :collections
|
27
38
|
has_many :fields, through: :collections
|
28
39
|
|
29
|
-
has_many :metatags, as: :metatagable
|
30
|
-
|
31
|
-
accepts_nested_attributes_for :metatags, reject_if: :all_blank,
|
32
|
-
allow_destroy: true
|
33
|
-
|
34
40
|
##
|
35
41
|
# Current site
|
36
42
|
#
|
@@ -5,13 +5,15 @@ module Archangel
|
|
5
5
|
# User model
|
6
6
|
#
|
7
7
|
class User < ApplicationRecord
|
8
|
+
include DeviseInvitable::Inviter
|
9
|
+
|
8
10
|
acts_as_paranoid
|
9
11
|
|
10
12
|
mount_uploader :avatar, Archangel::AvatarUploader
|
11
13
|
|
12
|
-
typed_store :preferences, coder: JSON do |
|
13
|
-
|
14
|
-
|
14
|
+
typed_store :preferences, coder: JSON do |preference|
|
15
|
+
preference.boolean :newsletter, default: false
|
16
|
+
preference.datetime :preferred_at, default: Time.current, accessor: false
|
15
17
|
end
|
16
18
|
|
17
19
|
before_validation :parameterize_username
|
@@ -27,12 +29,10 @@ module Archangel
|
|
27
29
|
validates :avatar, file_size: {
|
28
30
|
less_than_or_equal_to: Archangel.config.image_maximum_file_size
|
29
31
|
}
|
30
|
-
validates :email,
|
31
|
-
email: true,
|
32
|
+
validates :email, email: { message: Archangel.t(:email_invalid) },
|
32
33
|
uniqueness: { scope: :site_id }
|
34
|
+
|
33
35
|
validates :name, presence: true
|
34
|
-
validates :password, presence: true, length: { minimum: 8 }, on: :create
|
35
|
-
validates :password, allow_blank: true, length: { minimum: 8 }, on: :update
|
36
36
|
validates :role, presence: true, inclusion: { in: Archangel::ROLES }
|
37
37
|
validates :username, presence: true, uniqueness: { scope: :site_id }
|
38
38
|
|
@@ -40,6 +40,13 @@ module Archangel
|
|
40
40
|
|
41
41
|
belongs_to :site
|
42
42
|
|
43
|
+
##
|
44
|
+
# Only send the password reset email if the invitation has been accepted
|
45
|
+
#
|
46
|
+
def send_reset_password_instructions
|
47
|
+
super if invitation_token.blank?
|
48
|
+
end
|
49
|
+
|
43
50
|
##
|
44
51
|
# Overwrite resource id to `username`
|
45
52
|
#
|
@@ -17,10 +17,10 @@ module Archangel
|
|
17
17
|
|
18
18
|
validate :valid_liquid_content
|
19
19
|
|
20
|
-
belongs_to :
|
21
|
-
|
22
|
-
class_name: "Archangel::Template",
|
20
|
+
belongs_to :design, -> { where(partial: true) },
|
21
|
+
inverse_of: false,
|
23
22
|
optional: true
|
23
|
+
belongs_to :site
|
24
24
|
|
25
25
|
##
|
26
26
|
# Overwrite resource id to `slug`
|
@@ -55,7 +55,7 @@ module Archangel
|
|
55
55
|
::Liquid::Template.parse(content)
|
56
56
|
|
57
57
|
true
|
58
|
-
rescue ::Liquid::SyntaxError
|
58
|
+
rescue ::Liquid::SyntaxError
|
59
59
|
false
|
60
60
|
end
|
61
61
|
end
|
@@ -0,0 +1,74 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Archangel
|
4
|
+
##
|
5
|
+
# Model concerns
|
6
|
+
#
|
7
|
+
module Models
|
8
|
+
##
|
9
|
+
# Entry validation concern
|
10
|
+
#
|
11
|
+
module EntryValidatableConcern
|
12
|
+
extend ActiveSupport::Concern
|
13
|
+
|
14
|
+
included do
|
15
|
+
store :value, coder: JSON
|
16
|
+
|
17
|
+
validates :value, presence: true, allow_blank: true
|
18
|
+
|
19
|
+
after_initialize :add_accessors_for_entry_fields
|
20
|
+
after_initialize :add_presence_validator_for_entry_fields
|
21
|
+
after_initialize :add_classification_validator_for_entry_fields
|
22
|
+
|
23
|
+
def self.add_boolean_validator(field, _allow_blank)
|
24
|
+
validates field, inclusion: { in: %w[0 1] }
|
25
|
+
end
|
26
|
+
|
27
|
+
def self.add_email_validator(field, allow_blank)
|
28
|
+
validates field, allow_blank: allow_blank,
|
29
|
+
email: { message: "not a valid email address" }
|
30
|
+
end
|
31
|
+
|
32
|
+
def self.add_integer_validator(field, allow_blank)
|
33
|
+
validates field, allow_blank: allow_blank,
|
34
|
+
numericality: {
|
35
|
+
only_integer: true,
|
36
|
+
message: "not a valid integer"
|
37
|
+
}
|
38
|
+
end
|
39
|
+
|
40
|
+
def self.add_url_validator(field, allow_blank)
|
41
|
+
validates field, allow_blank: allow_blank,
|
42
|
+
url: { message: "not a valid URL" }
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
def add_accessors_for_entry_fields
|
47
|
+
(resource_value_fields || []).each do |field|
|
48
|
+
singleton_class.class_eval do
|
49
|
+
store_accessor :value, field.slug.to_sym
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
def add_presence_validator_for_entry_fields
|
55
|
+
(resource_value_fields || []).each do |field|
|
56
|
+
singleton_class.class_eval do
|
57
|
+
validates field.slug.to_sym, presence: true if field.required?
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
def add_classification_validator_for_entry_fields
|
63
|
+
(resource_value_fields || []).each do |field|
|
64
|
+
singleton_class.class_eval do
|
65
|
+
if %w[boolean email integer url].include?(field.classification)
|
66
|
+
send("add_#{field.classification}_validator".to_sym,
|
67
|
+
field.slug.to_sym, !field.required?)
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|