lookbook 0.7.2.beta.1 → 0.7.2.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c26bf5a4901bcb0fd09b8742ae3e9c2df8f8c337c3f312152cb31dc6a74aa23
-  data.tar.gz: e1e8a016b29cf87357c3b291c99eaaf8d1e21d1a4acb552bab7777699579f265
+  metadata.gz: fade881318cf86e1a2531169e35458632e7822647de9707103b3875c4e6c2305
+  data.tar.gz: 776e91f2fe6cb3d2175d4f29d135731198406cf4c4529b6b9bb8ba392ad5ae45
 SHA512:
-  metadata.gz: dd771d407e79c1958ad0c4873fa242d7c3ad345091291275c5efd261be1d4617d8e60a6a0e82da97f2e01da8aa3a4781f169c13b1559dd481a1939598585b8d1
-  data.tar.gz: d4a40a44f2864c7c9b7bdb3b849092973619044fae370e056dda42b7382bc324fcc6932b26b4a15962d283fa8030782bd3a37e0f1e33c50f4aaf5046ba5c0ccd
+  metadata.gz: 73249cfe3598621f8ccb60c57d2516801e2cd5574c45f043ed777b7b3d9502df554b883a3f9822c31fa8046768c064506358c5e7281cd2f240df5b073400b5e3
+  data.tar.gz: 83d7478bdde7ceb4845ee6729e5a5280c8b144082d01d31be3012e405567ad6a9e3cd68973f2b8aa66d3479100f8787ea70f921c8ef006b26a57c56c5d44c95e

data/app/controllers/lookbook/pages_controller.rb

@@ -28,10 +28,7 @@ module Lookbook
             @title = @page.title
           rescue => exception
             render "lookbook/error", locals: {
-              error: Lookbook::Error.new(exception, {
-                file_path: @page.full_path,
-                source_code: @page.content
-              })
+              error: Lookbook::Error.new(exception, file_path: @page.full_path, source_code: @page.content)
             }
           end
         end

data/app/controllers/lookbook/previews_controller.rb

@@ -66,7 +66,7 @@ module Lookbook
       {
         label: example.label,
         notes: example.notes,
-        html: preview_controller.render_example_to_string(@preview, example.name),
+        html: preview_controller.process(:render_example_to_string, @preview, example.name),
         source: has_template ? example.template_source(render_args[:template]) : example.method_source,
         source_lang: has_template ? example.template_lang(render_args[:template]) : example.source_lang,
         params: example.params
@@ -74,7 +74,7 @@ module Lookbook
     end
 
     def render_examples(examples)
-      preview_controller.render_in_layout_to_string("layouts/lookbook/preview", {examples: examples}, @preview.layout)
+      preview_controller.process(:render_in_layout_to_string, "layouts/lookbook/preview", {examples: examples}, @preview.layout)
     end
 
     def set_params
@@ -167,7 +167,6 @@ module Lookbook
         message_parts = exception.message.split("\n").first.split
         component_class = message_parts.first.constantize
         naughty_method = message_parts.last.delete("#").delete("`").delete(".")
-        p naughty_method
         method = component_class.instance_method(naughty_method.to_sym)
         if method
           {
@@ -176,7 +175,7 @@ module Lookbook
           }
         end
       end
-      Lookbook::Error.new(exception, error_params || {})
+      Lookbook::Error.new(exception, **(error_params || {}))
     end
   end
 end

data/app/helpers/lookbook/component_helper.rb

@@ -10,7 +10,7 @@ module Lookbook
     end
 
     def code(language = "ruby", **opts, &block)
-      render_component "code", {language: language, **opts}, &block
+      render_component "code", language: language, **opts, &block
     end
 
     if Rails.version.to_f < 6.1

data/app/helpers/lookbook/page_helper.rb

@@ -19,12 +19,11 @@ module Lookbook
 
       if example
         @embed_counter += 1
-        render_component "embed", {
+        render_component "embed",
           id: generate_id("embed", url_for, example.lookup_path, @embed_counter - 1),
           example: example,
           params: params,
           opts: opts
-        }
       else
         embed_not_found
       end

data/lib/lookbook/engine.rb

@@ -78,15 +78,11 @@ module Lookbook
         config.lookbook.cable.logger ||= Rails.logger
       else
         config.lookbook.cable.logger = Lookbook::NullLogger.new
-        config.action_view.logger = Lookbook::NullLogger.new
       end
     end
 
     config.after_initialize do
       @preview_listener = Listen.to(*config.lookbook.listen_paths, only: /\.(rb|html.*)$/) do |modified, added, removed|
-        if Lookbook::Preview.errors.any?
-          Lookbook::Preview.reload
-        end
         begin
           parser.parse
         rescue

data/lib/lookbook/page.rb

@@ -106,7 +106,7 @@ module Lookbook
       rescue => exception
         frontmatter = {}
         line_number_match = exception.message.match(/.*line\s(\d+)/)
-        @errors.push(Lookbook::Error.new(exception, {
+        @errors.push(Lookbook::Error.new(exception, **{
           title: "YAML frontmatter parsing error",
           file_path: @pathname.to_s,
           line_number: line_number_match ? line_number_match[1] : false

data/lib/lookbook/preview.rb

@@ -97,61 +97,47 @@ module Lookbook
       end
 
       def all
-        previews = load_previews.map do |p|
+        load_previews if preview_files.size > ViewComponent::Preview.descendants.size
+
+        previews = ViewComponent::Preview.descendants.map do |p|
           new(p)
         rescue
           Rails.logger.error "[lookbook] error instantiating preview\n#{exception.full_message}"
         end
 
+        if errors.any?
+          errors.each do |error|
+            Rails.logger.error "[lookbook] preview error\n#{error.full_message}\n"
+          end
+        end
+
         sorted_previews = previews.compact.sort_by { |preview| [preview.position, preview.label] }
         PreviewCollection.new(sorted_previews)
       end
 
       def errors
-        @errors || []
-      end
-
-      def reload
-        load_previews
+        @errors ||= []
       end
 
       protected
 
-      def reset_files_data
-        @loaded_files = []
-        @errors = []
-      end
-
       def load_previews
-        reset_files_data if @loaded_files.nil?
-        require_preview_files if @errors.any?
-
-        preview_classes = ViewComponent::Preview.descendants
-        if preview_files.size > preview_classes.size
-          require_preview_files
-        end
-
-        ViewComponent::Preview.descendants.filter { |klass| @loaded_files.include? "#{klass.name.underscore}.rb" }
-      end
-
-      def require_preview_files
-        reset_files_data
+        @errors = []
         preview_files.each do |file|
-          require_dependency(file[:path])
-          @loaded_files.push(file[:rel_path])
-        rescue => exception
-          Rails.logger.error "[lookbook] preview error\n#{exception.full_message}\n"
-          @errors.push(Lookbook::Error.new(exception, {
-            title: "Preview #{exception.class}",
-            file_name: file[:rel_path],
-            file_path: file[:path]
-          }))
+          require_dependency file[:path]
+        rescue SyntaxError, StandardError => exception
+          @errors.push(
+            Lookbook::Error.new(exception,
+              title: "Preview #{exception.class}",
+              file_name: file[:rel_path],
+              file_path: file[:path])
+          )
         end
       end
 
       def preview_files
         files = Array(Lookbook.config.preview_paths).map do |preview_path|
-          Dir["#{preview_path}/**/*_preview.rb"].map do |path|
+          Dir["#{preview_path}/**/*preview.rb"].map do |path|
             {
               path: path,
               base_path: preview_path,

data/lib/lookbook/preview_controller.rb

@@ -11,12 +11,12 @@ module Lookbook
       opts = {}
       opts[:layout] = nil
       opts[:locals] = locals if locals.present?
-      render_to_string template, opts
+      render html: render_to_string(template, **opts)
     end
 
     def render_in_layout_to_string(template, locals, layout = nil)
       append_view_path Lookbook::Engine.root.join("app/views")
-      render_to_string template, locals: locals, **determine_layout(layout)
+      render html: render_to_string(template, locals: locals, **determine_layout(layout))
     end
   end
 end

data/lib/lookbook/preview_group.rb

@@ -31,7 +31,11 @@ module Lookbook
     end
 
     def display_params
-      {}
+      merged = {}
+      examples.reverse.map do |example|
+        merged.merge! example.display_params
+      end
+      merged
     end
 
     def hidden?

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "0.7.2.beta.1"
+  VERSION = "0.7.2.beta.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookbook
 version: !ruby/object:Gem::Version
-  version: 0.7.2.beta.1
+  version: 0.7.2.beta.4
 platform: ruby
 authors:
 - Mark Perkins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-27 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable