occams 1.0.7.3 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/coveralls.yml +11 -9
  3. data/.github/workflows/rubyonrails.yml +18 -15
  4. data/.gitignore +19 -16
  5. data/CHANGELOG.md +29 -12
  6. data/CONTRIBUTING.md +3 -4
  7. data/Gemfile +8 -6
  8. data/README.md +4 -5
  9. data/app/controllers/concerns/occams/reorder_action.rb +3 -0
  10. data/app/controllers/occams/admin/cms/pages_controller.rb +8 -0
  11. data/app/models/concerns/occams/cms/with_fragments.rb +1 -1
  12. data/app/models/occams/cms/fragment.rb +1 -1
  13. data/app/models/occams/cms/layout.rb +3 -1
  14. data/app/models/occams/cms/revision.rb +1 -1
  15. data/app/views/layouts/occams/admin/cms/_left.html.haml +1 -1
  16. data/bin/rails +3 -3
  17. data/bin/rake +2 -2
  18. data/bin/setup +11 -11
  19. data/config/application.rb +23 -6
  20. data/config/boot.rb +1 -4
  21. data/config/database.yml +30 -1
  22. data/config/environments/development.rb +9 -11
  23. data/config/environments/production.rb +26 -22
  24. data/config/environments/test.rb +18 -7
  25. data/config/initializers/content_security_policy.rb +2 -3
  26. data/config/initializers/filter_parameter_logging.rb +3 -3
  27. data/config/initializers/inflections.rb +0 -1
  28. data/config/initializers/new_framework_defaults_7_1.rb +224 -0
  29. data/config/initializers/permissions_policy.rb +10 -9
  30. data/config/locales/en.yml +3 -3
  31. data/gemfiles/6.1.gemfile +7 -4
  32. data/gemfiles/7.0.gemfile +6 -4
  33. data/gemfiles/7.1.gemfile +37 -0
  34. data/lib/generators/occams/cms/README +10 -2
  35. data/lib/occams/configuration.rb +1 -1
  36. data/lib/occams/content/tags/asset.rb +2 -2
  37. data/lib/occams/content/tags/audio.rb +2 -2
  38. data/lib/occams/content/tags/breadcrumbs.rb +2 -2
  39. data/lib/occams/content/tags/checkbox.rb +2 -2
  40. data/lib/occams/content/tags/children.rb +2 -2
  41. data/lib/occams/content/tags/date.rb +2 -2
  42. data/lib/occams/content/tags/datetime.rb +2 -2
  43. data/lib/occams/content/tags/file.rb +3 -3
  44. data/lib/occams/content/tags/file_link.rb +3 -3
  45. data/lib/occams/content/tags/files.rb +2 -2
  46. data/lib/occams/content/tags/fragment.rb +2 -2
  47. data/lib/occams/content/tags/helper.rb +2 -2
  48. data/lib/occams/content/tags/markdown.rb +2 -2
  49. data/lib/occams/content/tags/mixins/file_content.rb +1 -1
  50. data/lib/occams/content/tags/number.rb +2 -2
  51. data/lib/occams/content/tags/page_file_link.rb +3 -3
  52. data/lib/occams/content/tags/partial.rb +2 -2
  53. data/lib/occams/content/tags/siblings.rb +5 -2
  54. data/lib/occams/content/tags/snippet.rb +2 -2
  55. data/lib/occams/content/tags/template.rb +2 -2
  56. data/lib/occams/content/tags/text.rb +2 -2
  57. data/lib/occams/content/tags/textarea.rb +3 -2
  58. data/lib/occams/content/tags/wysiwyg.rb +2 -2
  59. data/lib/occams/content/tags.rb +28 -0
  60. data/lib/occams/content.rb +1 -26
  61. data/lib/occams/extensions/acts_as_tree.rb +3 -3
  62. data/lib/occams/extensions/has_revisions.rb +3 -3
  63. data/lib/occams/extensions.rb +8 -0
  64. data/lib/occams/routing.rb +74 -5
  65. data/lib/occams/version.rb +1 -1
  66. data/lib/occams.rb +3 -3
  67. data/occams.gemspec +13 -13
  68. metadata +9 -7
  69. data/lib/occams/routes/cms.rb +0 -16
  70. data/lib/occams/routes/cms_admin.rb +0 -56
data/lib/occams/routes/cms.rb DELETED
@@ -1,16 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- class ActionDispatch::Routing::Mapper
4
- def occams_route_cms(options = {})
5
- Occams.configuration.public_cms_path = options[:path]
6
-
7
- scope module: :occams, as: :occams do
8
- namespace :cms, path: options[:path] do
9
- get 'cms-css/:site_id/:identifier(/:cache_buster)' => 'assets#render_css', as: 'render_css'
10
- get 'cms-js/:site_id/:identifier(/:cache_buster)' => 'assets#render_js', as: 'render_js'
11
-
12
- get '(*cms_path)' => 'content#show', as: 'render_page', action: '/:format'
13
- end
14
- end
15
- end
16
- end
data/lib/occams/routes/cms_admin.rb DELETED
@@ -1,56 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- class ActionDispatch::Routing::Mapper
4
- def occams_route_cms_admin(path: 'admin')
5
- scope module: :occams, as: :occams do
6
- scope module: :admin do
7
- namespace :cms, as: :admin_cms, path: path, except: :show do
8
- get '/', to: 'base#jump'
9
-
10
- concern :with_revisions do |options|
11
- resources :revisions, options.merge(only: %i[index show]) do
12
- patch :revert, on: :member
13
- end
14
- end
15
-
16
- concern :with_reorder do
17
- put :reorder, on: :collection
18
- end
19
-
20
- concern :with_form_fragments do
21
- get :form_fragments, on: :member
22
- end
23
-
24
- resources :sites do
25
- resources :pages do
26
- concerns :with_reorder
27
- concerns :with_form_fragments
28
- concerns :with_revisions, controller: 'revisions/page'
29
-
30
- get :toggle_branch, on: :member
31
-
32
- resources :translations, except: [:index] do
33
- concerns :with_form_fragments
34
- concerns :with_revisions, controller: 'revisions/translation'
35
- end
36
- end
37
-
38
- resources :files, concerns: [:with_reorder]
39
-
40
- resources :layouts do
41
- concerns :with_reorder
42
- concerns :with_revisions, controller: 'revisions/layout'
43
- end
44
-
45
- resources :snippets do
46
- concerns :with_reorder
47
- concerns :with_revisions, controller: 'revisions/snippet'
48
- end
49
-
50
- resources :categories
51
- end
52
- end
53
- end
54
- end
55
- end
56
- end