class_loader 3.0.6 → 3.0.7

data/lib/class_loader/class_loader.rb

@@ -5,7 +5,7 @@ module ClassLoader
   @loaded_classes, @after_callbacks = {}, {}
   @monitor = Monitor.new
   class << self
-    attr_reader :loaded_classes, :monitor
+    attr_reader :loaded_classes, :monitor, :after_callbacks
 
     # Hierarchically searching for class file, according to modules hierarchy.
     #
@@ -113,6 +113,14 @@ module ClassLoader
 
     def after class_name, &block
       (@after_callbacks[class_name] ||= []) << block
+
+      # Firing it immediatelly if class has been already loaded.
+      # Checking if constant exist without loading it.
+      names = class_name.gsub(/^::/, '').split('::')
+      const_defined = names.inject Object do |current, const|
+        current = current && current.const_defined?(const) && current.const_get(const)
+      end
+      block.call if const_defined
     end
 
     def filter_backtrace backtrace
@@ -120,8 +128,6 @@ module ClassLoader
     end
 
     protected
-      attr_reader :after_callbacks
-
       # Use this method to define class name to file name mapping, by default it uses underscored paths,
       # but You can override this method to use camel case for example.
       def get_file_name class_name

data/spec/another_spec.rb

@@ -0,0 +1,15 @@
+require 'rspec_ext'
+require "class_loader"
+
+describe 'Autoloading classes' do
+  it do
+    with_load_path "/Users/alex/projects/class_loader/spec/class_loader_spec/after" do
+      exp = mock
+      exp.should_receive :callback_fired
+      ClassLoader.after 'SomeClass' do |klass|
+        exp.callback_fired
+      end
+      SomeClass
+    end
+  end
+end

data/spec/class_loader_spec.rb

@@ -8,6 +8,7 @@ describe 'Autoloading classes' do
     remove_constants :SomeNamespace, :SomeClass, :AnotherClass, :Tmp
 
     ClassLoader.loaded_classes.clear
+    ClassLoader.after_callbacks.clear
     ClassLoader.watcher.stop
   end
 
@@ -97,12 +98,18 @@ describe 'Autoloading classes' do
 
   it "after" do
     with_load_path "#{spec_dir}/after" do
+      exp = mock
+      exp.should_receive :callback_fired
       ClassLoader.after 'SomeClass' do |klass|
-        klass.class_eval do
-          def self.extension; :ok end
-        end
+        exp.callback_fired
+      end
+      SomeClass
+
+      # Should fire immediatelly if class has been already loaded.
+      exp.should_receive :fired_immediatelly
+      ClassLoader.after 'SomeClass' do |klass|
+        exp.fired_immediatelly
       end
-      SomeClass.extension.should == :ok
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: class_loader
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -23,6 +23,7 @@ files:
 - lib/class_loader/support.rb
 - lib/class_loader/watcher.rb
 - lib/class_loader.rb
+- spec/another_spec.rb
 - spec/class_loader_spec/after/some_class.rb
 - spec/class_loader_spec/anonymous_class/some_namespace/some_class.rb
 - spec/class_loader_spec/another_namespace/some_namespace/namespace_a.rb
@@ -41,7 +42,6 @@ files:
 - spec/class_loader_spec/preloading/some_namespace/another_class.rb
 - spec/class_loader_spec/preloading/some_namespace.rb
 - spec/class_loader_spec/reloading/some_class.rb
-- spec/class_loader_spec/underscored/underscored_namespace/underscored_class.rb
 - spec/class_loader_spec.rb
 homepage: http://github.com/alexeypetrushin/class_loader
 licenses: []

data/spec/class_loader_spec/underscored/underscored_namespace/underscored_class.rb

@@ -1,2 +0,0 @@
-class UnderscoredClass
-end