comfortable_media_surfer 3.1.6 → 3.2.0

data/config/locales/zh-CN.yml

@@ -120,6 +120,8 @@ zh-CN:
           creation_failure: 页面创建失败
           updated: 页面更新成功
           update_failure: 页面更新失败
+          children_published: 子页面已发布
+          children_unpublished: 子页面已取消发布
           deleted: 页面删除成功
           not_found: 页面不存在
           layout_not_found: 没有布局，请先创建一个布局。
@@ -137,6 +139,10 @@ zh-CN:
             title: 新页面
           edit:
             title: 编辑页面
+            publish_children: 发布子页面
+            publish_children_confirmation: 发布所有子页面？
+            unpublish_children: 取消发布子页面
+            unpublish_children_confirmation: 取消发布所有子页面？
           form:
             select_target_page: 没有跳转
             preview: 预览

data/config/locales/zh-TW.yml

@@ -120,6 +120,8 @@ zh-TW:
           creation_failure: 頁面創建失敗
           updated: 頁面更新成功
           update_failure: 頁面更新失敗
+          children_published: 子頁面已發佈
+          children_unpublished: 子頁面已取消發佈
           deleted: 頁面刪除成功
           not_found: 頁面不存在
           layout_not_found: 沒有佈局，請先創建一個佈局。
@@ -137,6 +139,10 @@ zh-TW:
             title: 新頁面
           edit:
             title: 編輯頁面
+            publish_children: 發佈子頁面
+            publish_children_confirmation: 發佈所有子頁面？
+            unpublish_children: 取消發佈子頁面
+            unpublish_children_confirmation: 取消發佈所有子頁面？
           form:
             select_target_page: 沒有跳轉
             preview: 預覽

data/config/storage.yml

@@ -1,6 +1,6 @@
 test:
   service: Disk
-  root: <%= Rails.root.join("tmp/storage") %>
+  root: <%= Rails.root.join("tmp/storage#{ENV.fetch('TEST_ENV_NUMBER', nil)}") %>
 
 local:
   service: Disk

data/gemfiles/7.2.gemfile

@@ -26,6 +26,7 @@ group :test do
   gem 'minitest-reporters',       '>= 1.6.1'
   gem 'mocha',                    '>= 2.3.0', require: false
   gem 'ostruct'
+  gem 'parallel_tests', '~> 5.7', require: false
   gem 'puma'
   gem 'rails-controller-testing', '~> 1.0.5'
   gem 'rubocop',                  '~> 1.81.1', require: false

data/gemfiles/8.0.gemfile

@@ -26,6 +26,7 @@ group :test do
   gem 'minitest-reporters',       '>= 1.6.1'
   gem 'mocha',                    '>= 2.3.0', require: false
   gem 'ostruct'
+  gem 'parallel_tests', '~> 5.7', require: false
   gem 'puma'
   gem 'rails-controller-testing', '~> 1.0.5'
   gem 'rubocop',                  '~> 1.81.1', require: false

data/gemfiles/8.1.gemfile

@@ -26,6 +26,7 @@ group :test do
   gem 'minitest-reporters',       '>= 1.6.1'
   gem 'mocha',                    '>= 2.3.0', require: false
   gem 'ostruct'
+  gem 'parallel_tests', '~> 5.7', require: false
   gem 'puma'
   gem 'rails-controller-testing', '~> 1.0.5'
   gem 'rubocop',                  '~> 1.81.1', require: false

data/lib/comfortable_media_surfer/access_control/admin_authentication.rb

@@ -7,8 +7,8 @@ module ComfortableMediaSurfer::AccessControl
     #   ComfortableMediaSurfer::AccessControl::AdminAuthentication.username = 'myname'
     #   ComfortableMediaSurfer::AccessControl::AdminAuthentication.password = 'mypassword'
 
-    mattr_accessor  :username,
-                    :password
+    mattr_accessor :username,
+                   :password
 
     # Simple http_auth. When implementing some other form of authentication
     # this method should return +true+ if everything is great, or redirect user

data/lib/comfortable_media_surfer/content/tags/date.rb

@@ -7,7 +7,7 @@ class ComfortableMediaSurfer::Content::Tags::Date < ComfortableMediaSurfer::Cont
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
     options = { id: form_field_id, class: 'form-control', data: { 'cms-date' => true } }
-    value   = content.present? ? content.to_s(:db) : ''
+    value   = content.present? ? content.to_fs(:db) : ''
     input   = view.send(:text_field_tag, name, value, options)
 
     yield input

data/lib/comfortable_media_surfer/content/tags/datetime.rb

@@ -30,7 +30,7 @@ class ComfortableMediaSurfer::Content::Tags::Datetime < ComfortableMediaSurfer::
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
     options = { id: form_field_id, class: 'form-control', data: { 'cms-datetime' => true } }
-    value   = content.present? ? content.to_s(:db) : ''
+    value   = content.present? ? content.to_fs(:db) : ''
     input   = view.send(:text_field_tag, name, value, options)
 
     yield input

data/lib/comfortable_media_surfer/extensions/has_revisions.rb

@@ -32,8 +32,8 @@ module ComfortableMediaSurfer::Extensions::HasRevisions
 
       if (respond_to?(:fragments_attributes_changed) && fragments_attributes_changed) ||
          !!changed.intersect?(revision_fields)
-        self.revision_data = revision_fields.each_with_object({}) do |field, c|
-          c[field] = send("#{field}_was")
+        self.revision_data = revision_fields.to_h do |field|
+          [field, send("#{field}_was")]
         end
       end
     end

data/lib/comfortable_media_surfer/routing.rb

@@ -35,6 +35,8 @@ module ComfortableMediaSurfer::Routing
                 concerns :with_revisions, controller: 'revisions/page'
 
                 get :toggle_branch, on: :member
+                patch :publish_children, on: :member
+                patch :unpublish_children, on: :member
 
                 resources :translations, except: [:index] do
                   concerns :with_form_fragments

data/lib/comfortable_media_surfer/seeds/page/importer.rb

@@ -63,16 +63,21 @@ module ComfortableMediaSurfer::Seeds::Page
 
         new_frag_identifiers, fragments_attributes =
           construct_fragments_attributes(fragments_hash, page, path)
-        page.fragments_attributes = fragments_attributes
+        page_saved = begin
+          page.fragments_attributes = fragments_attributes
+          page.save
+        ensure
+          close_fragment_files(fragments_attributes)
+        end
 
-        if page.save
+        if page_saved
           message = "[CMS SEEDS] Imported Page \t #{page.full_path}"
           ComfortableMediaSurfer.logger.info(message)
 
           # defering target page linking
           if target_page.present?
             self.target_pages ||= {}
-            self.target_pages[page.id] = target_page
+            target_pages[page.id] = target_page
           end
 
           # cleaning up old fragments
@@ -127,9 +132,14 @@ module ComfortableMediaSurfer::Seeds::Page
 
         new_frag_identifiers, fragments_attributes =
           construct_fragments_attributes(fragments_hash, translation, path)
-        translation.fragments_attributes = fragments_attributes
+        translation_saved = begin
+          translation.fragments_attributes = fragments_attributes
+          translation.save
+        ensure
+          close_fragment_files(fragments_attributes)
+        end
 
-        if translation.save
+        if translation_saved
           message = "[CMS SEEDS] Imported Translation \t #{locale}"
           ComfortableMediaSurfer.logger.info(message)
 
@@ -186,13 +196,15 @@ module ComfortableMediaSurfer::Seeds::Page
     # ActiveStorage and a list of ids of old attachements to destroy
     def files_content(record, identifier, path, frag_content)
       # preparing attachments
-      files = frag_content.split("\n").collect do |filename|
-        file_handler = File.open(File.join(path, filename))
-        {
+      files = []
+      frag_content.split("\n").each do |filename|
+        file_handler = File.new(File.join(path, filename), 'rb')
+        attachment = {
           io: file_handler,
-          filename: filename,
-          content_type: MimeMagic.by_magic(file_handler)
+          filename: filename
         }
+        files << attachment
+        attachment[:content_type] = MimeMagic.by_magic(file_handler)
       end
 
       # ensuring that old attachments get removed
@@ -202,12 +214,28 @@ module ComfortableMediaSurfer::Seeds::Page
       end
 
       [files, ids_destroy]
+    rescue StandardError
+      close_files(files)
+      raise
+    end
+
+    def close_fragment_files(fragment_attributes)
+      fragment_attributes.each do |attributes|
+        close_files(attributes[:files])
+      end
+    end
+
+    def close_files(files)
+      Array(files).each do |file|
+        io = file[:io]
+        io.close unless io.closed?
+      end
     end
 
     def link_target_pages
-      return unless self.target_pages.present?
+      return unless target_pages.present?
 
-      self.target_pages.each do |page_id, target|
+      target_pages.each do |page_id, target|
         if (target = site.pages.find_by(full_path: target))
           @site.pages.find(page_id).update_column(:target_page_id, target.id)
         end

data/lib/comfortable_media_surfer/seeds.rb

@@ -46,9 +46,7 @@ module ComfortableMediaSurfer::Seeds
       text = ::File.read(file_path)
       tokens = text.split(%r{^\[(.*?)\]\r?\n})
       tokens.shift # first item should be blank
-      tokens.in_groups_of(2).each_with_object({}) do |pair, h|
-        h[pair[0]] = pair[1]
-      end
+      tokens.in_groups_of(2).to_h
     end
 
     def fresh_seed?(object, file_path)

data/lib/comfortable_media_surfer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ComfortableMediaSurfer
-  VERSION = '3.1.6'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_media_surfer
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.2.0
 platform: ruby
 authors:
 - Oleg Khabarov
@@ -556,7 +556,6 @@ files:
 - db/migrate/00_create_active_storage_tables.active_storage.rb
 - db/migrate/01_create_cms.rb
 - db/migrate/02_add_markdown_to_snippets.rb
-- gemfiles/7.1.gemfile
 - gemfiles/7.2.gemfile
 - gemfiles/8.0.gemfile
 - gemfiles/8.1.gemfile
@@ -659,7 +658,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Rails 7.0+ CMS Engine
 test_files: []

data/gemfiles/7.1.gemfile

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-gemspec path: '../'
-
-gem 'rails', '~> 7.1.0', '>= 7.1.5.1'
-
-group :development, :test do
-  gem 'autoprefixer-rails', '~> 10.4.16.0'
-  gem 'byebug',             '~> 11.1.0', platforms: %i[mri mingw x64_mingw]
-  gem 'image_processing',   '>= 1.12.0'
-  gem 'propshaft',          '~> 1.1.0'
-  gem 'sqlite3',            '>= 2.1'
-end
-
-group :test do
-  gem 'brakeman',                 '~> 7.1.0'
-  gem 'bundler-audit',            '~> 0.9.1'
-  gem 'coveralls_reborn',         '~> 0.29.0', require: false
-  gem 'cuprite',                  '>= 0.15'
-  gem 'diffy'
-  gem 'equivalent-xml',           '~> 0.6.0'
-  gem 'minitest',                 '< 6.0.0'
-  gem 'minitest-reporters',       '>= 1.6.1'
-  gem 'mocha',                    '>= 2.3.0', require: false
-  gem 'ostruct'
-  gem 'puma'
-  gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.81.1', require: false
-  gem 'rubocop-minitest'
-  gem 'rubocop-rails'
-  gem 'simplecov', '~> 0.22.0', require: false
-end