occams 1.0.0 → 1.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/issue_template.md +2 -4
- data/.rubocop.yml +23 -40
- data/CHANGELOG.md +18 -3
- data/Gemfile +17 -17
- data/LICENSE +1 -1
- data/README.md +15 -19
- data/Rakefile +1 -1
- data/TODOS.md +6 -0
- data/app/controllers/application_controller.rb +0 -2
- data/app/controllers/concerns/occams/paginate.rb +0 -2
- data/app/controllers/concerns/occams/reorder_action.rb +0 -2
- data/app/controllers/occams/admin/base_controller.rb +1 -3
- data/app/controllers/occams/admin/cms/base_controller.rb +10 -11
- data/app/controllers/occams/admin/cms/categories_controller.rb +0 -2
- data/app/controllers/occams/admin/cms/files_controller.rb +21 -24
- data/app/controllers/occams/admin/cms/layouts_controller.rb +8 -9
- data/app/controllers/occams/admin/cms/pages_controller.rb +28 -29
- data/app/controllers/occams/admin/cms/revisions/base_controller.rb +5 -7
- data/app/controllers/occams/admin/cms/revisions/layout_controller.rb +1 -3
- data/app/controllers/occams/admin/cms/revisions/page_controller.rb +3 -5
- data/app/controllers/occams/admin/cms/revisions/snippet_controller.rb +1 -3
- data/app/controllers/occams/admin/cms/revisions/translation_controller.rb +3 -5
- data/app/controllers/occams/admin/cms/sites_controller.rb +7 -8
- data/app/controllers/occams/admin/cms/snippets_controller.rb +7 -8
- data/app/controllers/occams/admin/cms/translations_controller.rb +26 -28
- data/app/controllers/occams/cms/assets_controller.rb +5 -7
- data/app/controllers/occams/cms/base_controller.rb +7 -14
- data/app/controllers/occams/cms/content_controller.rb +19 -16
- data/app/helpers/occams/admin/cms_helper.rb +3 -5
- data/app/helpers/occams/cms_helper.rb +13 -10
- data/app/models/concerns/occams/cms/with_categories.rb +6 -8
- data/app/models/concerns/occams/cms/with_fragments.rb +6 -8
- data/app/models/occams/cms/categorization.rb +3 -5
- data/app/models/occams/cms/category.rb +5 -7
- data/app/models/occams/cms/file.rb +10 -10
- data/app/models/occams/cms/fragment.rb +5 -6
- data/app/models/occams/cms/layout.rb +11 -12
- data/app/models/occams/cms/page.rb +20 -17
- data/app/models/occams/cms/revision.rb +1 -3
- data/app/models/occams/cms/site.rb +16 -17
- data/app/models/occams/cms/snippet.rb +5 -7
- data/app/models/occams/cms/translation.rb +5 -6
- data/app/views/layouts/occams/admin/cms/_left.html.haml +5 -0
- data/app/views/occams/admin/cms/files/_file.html.haml +1 -1
- data/config/application.rb +4 -6
- data/config/boot.rb +4 -3
- data/config/environment.rb +1 -1
- data/config/environments/development.rb +2 -2
- data/config/environments/test.rb +1 -1
- data/config/initializers/occams.rb +2 -2
- data/config.ru +1 -1
- data/lib/generators/occams/cms/assets_generator.rb +3 -5
- data/lib/generators/occams/cms/cms_generator.rb +13 -15
- data/lib/generators/occams/cms/controllers_generator.rb +2 -4
- data/lib/generators/occams/cms/models_generator.rb +2 -4
- data/lib/generators/occams/cms/views_generator.rb +2 -4
- data/lib/generators/occams/scaffold/scaffold_generator.rb +19 -20
- data/lib/occams/access_control/admin_authentication.rb +0 -2
- data/lib/occams/access_control/admin_authorization.rb +0 -2
- data/lib/occams/access_control/public_authentication.rb +0 -2
- data/lib/occams/access_control/public_authorization.rb +0 -2
- data/lib/occams/configuration.rb +33 -35
- data/lib/occams/content/block.rb +0 -2
- data/lib/occams/content/params_parser.rb +12 -14
- data/lib/occams/content/renderer.rb +15 -18
- data/lib/occams/content/tag.rb +1 -3
- data/lib/occams/content/tags/asset.rb +13 -15
- data/lib/occams/content/tags/checkbox.rb +4 -6
- data/lib/occams/content/tags/date.rb +2 -4
- data/lib/occams/content/tags/datetime.rb +4 -6
- data/lib/occams/content/tags/file.rb +13 -15
- data/lib/occams/content/tags/file_link.rb +9 -10
- data/lib/occams/content/tags/files.rb +10 -12
- data/lib/occams/content/tags/fragment.rb +4 -6
- data/lib/occams/content/tags/helper.rb +6 -8
- data/lib/occams/content/tags/markdown.rb +2 -4
- data/lib/occams/content/tags/mixins/file_content.rb +4 -5
- data/lib/occams/content/tags/number.rb +1 -3
- data/lib/occams/content/tags/page_file_link.rb +9 -10
- data/lib/occams/content/tags/partial.rb +5 -7
- data/lib/occams/content/tags/snippet.rb +3 -5
- data/lib/occams/content/tags/template.rb +5 -7
- data/lib/occams/content/tags/text.rb +1 -3
- data/lib/occams/content/tags/textarea.rb +1 -3
- data/lib/occams/content/tags/wysiwyg.rb +1 -3
- data/lib/occams/content.rb +22 -22
- data/lib/occams/engine.rb +11 -13
- data/lib/occams/error.rb +0 -8
- data/lib/occams/extensions/acts_as_tree.rb +14 -20
- data/lib/occams/extensions/has_revisions.rb +7 -11
- data/lib/occams/form_builder.rb +5 -9
- data/lib/occams/render_methods.rb +11 -17
- data/lib/occams/routes/cms.rb +3 -5
- data/lib/occams/routes/cms_admin.rb +7 -9
- data/lib/occams/routing.rb +2 -4
- data/lib/occams/seeds/file/exporter.rb +7 -13
- data/lib/occams/seeds/file/importer.rb +13 -17
- data/lib/occams/seeds/layout/exporter.rb +9 -11
- data/lib/occams/seeds/layout/importer.rb +9 -11
- data/lib/occams/seeds/page/exporter.rb +19 -23
- data/lib/occams/seeds/page/importer.rb +17 -19
- data/lib/occams/seeds/snippet/exporter.rb +6 -8
- data/lib/occams/seeds/snippet/importer.rb +6 -8
- data/lib/occams/seeds.rb +6 -12
- data/lib/occams/version.rb +1 -3
- data/lib/occams/view_hooks.rb +1 -3
- data/lib/occams.rb +25 -29
- data/lib/tasks/cms_seeds.rake +4 -4
- data/occams.gemspec +22 -21
- metadata +65 -10
- data/LICENSE.comfy +0 -20
data/occams.gemspec
CHANGED
@@ -1,33 +1,34 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
$LOAD_PATH.unshift File.expand_path(
|
4
|
-
require
|
3
|
+
$LOAD_PATH.unshift File.expand_path('lib', __dir__)
|
4
|
+
require 'occams/version'
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
|
-
s.name =
|
7
|
+
s.name = 'occams'
|
8
8
|
s.version = Occams::VERSION
|
9
|
-
s.authors = [
|
10
|
-
s.email = [
|
11
|
-
s.homepage =
|
12
|
-
s.summary =
|
13
|
-
s.description =
|
14
|
-
s.license =
|
9
|
+
s.authors = ['Andrew vonderLuft']
|
10
|
+
s.email = ['wonder@hey.com']
|
11
|
+
s.homepage = 'http://github.com/avonderluft/occams'
|
12
|
+
s.summary = 'Rails 6-7+ CMS Engine'
|
13
|
+
s.description = 'Occams is a powerful Rails 6-7+ CMS Engine'
|
14
|
+
s.license = 'MIT'
|
15
15
|
|
16
16
|
s.files = `git ls-files -z`.split("\x0").reject do |f|
|
17
17
|
f.match(%r{^(test|doc)/})
|
18
18
|
end
|
19
19
|
|
20
|
-
s.required_ruby_version =
|
20
|
+
s.required_ruby_version = '>= 2.7.0'
|
21
|
+
s.metadata['rubygems_mfa_required'] = 'true'
|
21
22
|
|
22
|
-
s.
|
23
|
-
s.
|
24
|
-
s.
|
25
|
-
s.
|
26
|
-
s.
|
27
|
-
s.
|
28
|
-
s.
|
29
|
-
s.
|
30
|
-
s.add_dependency
|
31
|
-
s.
|
32
|
-
s.
|
23
|
+
s.add_runtime_dependency 'active_link_to', '~> 1.0', '>= 1.0.5'
|
24
|
+
s.add_runtime_dependency 'comfy_bootstrap_form', '~> 4.0', '>= 4.0.0'
|
25
|
+
s.add_runtime_dependency 'haml-rails', '~> 2.1', '>= 2.1.0'
|
26
|
+
s.add_runtime_dependency 'image_processing', '~> 1.12', '>= 1.12.2'
|
27
|
+
s.add_runtime_dependency 'jquery-rails', '~> 4.6', '>= 4.6.0'
|
28
|
+
s.add_runtime_dependency 'kramdown', '~> 2.4', '>= 2.4.0'
|
29
|
+
s.add_runtime_dependency 'mimemagic', '~> 0.4', '>= 0.4.3'
|
30
|
+
s.add_runtime_dependency 'mini_magick', '~> 4.12', '>= 4.12.0'
|
31
|
+
s.add_dependency 'rails', '>= 6.1.7.4'
|
32
|
+
s.add_runtime_dependency 'rails-i18n', '>= 6.0.0'
|
33
|
+
s.add_runtime_dependency 'sassc-rails', '~> 2.1', '>= 2.1.2'
|
33
34
|
end
|
metadata
CHANGED
@@ -1,19 +1,22 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: occams
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Andrew vonderLuft
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-08-
|
11
|
+
date: 2023-08-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: active_link_to
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
+
- - "~>"
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: '1.0'
|
17
20
|
- - ">="
|
18
21
|
- !ruby/object:Gem::Version
|
19
22
|
version: 1.0.5
|
@@ -21,6 +24,9 @@ dependencies:
|
|
21
24
|
prerelease: false
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
23
26
|
requirements:
|
27
|
+
- - "~>"
|
28
|
+
- !ruby/object:Gem::Version
|
29
|
+
version: '1.0'
|
24
30
|
- - ">="
|
25
31
|
- !ruby/object:Gem::Version
|
26
32
|
version: 1.0.5
|
@@ -28,6 +34,9 @@ dependencies:
|
|
28
34
|
name: comfy_bootstrap_form
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
30
36
|
requirements:
|
37
|
+
- - "~>"
|
38
|
+
- !ruby/object:Gem::Version
|
39
|
+
version: '4.0'
|
31
40
|
- - ">="
|
32
41
|
- !ruby/object:Gem::Version
|
33
42
|
version: 4.0.0
|
@@ -35,6 +44,9 @@ dependencies:
|
|
35
44
|
prerelease: false
|
36
45
|
version_requirements: !ruby/object:Gem::Requirement
|
37
46
|
requirements:
|
47
|
+
- - "~>"
|
48
|
+
- !ruby/object:Gem::Version
|
49
|
+
version: '4.0'
|
38
50
|
- - ">="
|
39
51
|
- !ruby/object:Gem::Version
|
40
52
|
version: 4.0.0
|
@@ -42,6 +54,9 @@ dependencies:
|
|
42
54
|
name: haml-rails
|
43
55
|
requirement: !ruby/object:Gem::Requirement
|
44
56
|
requirements:
|
57
|
+
- - "~>"
|
58
|
+
- !ruby/object:Gem::Version
|
59
|
+
version: '2.1'
|
45
60
|
- - ">="
|
46
61
|
- !ruby/object:Gem::Version
|
47
62
|
version: 2.1.0
|
@@ -49,6 +64,9 @@ dependencies:
|
|
49
64
|
prerelease: false
|
50
65
|
version_requirements: !ruby/object:Gem::Requirement
|
51
66
|
requirements:
|
67
|
+
- - "~>"
|
68
|
+
- !ruby/object:Gem::Version
|
69
|
+
version: '2.1'
|
52
70
|
- - ">="
|
53
71
|
- !ruby/object:Gem::Version
|
54
72
|
version: 2.1.0
|
@@ -56,6 +74,9 @@ dependencies:
|
|
56
74
|
name: image_processing
|
57
75
|
requirement: !ruby/object:Gem::Requirement
|
58
76
|
requirements:
|
77
|
+
- - "~>"
|
78
|
+
- !ruby/object:Gem::Version
|
79
|
+
version: '1.12'
|
59
80
|
- - ">="
|
60
81
|
- !ruby/object:Gem::Version
|
61
82
|
version: 1.12.2
|
@@ -63,6 +84,9 @@ dependencies:
|
|
63
84
|
prerelease: false
|
64
85
|
version_requirements: !ruby/object:Gem::Requirement
|
65
86
|
requirements:
|
87
|
+
- - "~>"
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: '1.12'
|
66
90
|
- - ">="
|
67
91
|
- !ruby/object:Gem::Version
|
68
92
|
version: 1.12.2
|
@@ -70,6 +94,9 @@ dependencies:
|
|
70
94
|
name: jquery-rails
|
71
95
|
requirement: !ruby/object:Gem::Requirement
|
72
96
|
requirements:
|
97
|
+
- - "~>"
|
98
|
+
- !ruby/object:Gem::Version
|
99
|
+
version: '4.6'
|
73
100
|
- - ">="
|
74
101
|
- !ruby/object:Gem::Version
|
75
102
|
version: 4.6.0
|
@@ -77,6 +104,9 @@ dependencies:
|
|
77
104
|
prerelease: false
|
78
105
|
version_requirements: !ruby/object:Gem::Requirement
|
79
106
|
requirements:
|
107
|
+
- - "~>"
|
108
|
+
- !ruby/object:Gem::Version
|
109
|
+
version: '4.6'
|
80
110
|
- - ">="
|
81
111
|
- !ruby/object:Gem::Version
|
82
112
|
version: 4.6.0
|
@@ -84,6 +114,9 @@ dependencies:
|
|
84
114
|
name: kramdown
|
85
115
|
requirement: !ruby/object:Gem::Requirement
|
86
116
|
requirements:
|
117
|
+
- - "~>"
|
118
|
+
- !ruby/object:Gem::Version
|
119
|
+
version: '2.4'
|
87
120
|
- - ">="
|
88
121
|
- !ruby/object:Gem::Version
|
89
122
|
version: 2.4.0
|
@@ -91,6 +124,9 @@ dependencies:
|
|
91
124
|
prerelease: false
|
92
125
|
version_requirements: !ruby/object:Gem::Requirement
|
93
126
|
requirements:
|
127
|
+
- - "~>"
|
128
|
+
- !ruby/object:Gem::Version
|
129
|
+
version: '2.4'
|
94
130
|
- - ">="
|
95
131
|
- !ruby/object:Gem::Version
|
96
132
|
version: 2.4.0
|
@@ -98,6 +134,9 @@ dependencies:
|
|
98
134
|
name: mimemagic
|
99
135
|
requirement: !ruby/object:Gem::Requirement
|
100
136
|
requirements:
|
137
|
+
- - "~>"
|
138
|
+
- !ruby/object:Gem::Version
|
139
|
+
version: '0.4'
|
101
140
|
- - ">="
|
102
141
|
- !ruby/object:Gem::Version
|
103
142
|
version: 0.4.3
|
@@ -105,6 +144,9 @@ dependencies:
|
|
105
144
|
prerelease: false
|
106
145
|
version_requirements: !ruby/object:Gem::Requirement
|
107
146
|
requirements:
|
147
|
+
- - "~>"
|
148
|
+
- !ruby/object:Gem::Version
|
149
|
+
version: '0.4'
|
108
150
|
- - ">="
|
109
151
|
- !ruby/object:Gem::Version
|
110
152
|
version: 0.4.3
|
@@ -112,6 +154,9 @@ dependencies:
|
|
112
154
|
name: mini_magick
|
113
155
|
requirement: !ruby/object:Gem::Requirement
|
114
156
|
requirements:
|
157
|
+
- - "~>"
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: '4.12'
|
115
160
|
- - ">="
|
116
161
|
- !ruby/object:Gem::Version
|
117
162
|
version: 4.12.0
|
@@ -119,6 +164,9 @@ dependencies:
|
|
119
164
|
prerelease: false
|
120
165
|
version_requirements: !ruby/object:Gem::Requirement
|
121
166
|
requirements:
|
167
|
+
- - "~>"
|
168
|
+
- !ruby/object:Gem::Version
|
169
|
+
version: '4.12'
|
122
170
|
- - ">="
|
123
171
|
- !ruby/object:Gem::Version
|
124
172
|
version: 4.12.0
|
@@ -128,14 +176,14 @@ dependencies:
|
|
128
176
|
requirements:
|
129
177
|
- - ">="
|
130
178
|
- !ruby/object:Gem::Version
|
131
|
-
version: 6.1.7
|
179
|
+
version: 6.1.7.4
|
132
180
|
type: :runtime
|
133
181
|
prerelease: false
|
134
182
|
version_requirements: !ruby/object:Gem::Requirement
|
135
183
|
requirements:
|
136
184
|
- - ">="
|
137
185
|
- !ruby/object:Gem::Version
|
138
|
-
version: 6.1.7
|
186
|
+
version: 6.1.7.4
|
139
187
|
- !ruby/object:Gem::Dependency
|
140
188
|
name: rails-i18n
|
141
189
|
requirement: !ruby/object:Gem::Requirement
|
@@ -154,17 +202,23 @@ dependencies:
|
|
154
202
|
name: sassc-rails
|
155
203
|
requirement: !ruby/object:Gem::Requirement
|
156
204
|
requirements:
|
205
|
+
- - "~>"
|
206
|
+
- !ruby/object:Gem::Version
|
207
|
+
version: '2.1'
|
157
208
|
- - ">="
|
158
209
|
- !ruby/object:Gem::Version
|
159
|
-
version: 2.
|
210
|
+
version: 2.1.2
|
160
211
|
type: :runtime
|
161
212
|
prerelease: false
|
162
213
|
version_requirements: !ruby/object:Gem::Requirement
|
163
214
|
requirements:
|
215
|
+
- - "~>"
|
216
|
+
- !ruby/object:Gem::Version
|
217
|
+
version: '2.1'
|
164
218
|
- - ">="
|
165
219
|
- !ruby/object:Gem::Version
|
166
|
-
version: 2.
|
167
|
-
description: Occams is a powerful Rails 6
|
220
|
+
version: 2.1.2
|
221
|
+
description: Occams is a powerful Rails 6-7+ CMS Engine
|
168
222
|
email:
|
169
223
|
- wonder@hey.com
|
170
224
|
executables: []
|
@@ -182,9 +236,9 @@ files:
|
|
182
236
|
- CONTRIBUTING.md
|
183
237
|
- Gemfile
|
184
238
|
- LICENSE
|
185
|
-
- LICENSE.comfy
|
186
239
|
- README.md
|
187
240
|
- Rakefile
|
241
|
+
- TODOS.md
|
188
242
|
- app/assets/config/manifest.js
|
189
243
|
- app/assets/fonts/occams/admin/cms/lib/redactor-font.eot
|
190
244
|
- app/assets/javascripts/occams/admin/cms/application.js
|
@@ -643,7 +697,8 @@ files:
|
|
643
697
|
homepage: http://github.com/avonderluft/occams
|
644
698
|
licenses:
|
645
699
|
- MIT
|
646
|
-
metadata:
|
700
|
+
metadata:
|
701
|
+
rubygems_mfa_required: 'true'
|
647
702
|
post_install_message:
|
648
703
|
rdoc_options: []
|
649
704
|
require_paths:
|
@@ -662,5 +717,5 @@ requirements: []
|
|
662
717
|
rubygems_version: 3.4.13
|
663
718
|
signing_key:
|
664
719
|
specification_version: 4
|
665
|
-
summary: Rails 6
|
720
|
+
summary: Rails 6-7+ CMS Engine
|
666
721
|
test_files: []
|
data/LICENSE.comfy
DELETED
@@ -1,20 +0,0 @@
|
|
1
|
-
Copyright (c) 2010-2019 Oleg Khabarov
|
2
|
-
|
3
|
-
Permission is hereby granted, free of charge, to any person obtaining
|
4
|
-
a copy of this software and associated documentation files (the
|
5
|
-
"Software"), to deal in the Software without restriction, including
|
6
|
-
without limitation the rights to use, copy, modify, merge, publish,
|
7
|
-
distribute, sublicense, and/or sell copies of the Software, and to
|
8
|
-
permit persons to whom the Software is furnished to do so, subject to
|
9
|
-
the following conditions:
|
10
|
-
|
11
|
-
The above copyright notice and this permission notice shall be
|
12
|
-
included in all copies or substantial portions of the Software.
|
13
|
-
|
14
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
15
|
-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
16
|
-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
17
|
-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
18
|
-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
19
|
-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
20
|
-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|