wallaby-core 0.2.9 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a4c5c82124d25468728fff204eb9676d05100615edd67d86839d7008f258b42
-  data.tar.gz: fe635d3585a5ec4d5205d90147d5377cc4a3e52459790b75a91e842fa41cce62
+  metadata.gz: 0f1ac3bd8eff66540e6b9f6c6c7b1f569bffe58177134b70fde36bd5b9e3df82
+  data.tar.gz: ec78aac3194fe1dd051160d9f77695247213565260b1035d1aebd7acd84ea1a6
 SHA512:
-  metadata.gz: 5fbf645d202fea16af664376a78177b9bf4bf6e6a1243e31be82f833d3cbb4dc5c5504208f583c596029bd1f7cb4a826417d8fe044725fa31df999868e3636b3
-  data.tar.gz: f0e750484101ed6bad77a22b531a4dcf4c5a89a6379bc92078e4a63a20bd381c664c0b6a66f97f4f312eebd858ada6e49fe95739012fd2092bfa7cefc9cc2ac8
+  metadata.gz: d5b70441c58655aa2bd9aa49175f137e8680a78619c9a5236e560a912dc86995dba8597a60f54ad90ac3a80a074a4ddb8bfca346c8a73fa772edae8e63aa2fc9
+  data.tar.gz: 459f70f2d01dba201f7873b5a7fa61c33ea3cf8ff8824ea7d33f450878ddbb01242bf71887a3200229cfe44b3c0c70190e76ea165872fe43238e424ed5a0254e

data/lib/wallaby/core/version.rb

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

data/lib/wallaby/engine.rb

@@ -5,28 +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
-          Logger.debug 'Reloading after Rails\' reload...', sourcing: false
-          Map.clear
-          Preloader.require_all
-        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/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,21 +11,31 @@ 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
+      def clear
+        @all_required = nil
+      end
+
+      # Require all files
+      # @see #all_file_paths
+      def require_all
+        return if @all_required
+
+        @all_required = true
+        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**
     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.9
+  version: 0.2.11
 platform: ruby
 authors:
 - Tian Chen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel