lookbook 0.7.2.beta.2 → 0.7.2.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990948c73a9d1c658a44b0ae4ac88c2c850fa92dfe9e40551b4634311113fe87
-  data.tar.gz: a203b8a19a1b9dc3d3ec91af757b1bb75edd84fed009e329f720b7e5891f737e
+  metadata.gz: e5c4fab31fdd907dfcc4e990f703be32ce602db1729187d88c88abf60cc126bc
+  data.tar.gz: 57373e4f626acbbe451532587758f8962ba9186314d31752001f3b05baef5338
 SHA512:
-  metadata.gz: bb588034ce795c97cccffbf1d7de75bbce28895009975576e8d2bcf50a3e4878771fe38cba600aa6986d59b3e3579023a2782a8dc0cc4bd349376a8bd67978b5
-  data.tar.gz: 3485c0882de17d7a3c63a27872a79615043d7c03651e555394f53accaed865c36b45e43f086deb23dd8d0a4118049ac4cbd936943765afb619e0a9e413287d7e
+  metadata.gz: 4fc584e15f47fb60256e7fa49111df0a97fe7ac1a588c8e84657957e321cd1e9f627700a5969fd7efa03bf26a923005dc742ab277f2e993416fc1c83a2a5af89
+  data.tar.gz: 69a701e03da79385d9302e61c9df58b364eaf3e2f2160e8660c762810d9851a943297b061ad962af6fb0b056754e3b8af191c32a64f098a1487c1599bc668965

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

@@ -83,36 +83,26 @@ module Lookbook
 
     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
         end
-        if Lookbook::Engine.websocket
-          if modified.any? || removed.any? || added.none?
-            Lookbook::Engine.websocket.broadcast("reload", {
-              modified: modified,
-              removed: removed,
-              added: added
-            })
-          end
-        end
+        Lookbook::Preview.clear_cache
+        Lookbook::Engine.websocket&.broadcast("reload", {
+          modified: modified,
+          removed: removed,
+          added: added
+        })
       end
       @preview_listener.start
 
       if Lookbook::Features.enabled?(:pages)
         @page_listener = Listen.to(*config.lookbook.page_paths.filter { |dir| Dir.exist? dir }, only: /\.(html.*|md.*)$/) do |modified, added, removed|
-          if Lookbook::Engine.websocket
-            if modified.any? || removed.any? || added.any?
-              Lookbook::Engine.websocket.broadcast("reload", {
-                modified: modified,
-                removed: removed,
-                added: added
-              })
-            end
-          end
+          Lookbook::Engine.websocket&.broadcast("reload", {
+            modified: modified,
+            removed: removed,
+            added: added
+          })
         end
         @page_listener.start
       end

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

@@ -96,62 +96,54 @@ module Lookbook
         !!find(path)
       end
 
+      def clear_cache
+        @previews = nil
+      end
+
       def all
-        previews = load_previews.map do |p|
+        load_previews if preview_files.size > ViewComponent::Preview.descendants.size
+
+        return @previews if @previews.present?
+
+        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)
+        @previews ||= 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.2"
+  VERSION = "0.7.2.beta.5"
 end

metadata

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