comfy_middle_seat 3.2.0 → 4.0.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 (156) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/coveralls.yml +4 -0
  3. data/CHANGELOG.md +56 -3
  4. data/CONTRIBUTING.md +8 -5
  5. data/Gemfile +1 -1
  6. data/README.md +66 -29
  7. data/Rakefile +3 -3
  8. data/app/assets/javascripts/comfy/admin/cms/application.js +2 -0
  9. data/app/assets/javascripts/comfy/admin/cms/base.js +6 -1
  10. data/app/assets/javascripts/comfy/admin/cms/codemirror.js +17 -0
  11. data/app/assets/javascripts/comfy/admin/cms/dirty_forms.js +201 -0
  12. data/app/assets/javascripts/comfy/admin/cms/draft_forms.js +468 -0
  13. data/app/assets/javascripts/comfy/admin/cms/page_fragments.js +393 -22
  14. data/app/assets/javascripts/comfy/admin/cms/wysiwyg.js +21 -0
  15. data/app/assets/javascripts/comfy/vendor/redactor/filemanager.js +48 -30
  16. data/app/assets/javascripts/comfy/vendor/redactor/imagemanager.js +43 -25
  17. data/app/assets/stylesheets/comfy/admin/cms/base.sass +23 -0
  18. data/app/controllers/comfy/admin/base_controller.rb +3 -3
  19. data/app/controllers/comfy/admin/cms/base_controller.rb +12 -7
  20. data/app/controllers/comfy/admin/cms/files_controller.rb +1 -1
  21. data/app/controllers/comfy/admin/cms/pages_controller.rb +76 -16
  22. data/app/controllers/comfy/admin/cms/revisions/base_controller.rb +39 -1
  23. data/app/controllers/comfy/admin/cms/revisions/page_controller.rb +9 -8
  24. data/app/controllers/comfy/admin/cms/revisions/translation_controller.rb +14 -8
  25. data/app/controllers/comfy/admin/cms/sites_controller.rb +1 -1
  26. data/app/controllers/comfy/admin/cms/translations_controller.rb +3 -1
  27. data/app/controllers/comfy/cms/base_controller.rb +1 -1
  28. data/app/controllers/comfy/cms/content_controller.rb +5 -5
  29. data/app/controllers/concerns/comfy/reorder_action.rb +24 -4
  30. data/app/helpers/comfy/admin/cms_helper.rb +28 -3
  31. data/app/helpers/comfy/cms_helper.rb +1 -1
  32. data/app/models/comfy/cms/file.rb +25 -3
  33. data/app/models/comfy/cms/layout.rb +8 -6
  34. data/app/models/comfy/cms/page.rb +22 -0
  35. data/app/models/comfy/cms/site.rb +3 -3
  36. data/app/models/comfy/cms/snippet.rb +8 -3
  37. data/app/models/concerns/comfy/cms/with_fragments.rb +2 -2
  38. data/app/views/comfy/admin/cms/categories/_index.html.haml +1 -1
  39. data/app/views/comfy/admin/cms/categories/_show.html.haml +1 -1
  40. data/app/views/comfy/admin/cms/files/_file.html.haml +1 -1
  41. data/app/views/comfy/admin/cms/files/index.html.haml +9 -2
  42. data/app/views/comfy/admin/cms/fragments/_form_fragments.html.haml +2 -2
  43. data/app/views/comfy/admin/cms/pages/_form.html.haml +2 -1
  44. data/app/views/comfy/admin/cms/pages/_index_branch.html.haml +11 -10
  45. data/app/views/comfy/admin/cms/pages/edit.html.haml +3 -1
  46. data/app/views/comfy/admin/cms/pages/index.html.haml +9 -2
  47. data/app/views/comfy/admin/cms/pages/new.html.haml +3 -1
  48. data/app/views/comfy/admin/cms/pages/toggle_branch.js.erb +2 -2
  49. data/app/views/comfy/admin/cms/revisions/show.html.haml +25 -7
  50. data/app/views/comfy/admin/cms/shared/_search.html.haml +9 -0
  51. data/app/views/comfy/admin/cms/sites/_form.html.haml +1 -1
  52. data/app/views/comfy/admin/cms/translations/_form.html.haml +2 -1
  53. data/app/views/comfy/admin/cms/translations/edit.html.haml +3 -1
  54. data/app/views/comfy/admin/cms/translations/new.html.haml +3 -1
  55. data/app/views/layouts/comfy/admin/cms/_flash.html.haml +1 -1
  56. data/app/views/layouts/comfy/admin/cms/_head.html.haml +3 -1
  57. data/app/views/layouts/comfy/admin/cms/_left.html.haml +2 -2
  58. data/comfy_middle_seat.gemspec +10 -5
  59. data/config/application.rb +3 -2
  60. data/config/cms_routes.rb +1 -1
  61. data/config/environment.rb +1 -1
  62. data/config/environments/development.rb +1 -1
  63. data/config/environments/production.rb +1 -1
  64. data/config/environments/test.rb +1 -1
  65. data/config/initializers/{comfortable_media_surfer.rb → comfy_middle_seat.rb} +4 -4
  66. data/config/locales/ar.yml +14 -0
  67. data/config/locales/ca.yml +14 -0
  68. data/config/locales/cs.yml +14 -0
  69. data/config/locales/da.yml +14 -0
  70. data/config/locales/de.yml +14 -0
  71. data/config/locales/en.yml +14 -0
  72. data/config/locales/es.yml +14 -0
  73. data/config/locales/fi.yml +14 -0
  74. data/config/locales/fr.yml +14 -0
  75. data/config/locales/gr.yml +14 -0
  76. data/config/locales/hr.yml +14 -0
  77. data/config/locales/it.yml +14 -0
  78. data/config/locales/ja.yml +14 -0
  79. data/config/locales/nb.yml +14 -0
  80. data/config/locales/nl.yml +14 -0
  81. data/config/locales/pl.yml +14 -0
  82. data/config/locales/pt-BR.yml +14 -0
  83. data/config/locales/ru.yml +14 -0
  84. data/config/locales/sk.yml +14 -0
  85. data/config/locales/sv.yml +14 -0
  86. data/config/locales/tr.yml +14 -0
  87. data/config/locales/uk.yml +14 -0
  88. data/config/locales/zh-CN.yml +14 -0
  89. data/config/locales/zh-TW.yml +14 -0
  90. data/config.ru +1 -1
  91. data/exe/comfy-middle-seat-upgrade +34 -0
  92. data/lib/{comfortable_media_surfer → comfy_middle_seat}/access_control/admin_authentication.rb +4 -4
  93. data/lib/{comfortable_media_surfer → comfy_middle_seat}/access_control/admin_authorization.rb +1 -1
  94. data/lib/{comfortable_media_surfer → comfy_middle_seat}/access_control/public_authentication.rb +1 -1
  95. data/lib/{comfortable_media_surfer → comfy_middle_seat}/access_control/public_authorization.rb +1 -1
  96. data/lib/{comfortable_media_surfer → comfy_middle_seat}/configuration.rb +7 -7
  97. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/block.rb +1 -1
  98. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/params_parser.rb +1 -1
  99. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/renderer.rb +10 -10
  100. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tag.rb +4 -4
  101. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/asset.rb +4 -4
  102. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/audio.rb +3 -3
  103. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/breadcrumbs.rb +3 -3
  104. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/checkbox.rb +3 -3
  105. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/children.rb +3 -3
  106. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/date.rb +3 -3
  107. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/datetime.rb +3 -3
  108. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/file.rb +5 -5
  109. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/file_link.rb +4 -4
  110. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/files.rb +3 -3
  111. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/fragment.rb +2 -2
  112. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/helper.rb +4 -4
  113. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/image.rb +4 -4
  114. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/markdown.rb +3 -3
  115. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/mixins/file_content.rb +1 -1
  116. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/number.rb +3 -3
  117. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/page_file_link.rb +5 -5
  118. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/partial.rb +4 -4
  119. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/siblings.rb +3 -3
  120. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/snippet.rb +3 -3
  121. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/template.rb +4 -4
  122. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/text.rb +3 -3
  123. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/textarea.rb +3 -3
  124. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags/wysiwyg.rb +3 -3
  125. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content/tags.rb +1 -1
  126. data/lib/{comfortable_media_surfer → comfy_middle_seat}/content.rb +1 -1
  127. data/lib/{comfortable_media_surfer → comfy_middle_seat}/engine.rb +4 -4
  128. data/lib/{comfortable_media_surfer → comfy_middle_seat}/error.rb +4 -4
  129. data/lib/{comfortable_media_surfer → comfy_middle_seat}/extensions/acts_as_tree.rb +3 -3
  130. data/lib/{comfortable_media_surfer → comfy_middle_seat}/extensions/has_revisions.rb +4 -4
  131. data/lib/{comfortable_media_surfer → comfy_middle_seat}/extensions.rb +1 -1
  132. data/lib/{comfortable_media_surfer → comfy_middle_seat}/form_builder.rb +2 -2
  133. data/lib/comfy_middle_seat/initializer_upgrader.rb +115 -0
  134. data/lib/{comfortable_media_surfer → comfy_middle_seat}/render_methods.rb +7 -7
  135. data/lib/{comfortable_media_surfer → comfy_middle_seat}/routing.rb +3 -2
  136. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds/file/exporter.rb +5 -5
  137. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds/file/importer.rb +5 -5
  138. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds/layout/exporter.rb +4 -4
  139. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds/layout/importer.rb +5 -5
  140. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds/page/exporter.rb +5 -5
  141. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds/page/importer.rb +7 -7
  142. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds/snippet/exporter.rb +4 -4
  143. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds/snippet/importer.rb +5 -5
  144. data/lib/{comfortable_media_surfer → comfy_middle_seat}/seeds.rb +4 -4
  145. data/lib/comfy_middle_seat/version.rb +2 -2
  146. data/lib/{comfortable_media_surfer → comfy_middle_seat}/view_hooks.rb +2 -2
  147. data/lib/comfy_middle_seat.rb +54 -1
  148. data/lib/generators/comfy/cms/README +3 -11
  149. data/lib/generators/comfy/cms/cms_generator.rb +2 -2
  150. data/lib/generators/comfy/scaffold/templates/tests/controller.rb.tt +2 -2
  151. data/lib/tasks/cms_seeds.rake +8 -8
  152. data/package-lock.json +2 -2
  153. data/package.json +1 -1
  154. metadata +68 -62
  155. data/lib/comfortable_media_surfer/version.rb +0 -3
  156. data/lib/comfortable_media_surfer.rb +0 -56
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds::File
4
- class Exporter < ComfortableMediaSurfer::Seeds::Exporter
3
+ module ComfyMiddleSeat::Seeds::File
4
+ class Exporter < ComfyMiddleSeat::Seeds::Exporter
5
5
  def initialize(from, to = from)
6
6
  super
7
- self.path = ::File.join(ComfortableMediaSurfer.config.seeds_path, to, 'files/')
7
+ self.path = ::File.join(ComfyMiddleSeat.config.seeds_path, to, 'files/')
8
8
  end
9
9
 
10
10
  def export!
@@ -25,12 +25,12 @@ module ComfortableMediaSurfer::Seeds::File
25
25
  ::File.binwrite(::File.join(path, ::File.basename(file_path)), file.attachment.download)
26
26
  rescue Errno::ENOENT, OpenURI::HTTPError
27
27
  message = "[CMS SEEDS] No physical File \t #{file.attachment.filename}"
28
- ComfortableMediaSurfer.logger.warn(message)
28
+ ComfyMiddleSeat.logger.warn(message)
29
29
  next
30
30
  end
31
31
 
32
32
  message = "[CMS SEEDS] Exported File \t #{file.attachment.filename}"
33
- ComfortableMediaSurfer.logger.info(message)
33
+ ComfyMiddleSeat.logger.info(message)
34
34
  end
35
35
  end
36
36
  end
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds::File
4
- class Importer < ComfortableMediaSurfer::Seeds::Importer
3
+ module ComfyMiddleSeat::Seeds::File
4
+ class Importer < ComfyMiddleSeat::Seeds::Importer
5
5
  def initialize(from, to = from)
6
6
  super
7
- self.path = ::File.join(ComfortableMediaSurfer.config.seeds_path, from, 'files/')
7
+ self.path = ::File.join(ComfyMiddleSeat.config.seeds_path, from, 'files/')
8
8
  end
9
9
 
10
10
  def import!
@@ -46,9 +46,9 @@ module ComfortableMediaSurfer::Seeds::File
46
46
 
47
47
  def save(file, path)
48
48
  if file.save
49
- ComfortableMediaSurfer.logger.info("[CMS SEEDS] Imported File \t #{path}")
49
+ ComfyMiddleSeat.logger.info("[CMS SEEDS] Imported File \t #{path}")
50
50
  else
51
- ComfortableMediaSurfer.logger.warn("[CMS SEEDS] Failed to import File \n#{file.errors.inspect}")
51
+ ComfyMiddleSeat.logger.warn("[CMS SEEDS] Failed to import File \n#{file.errors.inspect}")
52
52
  end
53
53
  end
54
54
  end
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds::Layout
4
- class Exporter < ComfortableMediaSurfer::Seeds::Exporter
3
+ module ComfyMiddleSeat::Seeds::Layout
4
+ class Exporter < ComfyMiddleSeat::Seeds::Exporter
5
5
  def initialize(from, to = from)
6
6
  super
7
- self.path = ::File.join(ComfortableMediaSurfer.config.seeds_path, to, 'layouts/')
7
+ self.path = ::File.join(ComfyMiddleSeat.config.seeds_path, to, 'layouts/')
8
8
  end
9
9
 
10
10
  def export!
@@ -31,7 +31,7 @@ module ComfortableMediaSurfer::Seeds::Layout
31
31
  write_file_content(path, data)
32
32
 
33
33
  message = "[CMS SEEDS] Exported Layout \t #{layout.identifier}"
34
- ComfortableMediaSurfer.logger.info(message)
34
+ ComfyMiddleSeat.logger.info(message)
35
35
  end
36
36
  end
37
37
  end
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds::Layout
4
- class Importer < ComfortableMediaSurfer::Seeds::Importer
3
+ module ComfyMiddleSeat::Seeds::Layout
4
+ class Importer < ComfyMiddleSeat::Seeds::Importer
5
5
  def initialize(from, to = from)
6
6
  super
7
- self.path = ::File.join(ComfortableMediaSurfer.config.seeds_path, from, 'layouts/')
7
+ self.path = ::File.join(ComfyMiddleSeat.config.seeds_path, from, 'layouts/')
8
8
  end
9
9
 
10
10
  def import!(path = self.path, parent = nil)
@@ -42,10 +42,10 @@ module ComfortableMediaSurfer::Seeds::Layout
42
42
 
43
43
  if layout.save
44
44
  message = "[CMS SEEDS] Imported Layout \t #{layout.identifier}"
45
- ComfortableMediaSurfer.logger.info(message)
45
+ ComfyMiddleSeat.logger.info(message)
46
46
  else
47
47
  message = "[CMS SEEDS] Failed to import Layout \n#{layout.errors.inspect}"
48
- ComfortableMediaSurfer.logger.warn(message)
48
+ ComfyMiddleSeat.logger.warn(message)
49
49
  end
50
50
  end
51
51
 
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds::Page
4
- class Exporter < ComfortableMediaSurfer::Seeds::Exporter
3
+ module ComfyMiddleSeat::Seeds::Page
4
+ class Exporter < ComfyMiddleSeat::Seeds::Exporter
5
5
  def initialize(from, to = from)
6
6
  super
7
- self.path = ::File.join(ComfortableMediaSurfer.config.seeds_path, to, 'pages/')
7
+ self.path = ::File.join(ComfyMiddleSeat.config.seeds_path, to, 'pages/')
8
8
  end
9
9
 
10
10
  def export!
@@ -33,7 +33,7 @@ module ComfortableMediaSurfer::Seeds::Page
33
33
  write_file_content(path, data)
34
34
 
35
35
  message = "[CMS SEEDS] Exported Page \t #{page.full_path}"
36
- ComfortableMediaSurfer.logger.info(message)
36
+ ComfyMiddleSeat.logger.info(message)
37
37
 
38
38
  export_translations(page, page_path)
39
39
  end
@@ -58,7 +58,7 @@ module ComfortableMediaSurfer::Seeds::Page
58
58
  write_file_content(path, data)
59
59
 
60
60
  message = "[CMS SEEDS] Exported Translation \t #{translation.locale}"
61
- ComfortableMediaSurfer.logger.info(message)
61
+ ComfyMiddleSeat.logger.info(message)
62
62
  end
63
63
  end
64
64
 
@@ -1,14 +1,14 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds::Page
4
- class Importer < ComfortableMediaSurfer::Seeds::Importer
3
+ module ComfyMiddleSeat::Seeds::Page
4
+ class Importer < ComfyMiddleSeat::Seeds::Importer
5
5
  # tracking target page linking. Since we might be linking to something that
6
6
  # doesn't exist yet, we'll defer linking to the end of import
7
7
  attr_accessor :target_pages
8
8
 
9
9
  def initialize(from, to = from)
10
10
  super
11
- self.path = ::File.join(ComfortableMediaSurfer.config.seeds_path, from, 'pages/')
11
+ self.path = ::File.join(ComfyMiddleSeat.config.seeds_path, from, 'pages/')
12
12
  end
13
13
 
14
14
  def import!
@@ -72,7 +72,7 @@ module ComfortableMediaSurfer::Seeds::Page
72
72
 
73
73
  if page_saved
74
74
  message = "[CMS SEEDS] Imported Page \t #{page.full_path}"
75
- ComfortableMediaSurfer.logger.info(message)
75
+ ComfyMiddleSeat.logger.info(message)
76
76
 
77
77
  # defering target page linking
78
78
  if target_page.present?
@@ -85,7 +85,7 @@ module ComfortableMediaSurfer::Seeds::Page
85
85
 
86
86
  else
87
87
  message = "[CMS SEEDS] Failed to import Page \n#{page.errors.inspect}"
88
- ComfortableMediaSurfer.logger.warn(message)
88
+ ComfyMiddleSeat.logger.warn(message)
89
89
  end
90
90
  end
91
91
 
@@ -141,7 +141,7 @@ module ComfortableMediaSurfer::Seeds::Page
141
141
 
142
142
  if translation_saved
143
143
  message = "[CMS SEEDS] Imported Translation \t #{locale}"
144
- ComfortableMediaSurfer.logger.info(message)
144
+ ComfyMiddleSeat.logger.info(message)
145
145
 
146
146
  # cleaning up old fragments
147
147
  frags_to_remove = old_frag_identifiers - new_frag_identifiers
@@ -149,7 +149,7 @@ module ComfortableMediaSurfer::Seeds::Page
149
149
 
150
150
  else
151
151
  message = "[CMS SEEDS] Failed to import Translation \n#{locale}"
152
- ComfortableMediaSurfer.logger.warn(message)
152
+ ComfyMiddleSeat.logger.warn(message)
153
153
  end
154
154
  end
155
155
 
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds::Snippet
4
- class Exporter < ComfortableMediaSurfer::Seeds::Exporter
3
+ module ComfyMiddleSeat::Seeds::Snippet
4
+ class Exporter < ComfyMiddleSeat::Seeds::Exporter
5
5
  def initialize(from, to = from)
6
6
  super
7
- self.path = ::File.join(ComfortableMediaSurfer.config.seeds_path, to, 'snippets/')
7
+ self.path = ::File.join(ComfyMiddleSeat.config.seeds_path, to, 'snippets/')
8
8
  end
9
9
 
10
10
  def export!
@@ -25,7 +25,7 @@ module ComfortableMediaSurfer::Seeds::Snippet
25
25
  write_file_content(snippet_path, data)
26
26
 
27
27
  message = "[CMS SEEDS] Exported Snippet \t #{snippet.identifier}"
28
- ComfortableMediaSurfer.logger.info(message)
28
+ ComfyMiddleSeat.logger.info(message)
29
29
  end
30
30
  end
31
31
  end
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds::Snippet
4
- class Importer < ComfortableMediaSurfer::Seeds::Importer
3
+ module ComfyMiddleSeat::Seeds::Snippet
4
+ class Importer < ComfyMiddleSeat::Seeds::Importer
5
5
  def initialize(from, to = from)
6
6
  super
7
- self.path = ::File.join(ComfortableMediaSurfer.config.seeds_path, from, 'snippets/')
7
+ self.path = ::File.join(ComfyMiddleSeat.config.seeds_path, from, 'snippets/')
8
8
  end
9
9
 
10
10
  def import!
@@ -29,9 +29,9 @@ module ComfortableMediaSurfer::Seeds::Snippet
29
29
  )
30
30
 
31
31
  if snippet.save
32
- ComfortableMediaSurfer.logger.info("[CMS SEEDS] Imported Snippet \t #{snippet.identifier}")
32
+ ComfyMiddleSeat.logger.info("[CMS SEEDS] Imported Snippet \t #{snippet.identifier}")
33
33
  else
34
- ComfortableMediaSurfer.logger.warn("[CMS SEEDS] Failed to import Snippet \n#{snippet.errors.inspect}")
34
+ ComfyMiddleSeat.logger.warn("[CMS SEEDS] Failed to import Snippet \n#{snippet.errors.inspect}")
35
35
  end
36
36
  end
37
37
 
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer::Seeds
3
+ module ComfyMiddleSeat::Seeds
4
4
  SEED_CLASSES = %w[Layout Page Snippet File].freeze
5
5
 
6
6
  class Error < StandardError; end
@@ -21,7 +21,7 @@ module ComfortableMediaSurfer::Seeds
21
21
  self.site = Comfy::Cms::Site.where(identifier: to).first!
22
22
  self.seed_ids = []
23
23
 
24
- return if ::File.exist?(path = ::File.join(ComfortableMediaSurfer.config.seeds_path, from))
24
+ return if ::File.exist?(path = ::File.join(ComfyMiddleSeat.config.seeds_path, from))
25
25
 
26
26
  raise Error, "Folder for import: '#{path}' is not found"
27
27
  end
@@ -30,7 +30,7 @@ module ComfortableMediaSurfer::Seeds
30
30
  def import!(classes = nil)
31
31
  classes ||= SEED_CLASSES
32
32
  classes.each do |klass|
33
- klass = "ComfortableMediaSurfer::Seeds::#{klass}::Importer"
33
+ klass = "ComfyMiddleSeat::Seeds::#{klass}::Importer"
34
34
  klass.constantize.new(from, to).import!
35
35
  end
36
36
  end
@@ -80,7 +80,7 @@ module ComfortableMediaSurfer::Seeds
80
80
  def export!(classes = nil)
81
81
  classes ||= SEED_CLASSES
82
82
  classes.each do |klass|
83
- klass = "ComfortableMediaSurfer::Seeds::#{klass}::Exporter"
83
+ klass = "ComfyMiddleSeat::Seeds::#{klass}::Exporter"
84
84
  klass.constantize.new(from, to).export!
85
85
  end
86
86
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- module ComfortableMediaSurfer
4
- VERSION = '3.2.0'
3
+ module ComfyMiddleSeat
4
+ VERSION = '4.0.0'
5
5
  end
@@ -2,7 +2,7 @@
2
2
 
3
3
  # This mechanism is used by 3rd party plugins.
4
4
  # Normally you'd use partials from your own app
5
- module ComfortableMediaSurfer::ViewHooks
5
+ module ComfyMiddleSeat::ViewHooks
6
6
  # Array of declared hooks
7
7
  def self.hooks
8
8
  @hooks ||= {}
@@ -19,7 +19,7 @@ module ComfortableMediaSurfer::ViewHooks
19
19
 
20
20
  # Will declare a partial that will be rendered for this hook
21
21
  # Example:
22
- # ComfortableMediaSurfer::ViewHooks.add(:navigation, 'shared/navigation')
22
+ # ComfyMiddleSeat::ViewHooks.add(:navigation, 'shared/navigation')
23
23
  def self.add(name, partial_path, position = 0)
24
24
  hooks[name.to_sym] ||= []
25
25
  hooks[name.to_sym] << [partial_path, position]
@@ -1,3 +1,56 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative 'comfortable_media_surfer'
3
+ # Loading engine only if this is not a standalone installation
4
+ unless defined? ComfyMiddleSeat::Application
5
+ require_relative 'comfy_middle_seat/engine'
6
+ end
7
+
8
+ require_relative 'comfy_middle_seat/version'
9
+ require_relative 'comfy_middle_seat/error'
10
+ require_relative 'comfy_middle_seat/configuration'
11
+ require_relative 'comfy_middle_seat/routing'
12
+ require_relative 'comfy_middle_seat/access_control/admin_authentication'
13
+ require_relative 'comfy_middle_seat/access_control/admin_authorization'
14
+ require_relative 'comfy_middle_seat/access_control/public_authentication'
15
+ require_relative 'comfy_middle_seat/access_control/public_authorization'
16
+ require_relative 'comfy_middle_seat/render_methods'
17
+ require_relative 'comfy_middle_seat/view_hooks'
18
+ require_relative 'comfy_middle_seat/form_builder'
19
+ require_relative 'comfy_middle_seat/seeds'
20
+ require_relative 'comfy_middle_seat/seeds/layout/importer'
21
+ require_relative 'comfy_middle_seat/seeds/layout/exporter'
22
+ require_relative 'comfy_middle_seat/seeds/page/importer'
23
+ require_relative 'comfy_middle_seat/seeds/page/exporter'
24
+ require_relative 'comfy_middle_seat/seeds/snippet/importer'
25
+ require_relative 'comfy_middle_seat/seeds/snippet/exporter'
26
+ require_relative 'comfy_middle_seat/seeds/file/importer'
27
+ require_relative 'comfy_middle_seat/seeds/file/exporter'
28
+ require_relative 'comfy_middle_seat/content'
29
+ require_relative 'comfy_middle_seat/extensions'
30
+
31
+ module ComfyMiddleSeat
32
+ Version = ComfyMiddleSeat::VERSION
33
+
34
+ class << self
35
+ attr_writer :logger
36
+
37
+ # Modify CMS configuration
38
+ # Example:
39
+ # ComfyMiddleSeat.configure do |config|
40
+ # config.cms_title = 'ComfyMiddleSeat'
41
+ # end
42
+ def configure
43
+ yield configuration
44
+ end
45
+
46
+ # Accessor for ComfyMiddleSeat::Configuration
47
+ def configuration
48
+ @configuration ||= Configuration.new
49
+ end
50
+ alias config configuration
51
+
52
+ def logger
53
+ @logger ||= Rails.logger
54
+ end
55
+ end
56
+ end
@@ -1,13 +1,5 @@
1
- ____ __ _ _ _
2
- / ___|___ _ __ ___ / _| ___ _ __| |_ __ _| |__ | | ___
3
- | | / _ \| '_ ` _ \| |_ / _ \| '__| __/ _` | '_ \| |/ _ \
4
- | |__| (_) | | | | | | _| (_) | | | || (_| | |_) | | __/
5
- \____\___/|_| |_| |_|_| \___/|_| \__\__,_|_.__/|_|\___|
6
- __ __ _ _ ____ __
7
- | \/ | ___ __| (_) __ _ / ___| _ _ _ __ / _| ___ _ __
8
- | |\/| |/ _ \/ _` | |/ _` | \___ \| | | | '__| |_ / _ \ '__|
9
- | | | | __/ (_| | | (_| | ___) | |_| | | | _| __/ |
10
- |_| |_|\___|\__,_|_|\__,_| |____/ \__,_|_| |_| \___|_|
1
+ Comfy Middle Seat
2
+ =================
11
3
 
12
4
  You are almost done. Don't forget to:
13
5
 
@@ -18,4 +10,4 @@ You are almost done. Don't forget to:
18
10
  Then go to http://your-rails-app/admin to start adding content.
19
11
 
20
12
  Default username and password are: user / pass
21
- Change these defaults in config/initializers/comfortable_media_surfer.rb
13
+ Change these defaults in config/initializers/comfy_middle_seat.rb
@@ -25,8 +25,8 @@ module Comfy
25
25
  end
26
26
 
27
27
  def generate_initializer
28
- copy_file 'config/initializers/comfortable_media_surfer.rb',
29
- 'config/initializers/comfortable_media_surfer.rb'
28
+ copy_file 'config/initializers/comfy_middle_seat.rb',
29
+ 'config/initializers/comfy_middle_seat.rb'
30
30
  end
31
31
 
32
32
  def generate_railties_order
@@ -13,8 +13,8 @@ class Admin::<%= class_name.pluralize %>ControllerTest < ActionDispatch::Integra
13
13
  headers = options[:headers] || {}
14
14
  headers['HTTP_AUTHORIZATION'] =
15
15
  ActionController::HttpAuthentication::Basic.encode_credentials(
16
- ComfortableMediaSurfer::AccessControl::AdminAuthentication.username,
17
- ComfortableMediaSurfer::AccessControl::AdminAuthentication.password
16
+ ComfyMiddleSeat::AccessControl::AdminAuthentication.username,
17
+ ComfyMiddleSeat::AccessControl::AdminAuthentication.password
18
18
  )
19
19
  options.merge!(headers: headers)
20
20
  send(verb, path, options)
@@ -12,12 +12,12 @@ namespace :comfy do
12
12
  puts "Importing CMS Seed data from Folder [#{from}] to Site [#{to}] ..."
13
13
 
14
14
  # changing so that logger is going straight to screen
15
- logger = ComfortableMediaSurfer.logger
16
- ComfortableMediaSurfer.logger = Logger.new($stdout)
15
+ logger = ComfyMiddleSeat.logger
16
+ ComfyMiddleSeat.logger = Logger.new($stdout)
17
17
 
18
- ComfortableMediaSurfer::Seeds::Importer.new(from, to).import!(classes)
18
+ ComfyMiddleSeat::Seeds::Importer.new(from, to).import!(classes)
19
19
 
20
- ComfortableMediaSurfer.logger = logger
20
+ ComfyMiddleSeat.logger = logger
21
21
  end
22
22
 
23
23
  desc 'Export database data into CMS Seed files (from: site identifier, to: folder name, classes: class name[s])'
@@ -29,12 +29,12 @@ namespace :comfy do
29
29
  puts "Exporting CMS data from Site [#{from}] to Folder [#{to}] ..."
30
30
 
31
31
  # changing so that logger is going straight to screen
32
- logger = ComfortableMediaSurfer.logger
33
- ComfortableMediaSurfer.logger = Logger.new($stdout)
32
+ logger = ComfyMiddleSeat.logger
33
+ ComfyMiddleSeat.logger = Logger.new($stdout)
34
34
 
35
- ComfortableMediaSurfer::Seeds::Exporter.new(from, to).export!(classes)
35
+ ComfyMiddleSeat::Seeds::Exporter.new(from, to).export!(classes)
36
36
 
37
- ComfortableMediaSurfer.logger = logger
37
+ ComfyMiddleSeat.logger = logger
38
38
  end
39
39
  end
40
40
  end
data/package-lock.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
- "name": "comfortable-media-surfer",
2
+ "name": "comfy-middle-seat",
3
3
  "lockfileVersion": 3,
4
4
  "requires": true,
5
5
  "packages": {
6
6
  "": {
7
- "name": "comfortable-media-surfer",
7
+ "name": "comfy-middle-seat",
8
8
  "dependencies": {
9
9
  "@rails/ujs": "^7.1.3-4",
10
10
  "bootstrap": "4.3.1",
data/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "name": "comfortable-media-surfer",
2
+ "name": "comfy-middle-seat",
3
3
  "private": true,
4
4
  "scripts": {
5
5
  "build": "esbuild app/assets/javascripts/comfy/admin/cms/application.js --bundle --sourcemap --outdir=app/assets/builds/comfy/admin/cms --public-path=/assets",
metadata CHANGED
@@ -1,12 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: comfy_middle_seat
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0
4
+ version: 4.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Oleg Khabarov
8
8
  - Andrew vonderLuft
9
- bindir: bin
9
+ bindir: exe
10
10
  cert_chain: []
11
11
  date: 1980-01-02 00:00:00.000000000 Z
12
12
  dependencies:
@@ -198,10 +198,11 @@ dependencies:
198
198
  - - ">="
199
199
  - !ruby/object:Gem::Version
200
200
  version: 6.0.0
201
- description: Comfy Middle Seat is a Rails 7.2+ CMS Engine forked from ComfortableMediaSurfer
201
+ description: Comfy Middle Seat is a Rails 7.2+ CMS engine.
202
202
  email:
203
203
  - wonder@hey.com
204
- executables: []
204
+ executables:
205
+ - comfy-middle-seat-upgrade
205
206
  extensions: []
206
207
  extra_rdoc_files: []
207
208
  files:
@@ -232,6 +233,8 @@ files:
232
233
  - app/assets/javascripts/comfy/admin/cms/codemirror.js
233
234
  - app/assets/javascripts/comfy/admin/cms/custom.js
234
235
  - app/assets/javascripts/comfy/admin/cms/diff.js
236
+ - app/assets/javascripts/comfy/admin/cms/dirty_forms.js
237
+ - app/assets/javascripts/comfy/admin/cms/draft_forms.js
235
238
  - app/assets/javascripts/comfy/admin/cms/file_link.js
236
239
  - app/assets/javascripts/comfy/admin/cms/file_upload.js
237
240
  - app/assets/javascripts/comfy/admin/cms/files_modal.js
@@ -461,6 +464,7 @@ files:
461
464
  - app/views/comfy/admin/cms/pages/toggle_branch.js.erb
462
465
  - app/views/comfy/admin/cms/revisions/_sidebar.html.haml
463
466
  - app/views/comfy/admin/cms/revisions/show.html.haml
467
+ - app/views/comfy/admin/cms/shared/_search.html.haml
464
468
  - app/views/comfy/admin/cms/sites/_form.html.haml
465
469
  - app/views/comfy/admin/cms/sites/edit.html.haml
466
470
  - app/views/comfy/admin/cms/sites/index.html.haml
@@ -504,7 +508,7 @@ files:
504
508
  - config/environments/development.rb
505
509
  - config/environments/production.rb
506
510
  - config/environments/test.rb
507
- - config/initializers/comfortable_media_surfer.rb
511
+ - config/initializers/comfy_middle_seat.rb
508
512
  - config/initializers/content_security_policy.rb
509
513
  - config/initializers/filter_parameter_logging.rb
510
514
  - config/initializers/inflections.rb
@@ -555,66 +559,66 @@ files:
555
559
  - db/migrate/00_create_active_storage_tables.active_storage.rb
556
560
  - db/migrate/01_create_cms.rb
557
561
  - db/migrate/02_add_markdown_to_snippets.rb
562
+ - exe/comfy-middle-seat-upgrade
558
563
  - gemfiles/7.2.gemfile
559
564
  - gemfiles/8.0.gemfile
560
565
  - gemfiles/8.1.gemfile
561
- - lib/comfortable_media_surfer.rb
562
- - lib/comfortable_media_surfer/access_control/admin_authentication.rb
563
- - lib/comfortable_media_surfer/access_control/admin_authorization.rb
564
- - lib/comfortable_media_surfer/access_control/public_authentication.rb
565
- - lib/comfortable_media_surfer/access_control/public_authorization.rb
566
- - lib/comfortable_media_surfer/configuration.rb
567
- - lib/comfortable_media_surfer/content.rb
568
- - lib/comfortable_media_surfer/content/block.rb
569
- - lib/comfortable_media_surfer/content/params_parser.rb
570
- - lib/comfortable_media_surfer/content/renderer.rb
571
- - lib/comfortable_media_surfer/content/tag.rb
572
- - lib/comfortable_media_surfer/content/tags.rb
573
- - lib/comfortable_media_surfer/content/tags/asset.rb
574
- - lib/comfortable_media_surfer/content/tags/audio.rb
575
- - lib/comfortable_media_surfer/content/tags/breadcrumbs.rb
576
- - lib/comfortable_media_surfer/content/tags/checkbox.rb
577
- - lib/comfortable_media_surfer/content/tags/children.rb
578
- - lib/comfortable_media_surfer/content/tags/date.rb
579
- - lib/comfortable_media_surfer/content/tags/datetime.rb
580
- - lib/comfortable_media_surfer/content/tags/file.rb
581
- - lib/comfortable_media_surfer/content/tags/file_link.rb
582
- - lib/comfortable_media_surfer/content/tags/files.rb
583
- - lib/comfortable_media_surfer/content/tags/fragment.rb
584
- - lib/comfortable_media_surfer/content/tags/helper.rb
585
- - lib/comfortable_media_surfer/content/tags/image.rb
586
- - lib/comfortable_media_surfer/content/tags/markdown.rb
587
- - lib/comfortable_media_surfer/content/tags/mixins/file_content.rb
588
- - lib/comfortable_media_surfer/content/tags/number.rb
589
- - lib/comfortable_media_surfer/content/tags/page_file_link.rb
590
- - lib/comfortable_media_surfer/content/tags/partial.rb
591
- - lib/comfortable_media_surfer/content/tags/siblings.rb
592
- - lib/comfortable_media_surfer/content/tags/snippet.rb
593
- - lib/comfortable_media_surfer/content/tags/template.rb
594
- - lib/comfortable_media_surfer/content/tags/text.rb
595
- - lib/comfortable_media_surfer/content/tags/textarea.rb
596
- - lib/comfortable_media_surfer/content/tags/wysiwyg.rb
597
- - lib/comfortable_media_surfer/engine.rb
598
- - lib/comfortable_media_surfer/error.rb
599
- - lib/comfortable_media_surfer/extensions.rb
600
- - lib/comfortable_media_surfer/extensions/acts_as_tree.rb
601
- - lib/comfortable_media_surfer/extensions/has_revisions.rb
602
- - lib/comfortable_media_surfer/form_builder.rb
603
- - lib/comfortable_media_surfer/render_methods.rb
604
- - lib/comfortable_media_surfer/routing.rb
605
- - lib/comfortable_media_surfer/seeds.rb
606
- - lib/comfortable_media_surfer/seeds/file/exporter.rb
607
- - lib/comfortable_media_surfer/seeds/file/importer.rb
608
- - lib/comfortable_media_surfer/seeds/layout/exporter.rb
609
- - lib/comfortable_media_surfer/seeds/layout/importer.rb
610
- - lib/comfortable_media_surfer/seeds/page/exporter.rb
611
- - lib/comfortable_media_surfer/seeds/page/importer.rb
612
- - lib/comfortable_media_surfer/seeds/snippet/exporter.rb
613
- - lib/comfortable_media_surfer/seeds/snippet/importer.rb
614
- - lib/comfortable_media_surfer/version.rb
615
- - lib/comfortable_media_surfer/view_hooks.rb
616
566
  - lib/comfy_middle_seat.rb
567
+ - lib/comfy_middle_seat/access_control/admin_authentication.rb
568
+ - lib/comfy_middle_seat/access_control/admin_authorization.rb
569
+ - lib/comfy_middle_seat/access_control/public_authentication.rb
570
+ - lib/comfy_middle_seat/access_control/public_authorization.rb
571
+ - lib/comfy_middle_seat/configuration.rb
572
+ - lib/comfy_middle_seat/content.rb
573
+ - lib/comfy_middle_seat/content/block.rb
574
+ - lib/comfy_middle_seat/content/params_parser.rb
575
+ - lib/comfy_middle_seat/content/renderer.rb
576
+ - lib/comfy_middle_seat/content/tag.rb
577
+ - lib/comfy_middle_seat/content/tags.rb
578
+ - lib/comfy_middle_seat/content/tags/asset.rb
579
+ - lib/comfy_middle_seat/content/tags/audio.rb
580
+ - lib/comfy_middle_seat/content/tags/breadcrumbs.rb
581
+ - lib/comfy_middle_seat/content/tags/checkbox.rb
582
+ - lib/comfy_middle_seat/content/tags/children.rb
583
+ - lib/comfy_middle_seat/content/tags/date.rb
584
+ - lib/comfy_middle_seat/content/tags/datetime.rb
585
+ - lib/comfy_middle_seat/content/tags/file.rb
586
+ - lib/comfy_middle_seat/content/tags/file_link.rb
587
+ - lib/comfy_middle_seat/content/tags/files.rb
588
+ - lib/comfy_middle_seat/content/tags/fragment.rb
589
+ - lib/comfy_middle_seat/content/tags/helper.rb
590
+ - lib/comfy_middle_seat/content/tags/image.rb
591
+ - lib/comfy_middle_seat/content/tags/markdown.rb
592
+ - lib/comfy_middle_seat/content/tags/mixins/file_content.rb
593
+ - lib/comfy_middle_seat/content/tags/number.rb
594
+ - lib/comfy_middle_seat/content/tags/page_file_link.rb
595
+ - lib/comfy_middle_seat/content/tags/partial.rb
596
+ - lib/comfy_middle_seat/content/tags/siblings.rb
597
+ - lib/comfy_middle_seat/content/tags/snippet.rb
598
+ - lib/comfy_middle_seat/content/tags/template.rb
599
+ - lib/comfy_middle_seat/content/tags/text.rb
600
+ - lib/comfy_middle_seat/content/tags/textarea.rb
601
+ - lib/comfy_middle_seat/content/tags/wysiwyg.rb
602
+ - lib/comfy_middle_seat/engine.rb
603
+ - lib/comfy_middle_seat/error.rb
604
+ - lib/comfy_middle_seat/extensions.rb
605
+ - lib/comfy_middle_seat/extensions/acts_as_tree.rb
606
+ - lib/comfy_middle_seat/extensions/has_revisions.rb
607
+ - lib/comfy_middle_seat/form_builder.rb
608
+ - lib/comfy_middle_seat/initializer_upgrader.rb
609
+ - lib/comfy_middle_seat/render_methods.rb
610
+ - lib/comfy_middle_seat/routing.rb
611
+ - lib/comfy_middle_seat/seeds.rb
612
+ - lib/comfy_middle_seat/seeds/file/exporter.rb
613
+ - lib/comfy_middle_seat/seeds/file/importer.rb
614
+ - lib/comfy_middle_seat/seeds/layout/exporter.rb
615
+ - lib/comfy_middle_seat/seeds/layout/importer.rb
616
+ - lib/comfy_middle_seat/seeds/page/exporter.rb
617
+ - lib/comfy_middle_seat/seeds/page/importer.rb
618
+ - lib/comfy_middle_seat/seeds/snippet/exporter.rb
619
+ - lib/comfy_middle_seat/seeds/snippet/importer.rb
617
620
  - lib/comfy_middle_seat/version.rb
621
+ - lib/comfy_middle_seat/view_hooks.rb
618
622
  - lib/generators/comfy/cms/README
619
623
  - lib/generators/comfy/cms/assets_generator.rb
620
624
  - lib/generators/comfy/cms/cms_generator.rb
@@ -639,12 +643,14 @@ files:
639
643
  - package.json
640
644
  - public/favicon.ico
641
645
  - rakelib/create_release.rake
642
- homepage: https://github.com/avonderluft/comfortable-media-surfer
646
+ homepage: https://github.com/avonderluft/comfy-middle-seat
643
647
  licenses:
644
648
  - MIT
645
649
  metadata:
646
650
  rubygems_mfa_required: 'true'
647
- post_install_message: Please run rake comfy:compile_assets to compile assets.
651
+ post_install_message: |
652
+ Please run rake comfy:compile_assets to compile assets.
653
+ Upgrading from comfortable_media_surfer? Run bundle exec comfy-middle-seat-upgrade --dry-run first.
648
654
  rdoc_options: []
649
655
  require_paths:
650
656
  - lib