lookbook 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5617747c0cc6eca338a14139a9bc770b155656496676d5bc1b1ffbc61f08a0c4
-  data.tar.gz: ec66261ebd66850c9e30893825d3bd03096e2425c207dc449b12f0bb2489f9c6
+  metadata.gz: 0b46fc66383c91d07e598a8d2be4a8b8bf5d7d45c0155a8176f69f194aead1d2
+  data.tar.gz: 4e539b1fd03bacd9ad9df6d71802cd5a1d1ab95c7d9364797ecfe9af60843b55
 SHA512:
-  metadata.gz: 9c9e23c5e73b16775efa80595fb06323f09417e62ece899aaae648c677ac30885e0dd354b7032cd74e85a04447754f55a88ef0f0ad62d9d69998958edb15d783
-  data.tar.gz: b6c78c07414bbe524881cd04719d0b04c69b470a70862f09bdfe2804fe33ab36b658298a5807726a413f0ae20bddaadbc7c60fff3632f9ac04dfc524c9437564
+  metadata.gz: 833ff99b67b2367f379c0699cd5ef4f73fae26ac8dc6e27378f8f3f1ef5b830669caf2f6ebda07e4c150645438522ee7691de3582d898d1cabc54e75578bfd4e
+  data.tar.gz: 507225b27f5b2966c95da2f70eb936d5f6da1b92cdf59fa815a39f99c3478c6d37f9a08fbe1b6bf2df4acf020003a61d148f373465ce7e053a21153c49784a7c

data/lib/lookbook/engine.rb

@@ -2,6 +2,7 @@ require "rails"
 require "view_component"
 require "action_cable/engine"
 require "listen"
+require "rake"
 
 module Lookbook
   class << self
@@ -83,10 +84,32 @@ module Lookbook
       @preview_controller = Lookbook.config.preview_controller.constantize
       @preview_controller.include(Lookbook::PreviewController)
 
+      if Rails.application&.server.present?
+        # Rails.application.server is only available for Rails >= v6.1.3.1
+        Rails.application.server { init_listeners }
+      else
+        # So fallback to not listening if running in a rake task
+        init_listeners unless File.basename($0) == "rake" || Rake.application.top_level_tasks.any?
+      end
+
+      if config.lookbook.runtime_parsing
+        Lookbook::Engine.parser.parse
+      else
+        unless File.exist?(config.lookbook.parser_registry_path)
+          Lookbook.logger.warn "
+            Runtime parsing is disabled but no registry file has been found.
+            Did you run `rake lookbook:preparse` before starting the app?
+            Expected to find registry file at #{config.lookbook.parser_registry_path}
+          "
+        end
+      end
+    end
+
+    def init_listeners
       if config.lookbook.listen
         @preview_listener = Listen.to(*config.lookbook.listen_paths, only: /\.(#{config.lookbook.listen_extensions.join("|")})$/) do |modified, added, removed|
           begin
-            parser.parse
+            Lookbook::Engine.parser.parse
           rescue
           end
           Lookbook::Preview.clear_cache
@@ -109,18 +132,6 @@ module Lookbook
           @page_listener.start
         end
       end
-
-      if config.lookbook.runtime_parsing
-        parser.parse
-      else
-        unless File.exist?(config.lookbook.parser_registry_path)
-          Lookbook.logger.warn "
-            Runtime parsing is disabled but no registry file has been found.
-            Did you run `rake lookbook:preparse` before starting the app?
-            Expected to find registry file at #{config.lookbook.parser_registry_path}
-          "
-        end
-      end
     end
 
     at_exit do
@@ -141,9 +152,9 @@ module Lookbook
           @websocket ||= if Rails.version.to_f >= 6.0
             ActionCable::Server::Base.new(config: cable)
           else
-            @websocket ||= ActionCable::Server::Base.new
-            @websocket.config = cable
-            @websocket
+            ws = ActionCable::Server::Base.new
+            ws.config = cable
+            ws
           end
         end
       end

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookbook
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Mark Perkins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable