lookbook 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb30f67eba8a56b3e6638e5671e493580bee97045acaeeeaa25a9bc1d92801a
-  data.tar.gz: 45ed40efdc4715461fa05217c5514103975182dca010fe754df54bd0572be450
+  metadata.gz: '0277029efee9bfc07832f5bc2ea7d1a57063a81e2e2986978c93abca8750fbe2'
+  data.tar.gz: c03b8c178645b7dba6572d37711cb4664ea4175fa56430acd595a369069d54c9
 SHA512:
-  metadata.gz: e1cd96f2564bd3c4dbb3b4343f31505006403b5260ab47ede3dafb4514d40b406d6c25d6702323a69b36bd8af951b72918a55c04c1cb0c28473802cf169dd22f
-  data.tar.gz: 99650923f94a8e6c9e1bce12c0f292adabcfc0ffde22cc0cf881689d6171aacb14c34f9bb16e6b05b63aa32240802e52809a79ccfd990c9875c8744d99daa18c
+  metadata.gz: c34fbd701d1f7818dea444b9ad899b7dce012968a0cc0038dd197bf0e70ea2af105c2d299e3ac21302f9276d0dde162b56cfebb8f45ba4e7eb9c1ab1455c4555
+  data.tar.gz: 50613e6f04c758f5c93fa4ff659a0a0a4c1a903e80d167a3c1aead2f6e5af7278549b260255405c077fe1f35ba920fc050fdfdb0dab4d37ce7df18658f6ace47

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,6 +21,7 @@ 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

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/version.rb

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