lookbook 0.7.2.beta.4 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fade881318cf86e1a2531169e35458632e7822647de9707103b3875c4e6c2305
-  data.tar.gz: 776e91f2fe6cb3d2175d4f29d135731198406cf4c4529b6b9bb8ba392ad5ae45
+  metadata.gz: 40ea30d04c53c14779624094908938ce4c795a75a773f24226c7905e12afcdca
+  data.tar.gz: 15b596f54edd9cff72d28cf2c3b88a5d28e05b3a323f69033bd44c50c890c3c2
 SHA512:
-  metadata.gz: 73249cfe3598621f8ccb60c57d2516801e2cd5574c45f043ed777b7b3d9502df554b883a3f9822c31fa8046768c064506358c5e7281cd2f240df5b073400b5e3
-  data.tar.gz: 83d7478bdde7ceb4845ee6729e5a5280c8b144082d01d31be3012e405567ad6a9e3cd68973f2b8aa66d3479100f8787ea70f921c8ef006b26a57c56c5d44c95e
+  metadata.gz: 2c998b17b156fae344b99131d7487ba74052d1aeaba6ac9ff2cd2c13371f6aa0f3fb1cea6d47b806d4cd3479d93e678fd165b8f85bc30b2c7e35bac1b2685ea5
+  data.tar.gz: f347430b5596aaefc63c24a1db82758a86f317cc728bd7c8cb1eefe9efd243e3072186b33fc0144fd7f0fea148d584d3b350b2da09b59ba37be37e41b706f4b2

data/config/routes.rb

@@ -1,6 +1,6 @@
 Lookbook::Engine.routes.draw do
   if Lookbook.config.auto_refresh
-    mount Lookbook::Engine.websocket => Lookbook.config.cable.mount_path
+    mount Lookbook::Engine.websocket => Lookbook.config.cable_mount_path
   end
 
   root to: "application#index", as: :home

data/lib/lookbook/engine.rb

@@ -10,7 +10,7 @@ module Lookbook
     end
 
     def logger
-      @logger ||= config.debug == true ? Rails.logger : Lookbook::NullLogger.new
+      @logger ||= Rails.logger
     end
 
     def version
@@ -54,10 +54,8 @@ module Lookbook
       options.listen_paths << (vc_options.view_component_path || Rails.root.join("app/components"))
       options.listen_paths.filter! { |path| Dir.exist? path }
 
-      options.cable = ActionCable::Server::Configuration.new
-      options.cable.cable = {adapter: "async"}.with_indifferent_access
-      options.cable.mount_path ||= "/lookbook-cable"
-      options.cable.connection_class = -> { Lookbook::Connection }
+      options.cable_mount_path ||= "/lookbook-cable"
+      options.cable_logger ||= Rails.logger
 
       options.experimental_features = false unless options.experimental_features.present?
     end
@@ -73,43 +71,28 @@ module Lookbook
       )
     end
 
-    initializer "lookbook.logging" do
-      if config.lookbook.debug == true
-        config.lookbook.cable.logger ||= Rails.logger
-      else
-        config.lookbook.cable.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|
         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
@@ -125,18 +108,24 @@ module Lookbook
     class << self
       def websocket
         if config.lookbook.auto_refresh
+          cable = ActionCable::Server::Configuration.new
+          cable.cable = {adapter: "async"}.with_indifferent_access
+          cable.mount_path = config.lookbook.cable_mount_path
+          cable.connection_class = -> { Lookbook::Connection }
+          cable.logger = config.lookbook.cable_logger
+
           @websocket ||= if Rails.version.to_f >= 6.0
-            ActionCable::Server::Base.new(config: config.lookbook.cable)
+            ActionCable::Server::Base.new(config: cable)
           else
             websocket ||= ActionCable::Server::Base.new
-            websocket.config = config.lookbook.cable
+            websocket.config = cable
             websocket
           end
         end
       end
 
       def websocket_mount_path
-        "#{mounted_path}#{config.lookbook.cable.mount_path}" if websocket
+        "#{mounted_path}#{config.lookbook.cable_mount_path}" if websocket
       end
 
       def mounted_path

data/lib/lookbook/preview.rb

@@ -96,9 +96,15 @@ module Lookbook
         !!find(path)
       end
 
+      def clear_cache
+        @previews = nil
+      end
+
       def all
         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
@@ -112,7 +118,7 @@ module Lookbook
         end
 
         sorted_previews = previews.compact.sort_by { |preview| [preview.position, preview.label] }
-        PreviewCollection.new(sorted_previews)
+        @previews ||= PreviewCollection.new(sorted_previews)
       end
 
       def errors

data/lib/lookbook/version.rb

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

data/lib/lookbook.rb

@@ -20,7 +20,6 @@ module Lookbook
   autoload :PreviewExample, "lookbook/preview_example"
   autoload :PreviewGroup, "lookbook/preview_group"
   autoload :CodeInspector, "lookbook/code_inspector"
-  autoload :NullLogger, "lookbook/null_logger"
   autoload :CodeFormatter, "lookbook/code_formatter"
   autoload :Markdown, "lookbook/markdown"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookbook
 version: !ruby/object:Gem::Version
-  version: 0.7.2.beta.4
+  version: 0.7.3
 platform: ruby
 authors:
 - Mark Perkins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -290,7 +290,6 @@ files:
 - lib/lookbook/features.rb
 - lib/lookbook/lang.rb
 - lib/lookbook/markdown.rb
-- lib/lookbook/null_logger.rb
 - lib/lookbook/page.rb
 - lib/lookbook/page_collection.rb
 - lib/lookbook/params.rb
@@ -325,9 +324,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.22
 signing_key:

data/lib/lookbook/null_logger.rb

@@ -1,47 +0,0 @@
-module Lookbook
-  class NullLogger
-    def unknown(*)
-      nil
-    end
-
-    def fatal(*)
-      nil
-    end
-
-    def fatal?
-      false
-    end
-
-    def error(*)
-      nil
-    end
-
-    def error?
-      false
-    end
-
-    def warn(*)
-      nil
-    end
-
-    def warn?
-      false
-    end
-
-    def info(*)
-      nil
-    end
-
-    def info?
-      false
-    end
-
-    def debug(*)
-      nil
-    end
-
-    def debug?
-      false
-    end
-  end
-end