panda-cms 0.7.4 → 0.7.5

data/lib/panda/cms/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubygems"
 require "panda/core"
 require "panda/core/engine"
@@ -17,9 +19,7 @@ module Panda
 
       # Basic session setup only
       initializer "panda_cms.session", before: :load_config_initializers do |app|
-        if app.config.middleware.frozen?
-          app.config.middleware = app.config.middleware.dup
-        end
+        app.config.middleware = app.config.middleware.dup if app.config.middleware.frozen?
 
         app.config.session_store :cookie_store, key: "_panda_cms_session"
         app.config.middleware.use ActionDispatch::Cookies
@@ -28,15 +28,16 @@ module Panda
 
       config.to_prepare do
         ApplicationController.helper(::ApplicationHelper)
+        ApplicationController.helper(Panda::CMS::AssetHelper)
       end
 
       # Set our generators
       config.generators do |g|
         g.orm :active_record, primary_key_type: :uuid
         g.test_framework :rspec, fixture: true
-        g.fixture_replacement :factory_bot, dir: "spec/factories"
+        g.fixture_replacement nil
         g.view_specs false
-        g.templates.unshift File.expand_path("../../templates", __FILE__)
+        g.templates.unshift File.expand_path("../templates", __dir__)
       end
 
       # Make files in public available to the main app (e.g. /panda_cms-assets/favicon.ico)
@@ -70,9 +71,7 @@ module Panda
       initializer "panda_cms.importmap", before: "importmap" do |app|
         if app.config.respond_to?(:importmap)
           # Create a new array if frozen
-          if app.config.importmap.paths.frozen?
-            app.config.importmap.paths = app.config.importmap.paths.dup
-          end
+          app.config.importmap.paths = app.config.importmap.paths.dup if app.config.importmap.paths.frozen?
 
           # Add our paths
           app.config.importmap.paths << root.join("config/importmap.rb")
@@ -96,13 +95,13 @@ module Panda
         end
       end
 
-      initializer "#{engine_name}.backtrace_cleaner" do |app|
+      initializer "#{engine_name}.backtrace_cleaner" do |_app|
         engine_root_regex = Regexp.escape(root.to_s + File::SEPARATOR)
 
         # Clean those ERB lines, we don't need the internal autogenerated
         # ERB method, what we do need (line number in ERB file) is already there
         Rails.backtrace_cleaner.add_filter do |line|
-          line.sub(/(\.erb:\d+):in `__.*$/, "\\1")
+          line.sub(/(\.erb:\d+):in `__.*$/, '\\1')
         end
 
         # Remove our own engine's path prefix, even if it's
@@ -124,15 +123,13 @@ module Panda
         end
       end
 
-      # Set up ViewComponent and Lookbook
-      # config.view_component.component_parent_class = "Panda::CMS::BaseComponent"
-      # config.view_component.view_component_path = Panda::CMS::Engine.root.join("lib/components").to_s
-      # config.eager_load_paths << Panda::CMS::Engine.root.join("lib/components").to_s
-      # config.view_component.generate.sidecar = true
-      # config.view_component.generate.preview = truexw
-      # config.view_component.preview_paths ||= []
-      # config.view_component.preview_paths << Panda::CMS::Engine.root.join("lib/component_previews").to_s
-      # config.view_component.generate.preview_path = "lib/component_previews"
+      # Set up ViewComponent
+      initializer "panda_cms.view_component" do |app|
+        app.config.view_component.preview_paths ||= []
+        app.config.view_component.preview_paths << root.join("spec/components/previews")
+        app.config.view_component.generate.sidecar = true
+        app.config.view_component.generate.preview = true
+      end
 
       # Set up authentication
       initializer "panda_cms.omniauth", before: "omniauth" do |app|
@@ -216,26 +213,26 @@ module Panda
         }
 
         available_providers.each do |provider, options|
-          if Panda::CMS.config.authentication.dig(provider, :enabled)
-            auth_path = auth_path.starts_with?("/") ? auth_path : "/#{auth_path}"
-            options[:defaults][:path_prefix] = auth_path
+          next unless Panda::CMS.config.authentication.dig(provider, :enabled)
+
+          auth_path = auth_path.starts_with?("/") ? auth_path : "/#{auth_path}"
+          options[:defaults][:path_prefix] = auth_path
 
-            options[:defaults][:redirect_uri] = if Rails.env.test?
-              "#{Capybara.app_host}#{auth_path}/#{provider}#{callback_path}"
-            else
-              "#{Panda::CMS.config.url}#{auth_path}/#{provider}#{callback_path}"
-            end
+          options[:defaults][:redirect_uri] = if Rails.env.test?
+            "#{Capybara.app_host}#{auth_path}/#{provider}#{callback_path}"
+          else
+            "#{Panda::CMS.config.url}#{auth_path}/#{provider}#{callback_path}"
+          end
 
-            provider_config = options[:defaults].merge(Panda::CMS.config.authentication[provider])
+          provider_config = options[:defaults].merge(Panda::CMS.config.authentication[provider])
 
-            app.config.middleware.use OmniAuth::Builder do
-              provider options[:strategy], provider_config
-            end
+          app.config.middleware.use OmniAuth::Builder do
+            provider options[:strategy], provider_config
           end
         end
       end
 
-      config.before_initialize do |app|
+      config.before_initialize do |_app|
         # Default configuration
         Panda::CMS.configure do |config|
           # Array of additional EditorJS tools to load

data/lib/panda/cms/exceptions_app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # https://guides.rubyonrails.org/configuring.html#config-exceptions-app
 module Panda
   module CMS

data/lib/panda/cms/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class Railtie < Rails::Railtie

data/lib/panda/cms/slug.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class Slug
@@ -13,7 +15,7 @@ module Panda
         # Replace & with "and"
         string = string.gsub("&", "and")
         # Remove special characters
-        string = string.gsub(/[\!\@\£\$\%\^\&\*\(\)\+\=\{\}\[\]\:\;\"\'\|\\\`\<\>\?\,\.\/]+/, "")
+        string = string.gsub(%r{[!@£\\\^\[\]/]+}, "")
         # Replace any whitespace character with -
         string = string.gsub(/[^\w\s-]/, "-")
         # Replace multiple occurences of _ and - with -

data/lib/panda-cms/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
-    VERSION = "0.7.4"
+    VERSION = "0.7.5"
   end
 end

data/lib/panda-cms.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require "rubygems"
 require "panda/core"
 require "panda/cms/railtie"
-
-require "capybara/rspec"
+require "view_component"
 
 module Panda
   module CMS
@@ -73,6 +74,7 @@ require_relative "panda-cms/version"
 require_relative "panda/cms/exceptions_app"
 require_relative "panda/cms/engine"
 require_relative "panda/cms/demo_site_generator"
+require_relative "panda/cms/asset_loader"
 require_relative "panda/cms/editor_js"
 require_relative "panda/cms/editor_js_content"
 require_relative "panda/cms/editor_js/renderer"