lookbook 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3433173da72195659b47da6abab72328d8954e8093281431fde9897b2a287a2f
-  data.tar.gz: d1a256196fc8a71de8e3e398c6b5ef4d46ac75c56a777e16ed5caa0c225041a7
+  metadata.gz: '0277029efee9bfc07832f5bc2ea7d1a57063a81e2e2986978c93abca8750fbe2'
+  data.tar.gz: c03b8c178645b7dba6572d37711cb4664ea4175fa56430acd595a369069d54c9
 SHA512:
-  metadata.gz: bb938670af6e7f781130ec3f193a4552baf7c69aae28891de5e62acb56a927b2906cf84f24007915793ba668507f5b461534ec1f996a9bb06110f9ed4daff821
-  data.tar.gz: e32ba2f2bb1bc13431432ff16a115d38f3ee13836226360c753b6b5adbd0d789fd6f8ead2d0d2abc588a9f8f14fc332619191da9995a71a8a11b024288bb10c3
+  metadata.gz: c34fbd701d1f7818dea444b9ad899b7dce012968a0cc0038dd197bf0e70ea2af105c2d299e3ac21302f9276d0dde162b56cfebb8f45ba4e7eb9c1ab1455c4555
+  data.tar.gz: 50613e6f04c758f5c93fa4ff659a0a0a4c1a903e80d167a3c1aead2f6e5af7278549b260255405c077fe1f35ba920fc050fdfdb0dab4d37ce7df18658f6ace47

data/app/controllers/lookbook/application_controller.rb

@@ -57,6 +57,8 @@ module Lookbook
     end
 
     def handle_error(err)
+      raise err if Lookbook.config.preview_disable_error_handling
+
       @error = err.is_a?(Lookbook::Error) ? err : Lookbook::Error.new(original: err)
       @status_code = get_status_code(err)
 

data/app/controllers/lookbook/embeds_controller.rb

@@ -21,7 +21,7 @@ module Lookbook
       if props.preview.present?
         preview = Engine.previews.find_by_preview_class(props.preview)
         if preview.present?
-          props.scenarios ||= (props.scenario || "")
+          props.scenarios ||= props.scenario || ""
           scenario = preview.scenario(Array(props.scenarios).first)
 
           boolean_options = ["display_option_controls"]

data/app/controllers/lookbook/page_controller.rb

@@ -15,7 +15,7 @@ module Lookbook
       @next_page = @pages.next(@page)
       @previous_page = @pages.previous(@page)
 
-      content = ActionViewAnnotationsHandler.call(disable_annotations: true) do
+      content = ActionViewConfigHandler.call do
         render_to_string inline: @page.content, locals: {
           page: @page,
           next_page: @next_page,

data/config/app.yml

@@ -21,8 +21,10 @@ shared:
     display_option_controls: true
   preview_layout: ~
   preview_disable_action_view_annotations: true
+  preview_disable_action_view_partial_prefixes: true
   preview_type_default: view_component
   preview_sort_scenarios: false
+  preview_disable_error_handling: false
 
   page_collection_label: "Pages"
   page_nav_filter: false

data/lib/lookbook/preview_controller_actions.rb

@@ -21,24 +21,23 @@ module Lookbook
         opts[:assigns] = @render_args[:assigns] || {}
         opts[:locals] = locals if locals.present?
 
-        rendered = render_to_string(template, **opts)
-
-        if scenario.after_render_method.present?
-          render_context = Store.new({
-            preview: preview,
-            scenario: scenario,
-            params: user_request_parameters
-          })
-          rendered = @preview.after_render(method: scenario.after_render_method, html: rendered, context: render_context)
-        end
+        with_action_view_settings do
+          rendered = render_to_string(template, **opts)
 
-        with_optional_action_view_annotations do
+          if scenario.after_render_method.present?
+            render_context = Store.new({
+              preview: preview,
+              scenario: scenario,
+              params: user_request_parameters
+            })
+            rendered = @preview.after_render(method: scenario.after_render_method, html: rendered, context: render_context)
+          end
           render html: rendered
         end
       end
 
       def render_in_layout_to_string(template, locals, opts = {})
-        with_optional_action_view_annotations do
+        with_action_view_settings do
           html = render_to_string(template, locals: locals, **determine_layout(opts[:layout]))
           if opts[:append_html].present?
             html += opts[:append_html]
@@ -49,9 +48,12 @@ module Lookbook
 
       protected
 
-      def with_optional_action_view_annotations(&block)
-        disable = Lookbook.config.preview_disable_action_view_annotations
-        ActionViewAnnotationsHandler.call(disable_annotations: disable, &block)
+      def with_action_view_settings(&block)
+        ActionViewConfigHandler.call(
+          disable_annotations: Lookbook.config.preview_disable_action_view_annotations,
+          disable_partial_prefixes: Lookbook.config.preview_disable_action_view_partial_prefixes,
+          &block
+        )
       end
 
       def user_request_parameters

data/lib/lookbook/services/templates/action_view_config_handler.rb

@@ -0,0 +1,50 @@
+module Lookbook
+  class ActionViewConfigHandler < Service
+    attr_reader :disable_annotations, :disable_partial_prefixes
+
+    def initialize(disable_annotations: true, disable_partial_prefixes: true)
+      @disable_annotations = disable_annotations
+      @disable_partial_prefixes = disable_partial_prefixes
+    end
+
+    def call
+      handle_annotations
+      handle_partial_prefixes
+
+      yield
+    ensure
+      restore_annotations
+      restore_partial_prefixes
+    end
+
+    private
+
+    def handle_annotations
+      return unless disable_annotations && ActionView::Base.respond_to?(:annotate_rendered_view_with_filenames)
+
+      @original_annotations_value = ActionView::Base.annotate_rendered_view_with_filenames
+      ActionView::Base.annotate_rendered_view_with_filenames = false
+    end
+
+    def restore_annotations
+      return if @original_annotations_value.nil?
+
+      ActionView::Base.annotate_rendered_view_with_filenames = @original_annotations_value
+      @original_annotations_value = nil
+    end
+
+    def handle_partial_prefixes
+      return unless disable_partial_prefixes && ActionView::Base.respond_to?(:prefix_partial_path_with_controller_namespace)
+
+      @original_partial_prefix_value = ActionView::Base.prefix_partial_path_with_controller_namespace
+      ActionView::Base.prefix_partial_path_with_controller_namespace = false
+    end
+
+    def restore_partial_prefixes
+      return if @original_partial_prefix_value.nil?
+
+      ActionView::Base.prefix_partial_path_with_controller_namespace = @original_partial_prefix_value
+      @original_partial_prefix_value = nil
+    end
+  end
+end

data/lib/lookbook/stores/config_store.rb

@@ -59,6 +59,10 @@ module Lookbook
       store[:highlighter_options].merge!(options.to_h)
     end
 
+    def preview_disable_error_handling=(value)
+      store[:preview_disable_error_handling] = value
+    end
+
     def ui_theme=(name)
       name = name.to_s
       if Theme.valid_theme?(name)

data/lib/lookbook/theme.rb

@@ -30,19 +30,15 @@ module Lookbook
     end
 
     def favicon_light_mode
-      (
-        @overrides[:favicon_light_mode].presence ||
+      @overrides[:favicon_light_mode].presence ||
         @overrides[:favicon].presence ||
         BASE_THEMES[@base_theme.to_sym][:favicon_light_mode]
-      )
     end
 
     def favicon_dark_mode
-      (
-        @overrides[:favicon_dark_mode].presence ||
+      @overrides[:favicon_dark_mode].presence ||
         @overrides[:favicon].presence ||
         BASE_THEMES[@base_theme.to_sym][:favicon_dark_mode]
-      )
     end
 
     def to_css

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end