wallaby-core 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ce40b2375306ae5636cd6cf0416b0f1bc61a07efca25cd2dcf9cbe389a75af
-  data.tar.gz: 66cc05ec1bc0d6f927f9e1ffe3b39df70cd4e2d8ebfd752c07b0c96813a4ee16
+  metadata.gz: 0f1ac3bd8eff66540e6b9f6c6c7b1f569bffe58177134b70fde36bd5b9e3df82
+  data.tar.gz: ec78aac3194fe1dd051160d9f77695247213565260b1035d1aebd7acd84ea1a6
 SHA512:
-  metadata.gz: 83b55f8572a2d4d95d7d8c62ee1e11e3260d36935ddfc5712f0cf0e760fbb238b43b05cb38d892322a41842296c53b656146cd32870d54e356072adf3b974dd4
-  data.tar.gz: 71843ecf06cc964c4bd40639e158d3e9442dfec35f366c5ef05f31ba10bcf9842e89e3211f2e75283250411916a9d1bc69e4e6c3f0234a4f03706f611befd9a5
+  metadata.gz: d5b70441c58655aa2bd9aa49175f137e8680a78619c9a5236e560a912dc86995dba8597a60f54ad90ac3a80a074a4ddb8bfca346c8a73fa772edae8e63aa2fc9
+  data.tar.gz: 459f70f2d01dba201f7873b5a7fa61c33ea3cf8ff8824ea7d33f450878ddbb01242bf71887a3200229cfe44b3c0c70190e76ea165872fe43238e424ed5a0254e

data/lib/wallaby/core/version.rb

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

data/lib/wallaby/engine.rb

@@ -5,27 +5,27 @@ module Wallaby
   class Engine < ::Rails::Engine
     initializer 'wallaby.development.reload' do |_|
       # NOTE: Rails reload! will hit here
-      # @see http://rmosolgo.github.io/blog/2017/04/12/watching-files-during-rails-development/
+      # @see https://rmosolgo.github.io/ruby/rails/2017/04/12/watching-files-during-rails-development.html
       config.to_prepare do
-        if Rails.env.development? || Rails.configuration.eager_load
-          Map.clear
-          Preloader.pending!
-        end
+        Map.clear
+        Preloader.clear
       end
     end
 
     config.before_eager_load do
-      # NOTE: The models must be loaded before everything else
-      Logger.debug 'Preload all `app/models` files.', sourcing: false
+      Logger.debug 'Preload all model files before everything else.', sourcing: false
       Preloader.require_models
     end
 
     config.after_initialize do
-      # Load the rest files
-      unless Rails.env.development? || Rails.configuration.eager_load
-        Logger.debug 'Preload all other eager load files after initialize.', sourcing: false
-        Preloader.require_all
-      end
+      # Preload will be postponed to Map when `cache_classes` is set to false
+      next unless Rails.configuration.cache_classes
+      # Models are preloaded in `before_eager_load` block,
+      # therefore, it's not essential to preload all files Since Rails will do it
+      next if Rails.configuration.eager_load
+
+      Logger.debug 'Preload all files in model first and non-model last order', sourcing: false
+      Preloader.require_all
     end
   end
 end

data/lib/wallaby/preloader.rb

@@ -12,17 +12,16 @@ module Wallaby
     include ActiveModel::Model
 
     class << self
-      # @return [true] mark this as pending
-      def pending!
-        @pending = true
+      def clear
+        @all_required = nil
       end
 
       # Require all files
       # @see #all_file_paths
       def require_all
-        return unless @pending
+        return if @all_required
 
-        @pending = nil
+        @all_required = true
         Logger.debug 'Loading all files', sourcing: false
         new.all_file_paths.each(&method(:require_dependency))
       end
@@ -36,7 +35,7 @@ module Wallaby
 
     # @return [Array<String>] all files under **Rails.configuration.eager_load_paths**
     def all_file_paths
-      sort all_eager_load_file_paths
+      sort(all_eager_load_file_paths)
     end
 
     # @return [Array<String>] model files under {Wallaby::Configuration#model_paths}

metadata

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