comfortable_media_surfer 3.0.0 → 3.1.1

data/app/assets/javascripts/comfy/vendor/redactor/video.js

@@ -1,77 +1,82 @@
-if (!RedactorPlugins) var RedactorPlugins = {};
-
-(function($)
-{
-	RedactorPlugins.video = function()
-	{
-		return {
-			reUrlYoutube: /https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig,
-			reUrlVimeo: /https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/,
-			getTemplate: function()
-			{
-				return String()
-				+ '<section id="redactor-modal-video-insert">'
-					+ '<label>' + this.lang.get('video_html_code') + '</label>'
-					+ '<textarea id="redactor-insert-video-area" style="height: 160px;"></textarea>'
-				+ '</section>';
-			},
-			init: function()
-			{
-				var button = this.button.addAfter('image', 'video', this.lang.get('video'));
-				this.button.addCallback(button, this.video.show);
-			},
-			show: function()
-			{
-				this.modal.addTemplate('video', this.video.getTemplate());
+import jQuery from "jquery";
 
-				this.modal.load('video', this.lang.get('video'), 700);
-				this.modal.createCancelButton();
+if (!RedactorPlugins) var RedactorPlugins = {};
 
-				var button = this.modal.createActionButton(this.lang.get('insert'));
-				button.on('click', this.video.insert);
+(function ($) {
+  RedactorPlugins.video = function () {
+    return {
+      reUrlYoutube:
+        /https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/gi,
+      reUrlVimeo: /https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/,
+      getTemplate: function () {
+        return (
+          String() +
+          '<section id="redactor-modal-video-insert">' +
+          "<label>" +
+          this.lang.get("video_html_code") +
+          "</label>" +
+          '<textarea id="redactor-insert-video-area" style="height: 160px;"></textarea>' +
+          "</section>"
+        );
+      },
+      init: function () {
+        var button = this.button.addAfter(
+          "image",
+          "video",
+          this.lang.get("video")
+        );
+        this.button.addCallback(button, this.video.show);
+      },
+      show: function () {
+        this.modal.addTemplate("video", this.video.getTemplate());
 
-				this.selection.save();
-				this.modal.show();
+        this.modal.load("video", this.lang.get("video"), 700);
+        this.modal.createCancelButton();
 
-				$('#redactor-insert-video-area').focus();
+        var button = this.modal.createActionButton(this.lang.get("insert"));
+        button.on("click", this.video.insert);
 
-			},
-			insert: function()
-			{
-				var data = $('#redactor-insert-video-area').val();
+        this.selection.save();
+        this.modal.show();
 
-				if (!data.match(/<iframe|<video/gi))
-				{
-					data = this.clean.stripTags(data);
+        $("#redactor-insert-video-area").focus();
+      },
+      insert: function () {
+        var data = $("#redactor-insert-video-area").val();
 
-					// parse if it is link on youtube & vimeo
-					var iframeStart = '<iframe style="width: 500px; height: 281px;" src="',
-						iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
+        if (!data.match(/<iframe|<video/gi)) {
+          data = this.clean.stripTags(data);
 
-					if (data.match(this.video.reUrlYoutube))
-					{
-						data = data.replace(this.video.reUrlYoutube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
-					}
-					else if (data.match(this.video.reUrlVimeo))
-					{
-						data = data.replace(this.video.reUrlVimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
-					}
-				}
+          // parse if it is link on youtube & vimeo
+          var iframeStart =
+              '<iframe style="width: 500px; height: 281px;" src="',
+            iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
 
-				this.selection.restore();
-				this.modal.close();
+          if (data.match(this.video.reUrlYoutube)) {
+            data = data.replace(
+              this.video.reUrlYoutube,
+              iframeStart + "//www.youtube.com/embed/$1" + iframeEnd
+            );
+          } else if (data.match(this.video.reUrlVimeo)) {
+            data = data.replace(
+              this.video.reUrlVimeo,
+              iframeStart + "//player.vimeo.com/video/$2" + iframeEnd
+            );
+          }
+        }
 
-				var current = this.selection.getBlock() || this.selection.getCurrent();
+        this.selection.restore();
+        this.modal.close();
 
-				if (current) $(current).after(data);
-				else
-				{
-					this.insert.html(data);
-				}
+        var current = this.selection.getBlock() || this.selection.getCurrent();
 
-				this.code.sync();
-			}
+        if (current) $(current).after(data);
+        else {
+          this.insert.html(data);
+        }
 
-		};
-	};
-})(jQuery);
+        this.code.sync();
+      },
+    };
+  };
+})(jQuery);

data/app/assets/javascripts/comfy/vendor/redactor.js

@@ -13,6 +13,8 @@
 	fixes and tweaks annotated with "COMFY FIX"
 */
 
+import jQuery from 'jquery';
+
 (function($)
 {
 

data/app/assets/stylesheets/comfy/admin/cms/application.sass

@@ -1,9 +1,9 @@
 @import "comfy/vendor/bootstrap/bootstrap"
 
-@import "comfy/vendor/codemirror"
+@import "codemirror/lib/codemirror"
 @import "comfy/vendor/fontawesome"
 @import "comfy/vendor/redactor"
-@import "comfy/vendor/flatpickr.min"
+@import "flatpickr/dist/flatpickr.min"
 
 @import "comfy/admin/cms/codemirror_overrides"
 @import "comfy/admin/cms/redactor_overrides"

data/app/assets/stylesheets/comfy/admin/cms/codemirror_overrides.sass

@@ -15,5 +15,5 @@ body#comfy
   .CodeMirror-focused
     border-color: rgba(82, 168, 236, 0.8)
     outline: 0
-    outline: thin dotted \9
+    outline: "thin dotted \9"
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6)

data/app/helpers/comfy/admin/cms_helper.rb

@@ -4,11 +4,11 @@ module Comfy
   module Admin
     module CmsHelper
       # Wrapper around Comfy::FormBuilder
-      def comfy_form_with(**options, &block)
+      def comfy_form_with(**options, &)
         form_options = options.merge(builder: ComfortableMediaSurfer::FormBuilder)
         form_options[:bootstrap]  = { layout: :horizontal }
         form_options[:local]      = true
-        bootstrap_form_with(**form_options, &block)
+        bootstrap_form_with(**form_options, &)
       end
 
       def comfy_admin_partial(path, params = {})

data/comfortable_media_surfer.gemspec

@@ -9,29 +9,27 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Oleg Khabarov', 'Andrew vonderLuft', 'ShakaCode']
   spec.email         = ['justin@shakacode.com']
   spec.homepage      = 'https://github.com/shakacode/comfortable-media-surfer'
-  spec.summary       = 'Rails 6.1-7.1+ CMS Engine'
-  spec.description   = 'ComfortableMediaSurfer is a powerful Rails 6.1-7.1+ CMS Engine'
+  spec.summary       = 'Rails 7.0+ CMS Engine'
+  spec.description   = 'ComfortableMediaSurfer is a powerful Rails 7.0+ CMS Engine'
   spec.license       = 'MIT'
 
+  spec.post_install_message = 'Please run rake comfy:compile_assets to compile assets.'
+
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|doc)/})
   end
 
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.2.0'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.add_dependency 'active_link_to',       '~> 1.0',   '>= 1.0.5'
   spec.add_dependency 'comfy_bootstrap_form', '~> 4.0',   '>= 4.0.0'
   spec.add_dependency 'haml-rails',           '~> 2.1',   '>= 2.1.0'
   spec.add_dependency 'image_processing',     '~> 1.2',   '>= 1.12.2'
-  spec.add_dependency 'jquery-rails',         '~> 4.6',   '>= 4.6.0'
   spec.add_dependency 'kaminari',             '~> 1.2',   '>= 1.2.2'
   spec.add_dependency 'kramdown',             '~> 2.4',   '>= 2.4.0'
   spec.add_dependency 'mimemagic',            '~> 0.4',   '>= 0.4.3'
   spec.add_dependency 'mini_magick',          '~> 4.12',  '>= 4.12.0'
-  spec.add_dependency 'rails',                '>= 6.1.0'
+  spec.add_dependency 'rails',                '>= 7.0.0'
   spec.add_dependency 'rails-i18n',           '>= 6.0.0'
-  spec.add_dependency 'sassc-rails',          '~> 2.1',   '>= 2.1.2'
-  spec.add_dependency 'sprockets-rails',      '~> 3.4',   '>= 3.4.2'
-  spec.add_development_dependency "gem-release"
 end

data/config/application.rb

@@ -17,7 +17,7 @@ module ComfortableMediaSurfer
     if Gem::Version.new(Rails.version) >= Gem::Version.new('7.1.0')
       config.active_record.default_column_serializer = YAML
       config.active_record.before_committed_on_all_records = false
-      config.active_record.commit_transaction_on_non_local_return = false
+      # config.active_record.commit_transaction_on_non_local_return = false # deprecated in Rails 8
       config.active_record.run_after_transaction_callbacks_in_order_defined = false
       config.active_support.message_serializer = :json
       config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = true

data/config/environments/development.rb

@@ -16,22 +16,19 @@ defined?(ComfortableMediaSurfer::Application) && ComfortableMediaSurfer::Applica
   # Show full error reports.
   config.consider_all_requests_local = true
 
-  # Enable server timing
+  # Enable server timing.
   config.server_timing = true
 
-  # Enable/disable caching. By default caching is disabled.
-  # Run rails dev:cache to toggle caching.
+  # Enable/disable Action Controller caching. By default Action Controller caching is disabled.
+  # Run rails dev:cache to toggle Action Controller caching.
   if Rails.root.join('tmp/caching-dev.txt').exist?
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
-    config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.to_i}"
-    }
+    config.public_file_server.headers = { 'cache-control' => "public, max-age=#{2.days.to_i}" }
   else
     config.action_controller.perform_caching = false
-
     config.cache_store = :null_store
   end
 
@@ -41,8 +38,12 @@ defined?(ComfortableMediaSurfer::Application) && ComfortableMediaSurfer::Applica
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  # Make template changes take effect immediately.
   config.action_mailer.perform_caching = false
 
+  # Set localhost to be used by links generated in mailer templates.
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
@@ -61,9 +62,6 @@ defined?(ComfortableMediaSurfer::Application) && ComfortableMediaSurfer::Applica
   # Highlight code that enqueued background job in logs.
   config.active_job.verbose_enqueue_logs = true
 
-  # Suppress logger output for asset requests.
-  config.assets.quiet = true
-
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 
@@ -77,4 +75,7 @@ defined?(ComfortableMediaSurfer::Application) && ComfortableMediaSurfer::Applica
     # Raise error when a before_action's only/except options reference missing actions
     config.action_controller.raise_on_missing_callback_actions = true
   end
+
+  # Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
+  # config.generators.apply_rubocop_autocorrect_after_generate!
 end

data/config/environments/production.rb

@@ -25,12 +25,6 @@ defined?(ComfortableMediaSurfer::Application) && ComfortableMediaSurfer::Applica
   # Enable static file serving from the `/public` folder (turn off if using NGINX/Apache for it).
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress CSS using a preprocessor.
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.asset_host = "http://assets.example.com"
 

data/config/puma.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# This configuration file will be evaluated by Puma. The top-level methods that
+# are invoked here are part of Puma's configuration DSL. For more information
+# about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html.
+#
+# Puma starts a configurable number of processes (workers) and each process
+# serves each request in a thread from an internal thread pool.
+#
+# You can control the number of workers using ENV["WEB_CONCURRENCY"]. You
+# should only set this value when you want to run 2 or more workers. The
+# default is already 1.
+#
+# The ideal number of threads per worker depends both on how much time the
+# application spends waiting for IO operations and on how much you wish to
+# prioritize throughput over latency.
+#
+# As a rule of thumb, increasing the number of threads will increase how much
+# traffic a given process can handle (throughput), but due to CRuby's
+# Global VM Lock (GVL) it has diminishing returns and will degrade the
+# response time (latency) of the application.
+#
+# The default is set to 3 threads as it's deemed a decent compromise between
+# throughput and latency for the average Rails application.
+#
+# Any libraries that use a connection pool or another resource pool should
+# be configured to provide at least as many connections as the number of
+# threads. This includes Active Record's `pool` parameter in `database.yml`.
+threads_count = ENV.fetch('RAILS_MAX_THREADS', 3)
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+port ENV.fetch('PORT', 3000)
+
+# Allow puma to be restarted by `bin/rails restart` command.
+plugin :tmp_restart
+
+# Run the Solid Queue supervisor inside of Puma for single-server deployments
+plugin :solid_queue if ENV['SOLID_QUEUE_IN_PUMA']
+
+# Specify the PID file. Defaults to tmp/pids/server.pid in development.
+# In other environments, only set the PID file if requested.
+pidfile ENV['PIDFILE'] if ENV['PIDFILE']

data/gemfiles/7.1.gemfile

@@ -5,13 +5,14 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: '../'
 
-gem 'rails', '~> 7.1.0', '>= 7.1.1'
+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 'sqlite3',            '~> 1.6.7'
+  gem 'propshaft',          '~> 1.1.0'
+  gem 'sqlite3',            '>= 2.1'
 end
 
 group :test do

data/gemfiles/7.2.gemfile

@@ -5,13 +5,14 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: '../'
 
-gem 'rails', '~> 7.2.0', '>= 7.2.2'
+gem 'rails', '~> 7.2.0', '>= 7.2.2.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 'sqlite3',            '~> 1.6.7'
+  gem 'propshaft',          '~> 1.1.0'
+  gem 'sqlite3',            '>= 2.1'
 end
 
 group :test do

data/gemfiles/{6.1.gemfile → 8.0.gemfile}

@@ -5,13 +5,14 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: '../'
 
-gem 'rails', '~> 6.1.0'
+gem 'rails', '~> 8.0.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 'sqlite3',            '~> 1.6.7'
+  gem 'propshaft',          '~> 1.1.0'
+  gem 'sqlite3',            '>= 2.1'
 end
 
 group :test do

data/lib/comfortable_media_surfer/engine.rb

@@ -6,18 +6,13 @@ require 'rails-i18n'
 require 'comfy_bootstrap_form'
 require 'active_link_to'
 require 'kramdown'
-require 'jquery-rails'
 require 'haml-rails'
-require 'sassc-rails'
 
 module ComfortableMediaSurfer
   class Engine < ::Rails::Engine
-    initializer 'comfortable_media_surfer.setup_assets' do
-      ::ComfortableMediaSurfer::Engine.config.assets.precompile += %w[
-        comfy/admin/cms/application.js
-        comfy/admin/cms/application.css
-        comfy/admin/cms/lib/redactor-font.eot
-      ]
+    initializer 'comfortable_media_surfer.setup_assets' do |app|
+      app.config.assets.paths << root.join('app/assets/builds')
+      app.config.assets.precompile += %w[comfy/admin/cms/application.js comfy/admin/cms/application.css]
     end
 
     config.to_prepare do

data/lib/comfortable_media_surfer/extensions/has_revisions.rb

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

data/lib/comfortable_media_surfer/render_methods.rb

@@ -33,7 +33,7 @@ module ComfortableMediaSurfer::RenderMethods
   # it by passing :cms_site parameter with site's slug. For example:
   #   render cms_page: '/path/to/page', cms_site: 'default'
   #
-  def render(options = {}, locals = {}, &block)
+  def render(options = {}, locals = {}, &)
     return super unless options.is_a?(Hash)
 
     if (site_identifier = options.delete(:cms_site)) && !(@cms_site = Comfy::Cms::Site.find_by_identifier(site_identifier))
@@ -47,15 +47,15 @@ module ComfortableMediaSurfer::RenderMethods
     end
 
     if page_path
-      render_cms_page(page_path, options, locals, &block)
+      render_cms_page(page_path, options, locals, &)
     elsif layout_identifier
-      render_cms_layout(layout_identifier, options, locals, &block)
+      render_cms_layout(layout_identifier, options, locals, &)
     else
       super
     end
   end
 
-  def render_cms_page(path, options = {}, locals = {}, &block)
+  def render_cms_page(path, options = {}, locals = {}, &)
     path.gsub!(%r{^/#{@cms_site.path}}, '') if @cms_site.path.present?
 
     unless (@cms_page = @cms_site.pages.find_by_full_path(path))
@@ -77,10 +77,10 @@ module ComfortableMediaSurfer::RenderMethods
     options[:layout] ||= cms_app_layout.blank? ? nil : cms_app_layout
     options[:inline] = @cms_page.render
 
-    render(options, locals, &block)
+    render(options, locals, &)
   end
 
-  def render_cms_layout(identifier, options = {}, locals = {}, &block)
+  def render_cms_layout(identifier, options = {}, locals = {}, &)
     unless (@cms_layout = @cms_site.layouts.find_by_identifier(identifier))
       raise ComfortableMediaSurfer::MissingLayout, identifier
     end
@@ -97,7 +97,7 @@ module ComfortableMediaSurfer::RenderMethods
     options[:layout] ||= cms_app_layout.blank? ? nil : cms_app_layout
     options[:inline] = cms_page.render
 
-    render(options, locals, &block)
+    render(options, locals, &)
   end
 end
 

data/lib/comfortable_media_surfer/version.rb

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

data/lib/generators/comfy/scaffold/scaffold_generator.rb

@@ -16,7 +16,7 @@ module Comfy
 
       argument :model_args, type: :array, default: [], banner: 'attribute:type'
 
-      def initialize(*args, &block)
+      def initialize(*args, &)
         super
         @model_attrs = []
         model_args.each do |arg|

data/lib/tasks/cms_assets.rake

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+namespace :comfy do
+  desc 'Compile SCSS and JS assets for propshaft.'
+  task :compile_assets do
+    puts 'Compiling assets...'
+    dir = File.expand_path("#{__dir__}/..")
+    Dir.chdir(dir) do
+      unless system('npm install')
+        puts 'Error: Failed to install npm packages.'
+        exit(-1)
+      end
+      unless system('npm run build && npm run build:css')
+        puts 'Error: Failed to compile assets'
+        exit(-1)
+      end
+    end
+  end
+end