panda-cms 0.7.3 → 0.7.5

data/lib/panda/cms/editor_js/blocks/alert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module EditorJs

data/lib/panda/cms/editor_js/blocks/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module EditorJs

data/lib/panda/cms/editor_js/blocks/header.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module EditorJs

data/lib/panda/cms/editor_js/blocks/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module EditorJs
@@ -27,6 +29,7 @@ module Panda
 
           def caption_element(caption)
             return "" if caption.blank?
+
             "<figcaption>#{caption}</figcaption>"
           end
         end

data/lib/panda/cms/editor_js/blocks/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module EditorJs

data/lib/panda/cms/editor_js/blocks/paragraph.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module EditorJs
@@ -6,6 +8,7 @@ module Panda
           def render
             content = sanitize(data["text"])
             return "" if content.blank?
+
             html_safe("<p>#{content}</p>")
           end
         end

data/lib/panda/cms/editor_js/blocks/quote.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module EditorJs
@@ -32,6 +34,7 @@ module Panda
 
           def caption_element(caption)
             return "" if caption.blank?
+
             "<figcaption>#{sanitize(caption)}</figcaption>"
           end
         end

data/lib/panda/cms/editor_js/blocks/table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module EditorJs
@@ -23,7 +25,7 @@ module Panda
             index = 0
 
             while index < content.length
-              rows << if index == 0 && with_headings
+              rows << if index.zero? && with_headings
                 render_header_row(content[index])
               else
                 render_data_row(content[index])

data/lib/panda/cms/editor_js/renderer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sanitize"
 
 module Panda
@@ -60,6 +62,7 @@ module Panda
               # Only allow the exact valid content we expect
               valid_content = '<figure class="text-left"><blockquote><p>Valid HTML</p></blockquote><figcaption>Valid caption</figcaption></figure>'
               return html if html.strip == valid_content.strip
+
               return ""
             end
 

data/lib/panda/cms/editor_js.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "editor_js/blocks/base"
 require_relative "editor_js/blocks/alert"
 require_relative "editor_js/blocks/header"

data/lib/panda/cms/editor_js_content.rb

@@ -1,34 +1,61 @@
+# frozen_string_literal: true
+
 require "json"
 
-module Panda::CMS::EditorJsContent
-  extend ActiveSupport::Concern
+module Panda
+  module CMS
+    module EditorJsContent
+      extend ActiveSupport::Concern
 
-  included do
-    include ActiveModel::Validations
-    include ActiveModel::Callbacks
+      included do
+        include ActiveModel::Validations
+        include ActiveModel::Callbacks
 
-    before_save :generate_cached_content
-  end
+        before_save :generate_cached_content
+      end
+
+      def content=(value)
+        if value.is_a?(Hash)
+          super(value.to_json)
+        else
+          super
+        end
+      end
+
+      def content
+        value = super
+        if value.is_a?(String)
+          begin
+            JSON.parse(value)
+          rescue JSON::ParserError
+            value
+          end
+        else
+          value
+        end
+      end
 
-  def generate_cached_content
-    if content.is_a?(String)
-      begin
-        parsed_content = JSON.parse(content)
-        self.cached_content = if parsed_content.is_a?(Hash) && parsed_content["blocks"].present?
-          Panda::CMS::EditorJs::Renderer.new(parsed_content).render
+      def generate_cached_content
+        if content.is_a?(String)
+          begin
+            parsed_content = JSON.parse(content)
+            self.cached_content = if parsed_content.is_a?(Hash) && parsed_content["blocks"].present?
+              Panda::CMS::EditorJs::Renderer.new(parsed_content).render
+            else
+              content
+            end
+          rescue JSON::ParserError
+            # If it's not JSON, treat it as plain text
+            self.cached_content = content
+          end
+        elsif content.is_a?(Hash) && content["blocks"].present?
+          # Process EditorJS content
+          self.cached_content = Panda::CMS::EditorJs::Renderer.new(content).render
         else
-          content
+          # For any other case, store as is
+          self.cached_content = content.to_s
         end
-      rescue JSON::ParserError
-        # If it's not JSON, treat it as plain text
-        self.cached_content = content
       end
-    elsif content.is_a?(Hash) && content["blocks"].present?
-      # Process EditorJS content
-      self.cached_content = Panda::CMS::EditorJs::Renderer.new(content).render
-    else
-      # For any other case, store as is
-      self.cached_content = content.to_s
     end
   end
 end

data/lib/panda/cms/engine.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 require "rubygems"
 require "panda/core"
+require "panda/core/engine"
 require "panda/cms/railtie"
 
+require "invisible_captcha"
+
 module Panda
   module CMS
     class Engine < ::Rails::Engine
       isolate_namespace Panda::CMS
-      engine_name "panda-cms"
 
       # Add services directory to autoload paths
       config.autoload_paths += %W[
@@ -14,10 +18,8 @@ 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
+      initializer "panda_cms.session", before: :load_config_initializers do |app|
+        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
@@ -26,18 +28,19 @@ 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)
+      # Make files in public available to the main app (e.g. /panda_cms-assets/favicon.ico)
       config.app_middleware.use(
         Rack::Static,
         urls: ["/panda-cms-assets"],
@@ -47,7 +50,7 @@ module Panda
       # Custom error handling
       # config.exceptions_app = Panda::CMS::ExceptionsApp.new(exceptions_app: routes)
 
-      initializer "panda.cms.assets" do |app|
+      initializer "panda_cms.assets" do |app|
         if Rails.configuration.respond_to?(:assets)
           # Add JavaScript paths
           app.config.assets.paths << root.join("app/javascript")
@@ -65,12 +68,10 @@ module Panda
       end
 
       # Add importmap paths from the engine
-      initializer "panda.cms.importmap", before: "importmap" do |app|
+      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")
@@ -94,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
@@ -122,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|
@@ -214,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.3"
+    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
@@ -18,6 +19,19 @@ module Panda
     setting :editor_js_tools, default: []
     setting :editor_js_tool_config, default: {}
 
+    setting :instagram, default: {
+      enabled: false,
+      username: nil,
+      access_token: nil
+    }
+
+    setting :analytics, default: {
+      google_analytics: {
+        enabled: false,
+        tracking_id: nil
+      }
+    }
+
     def self.root_path
       config.admin_path
     end
@@ -60,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"