wallaby-core 0.2.8 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '008e6c998628f1be960867cc2c6ce3ac2c214c727765b9e6b966b74d5a1c9607'
-  data.tar.gz: 1b14cfc38385f18c7e4580baef508be19679e4c2f30ff4550c85e8cd6c37031e
+  metadata.gz: 42ce40b2375306ae5636cd6cf0416b0f1bc61a07efca25cd2dcf9cbe389a75af
+  data.tar.gz: 66cc05ec1bc0d6f927f9e1ffe3b39df70cd4e2d8ebfd752c07b0c96813a4ee16
 SHA512:
-  metadata.gz: 7db4d2d5c4b1c5f9c3cc273f149e62a8147243105e471e97d6c7557d164d52657381a6f03bdb25daaf080cdb0d1fd24fa8d216b1220b831816db7fc0262bd8e5
-  data.tar.gz: ed53ad00870271da85989530f0ada4d67628df215f425115ec1ee4fc28f0f85ae1a232b0f4d2e227110bc8495783de7c9fded4735729fbf03a41b14ccae62eca
+  metadata.gz: 83b55f8572a2d4d95d7d8c62ee1e11e3260d36935ddfc5712f0cf0e760fbb238b43b05cb38d892322a41842296c53b656146cd32870d54e356072adf3b974dd4
+  data.tar.gz: 71843ecf06cc964c4bd40639e158d3e9442dfec35f366c5ef05f31ba10bcf9842e89e3211f2e75283250411916a9d1bc69e4e6c3f0234a4f03706f611befd9a5

data/lib/wallaby/core/version.rb

@@ -2,6 +2,6 @@
 
 module Wallaby
   module Core
-    VERSION = '0.2.8' # :nodoc:
+    VERSION = '0.2.10' # :nodoc:
   end
 end

data/lib/wallaby/engine.rb

@@ -8,9 +8,8 @@ module Wallaby
       # @see http://rmosolgo.github.io/blog/2017/04/12/watching-files-during-rails-development/
       config.to_prepare do
         if Rails.env.development? || Rails.configuration.eager_load
-          Logger.debug 'Reloading after Rails\' reload...', sourcing: false
           Map.clear
-          Preloader.require_all
+          Preloader.pending!
         end
       end
     end

data/lib/wallaby/map.rb

@@ -17,7 +17,11 @@ module Wallaby
 
       # @return [Wallaby::ClassHash] { Model Class => {Wallaby::Mode} }
       def mode_map
-        @mode_map ||= ModeMapper.execute(modes).freeze
+        @mode_map ||= begin
+          # NOTE: this is the point where all files should be required
+          Preloader.require_all
+          ModeMapper.execute(modes).freeze
+        end
       end
 
       # TODO: remove this method

data/lib/wallaby/preloader.rb

@@ -11,16 +11,27 @@ module Wallaby
   class Preloader
     include ActiveModel::Model
 
-    # Require all files
-    # @see #all_file_paths
-    def self.require_all
-      new.all_file_paths.each(&method(:require_dependency))
-    end
+    class << self
+      # @return [true] mark this as pending
+      def pending!
+        @pending = true
+      end
+
+      # Require all files
+      # @see #all_file_paths
+      def require_all
+        return unless @pending
+
+        @pending = nil
+        Logger.debug 'Loading all files', sourcing: false
+        new.all_file_paths.each(&method(:require_dependency))
+      end
 
-    # Require models under {Wallaby::Configuration#model_paths}
-    # @see #model_file_paths
-    def self.require_models
-      new.model_file_paths.each(&method(:require_dependency))
+      # Require models under {Wallaby::Configuration#model_paths}
+      # @see #model_file_paths
+      def require_models
+        new.model_file_paths.each(&method(:require_dependency))
+      end
     end
 
     # @return [Array<String>] all files under **Rails.configuration.eager_load_paths**
@@ -39,7 +50,10 @@ module Wallaby
     # @!attribute [r] eager_load_paths
     # @return [Array<String, Pathname>]
     def eager_load_paths # :nodoc:
-      @eager_load_paths ||= Rails.configuration.eager_load_paths
+      @eager_load_paths ||=
+        Rails.configuration.paths['app'].expanded
+          .concat(Rails.configuration.eager_load_paths)
+          .uniq
     end
 
     # @!attribute [w] model_paths

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby-core
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors:
 - Tian Chen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel