conscious_concern 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b03b02010f58f7d879f3e8c5b74e0874db33918f
-  data.tar.gz: 6505aa8b8080597ecfc20bfda5c7b312fcaf226c
+  metadata.gz: 4b4762f0424331980889ae31c77792522a04f3d5
+  data.tar.gz: 2803f7a3a4d4ea421ff55af59f8e8a7d0621407c
 SHA512:
-  metadata.gz: 97d586bbaa4158b25cf3623daee700d689bad1e67d79c3b4e02703dc9097cb7d0f6e1c8e11e60868d50ad5f3215db539a657d9f7f88e0180d3e62496f9d64a12
-  data.tar.gz: dc69827c2ec8a05ee2d25c7d3696a7f42a13cd72e39bf91f40b80768aac2734382b431a718580bd6117808df6f2bf80ca1eb97fdea7280df5a50cd64b8d472f7
+  metadata.gz: 1a75f822b95413e5ffcb32f0d23197a12c9a1a4e9dbd706b36fb6f6342855669c8c9d40507c529a61049860ad83171c50b4918526e4e793bde68aeba798dd027
+  data.tar.gz: 04412680eb6aa2e7f46855ba5d7e79820bec6c36302d0a214e4c73108d07e5f4a18e3eac6bd87942f88474a702f8d1894a22453159d781bc5fe44101aeeac594

data/lib/conscious_concern/eager_loader.rb

@@ -5,13 +5,19 @@ module ConsciousConcern
   class EagerLoader
     class_attribute :debug
 
-    def self.load_classes_in_rails_dir(name)
+    def self.load_classes_in_rails_dirs(*dir_names)
       rails = Object.const_defined?('Rails') ? 'Rails'.constantize : nil
       unless rails && rails.root
         puts 'no initialized Rails application' if debug
         return false
       end
-      load_classes_in_dir(rails.root.join('app', name))
+      load_classes_in_engine_dirs(rails, *dir_names)
+    end
+
+    def self.load_classes_in_engine_dirs(engine, *dir_names)
+      dir_names.each do |dir_name|
+        load_classes_in_dir(engine.root.join('app', dir_name))
+      end
     end
 
     def self.load_classes_in_dir(dir)
@@ -27,15 +33,16 @@ module ConsciousConcern
     end
 
     def self.load_class_at_path(path)
-      # silence harmless 'already initialized constant' warnings that might
+      # Silence harmless 'already initialized constant' warnings that might
       # occur due to Rails autoload having previously loaded some constants.
+      # Use load if require returns false for reloads in Rails development.
       silence_warnings do
-        require path
+        load path
         puts "eager loaded class at #{path}" if debug
       end
-    rescue LoadError, StandardError => e
+    rescue LoadError, StandardError, TypeError => e
       return puts(e.message) if debug
-      raise e unless e.message =~ /(previous definition|define multiple)/
+      raise e if e.message !~ /(previous def|define multiple|class mismatch)/
     end
   end
 end

data/lib/conscious_concern.rb

@@ -3,18 +3,21 @@
 #
 module ConsciousConcern
   require_relative File.join('conscious_concern', 'eager_loader')
+  require 'set'
   require 'active_support/concern'
   include ActiveSupport::Concern
 
-  def self.load_classes(*custom_dirs)
-    ConsciousConcern::EagerLoader.load_classes_in_rails_dir('controllers')
-    ConsciousConcern::EagerLoader.load_classes_in_rails_dir('models')
+  def self.load_classes(*custom_dirs, engine: nil, rails: true)
+    std_dirs = %w(controllers models)
+    EagerLoader.load_classes_in_engine_dirs(engine, *std_dirs) if engine
+    EagerLoader.load_classes_in_rails_dirs(*std_dirs) if rails
     custom_dirs.each { |dir| EagerLoader.load_classes_in_dir(dir) }
+
     extenders.each { |concern| concern._classes_loaded_callbacks.each(&:call) }
   end
 
   def self.extenders
-    @extenders ||= []
+    @_extenders ||= Set.new
   end
 
   def self.extended(base)
@@ -24,7 +27,7 @@ module ConsciousConcern
 
   def included(base = nil, &block)
     _classes << base if base && base.is_a?(Class)
-    super
+    super unless base.nil? && instance_variable_defined?(:@_included_block)
   end
 
   def prepended(base = nil)
@@ -35,7 +38,7 @@ module ConsciousConcern
   # underscore aliases protect core functionality against overrides in extenders
 
   def classes
-    @_classes ||= []
+    @_classes ||= Set.new
   end
   alias_method :_classes, :classes
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conscious_concern
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Janosch Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport