class_loader 3.0.5 → 3.0.6

data/lib/class_loader/class_loader.rb

@@ -24,9 +24,12 @@ module ClassLoader
         namespace = eval "#{name_hack(namespace)}" if namespace
 
         # Hierarchically searching for class name.
+        hierarchy = {}
         begin
           class_name = namespace ? "#{namespace.name}::#{const}" : const.to_s
           class_file_name = get_file_name class_name
+          binding = namespace || Object
+          hierarchy[class_file_name] = binding
 
           # Trying to load class file, if its exist.
           loaded = begin
@@ -50,13 +53,13 @@ module ClassLoader
             end
 
             # Checking that class defined in correct namespace, not the another one.
-            unless namespace ? namespace.const_defined?(const, false) : Object.const_defined?(const, false)
+            unless binding.const_defined? const, false
               msg = "class name '#{class_name}' doesn't correspond to file name '#{class_file_name}'!"
               raise NameError, msg, filter_backtrace(caller)
             end
 
             # Getting the class itself.
-            klass = namespace ? namespace.const_get(const, false) : Object.const_get(const, false)
+            klass = binding.const_get const, false
 
             # Firing after callbacks.
             if callbacks = after_callbacks[klass.name] then callbacks.each{|c| c.call klass} end
@@ -71,6 +74,16 @@ module ClassLoader
           namespace = Module.namespace_for namespace.name if namespace
         end until global_also_tried
 
+        # If file not found trying to find directory and evaluate it as a module.
+        hierarchy.each do |path, binding|
+          $LOAD_PATH.each do |base|
+            next unless File.directory? File.join(base, path)
+            amodule = Module.new
+            binding.const_set const, amodule
+            return amodule
+          end
+        end
+
         return nil
       end
     end

data/lib/class_loader/support.rb

@@ -15,13 +15,17 @@ end
 class Module
   unless respond_to? :namespace_for
     def self.namespace_for class_name
-      list = class_name.split("::")
-      if list.size > 1
-        list.pop
-        return eval(list.join("::"), TOPLEVEL_BINDING, __FILE__, __LINE__)
-      else
-        return nil
+      @namespace_for_cache ||= {}
+      unless @namespace_for_cache.include? class_name
+        list = class_name.split("::")
+        @namespace_for_cache[class_name] = if list.size > 1
+          list.pop
+          eval list.join("::"), TOPLEVEL_BINDING, __FILE__, __LINE__
+        else
+          nil
+        end
       end
+      @namespace_for_cache[class_name]
     end
   end
 end

data/lib/class_loader/watcher.rb

@@ -31,8 +31,7 @@ class ClassLoader::Watcher
           if last_updated_at = files[class_path]
             if last_updated_at < updated_at
               class_file_name = class_path.sub "#{path}/", ''
-              warn "reloading #{class_file_name}"
-              load class_file_name
+              reload class_file_name
               files[class_path] = updated_at
             end
           else
@@ -44,5 +43,14 @@ class ClassLoader::Watcher
   end
 
   protected
+    def reload file
+      begin
+        load file
+        warn "file '#{file}' reloaded."
+      rescue => e
+        warn "can't reload '#{file}' file (#{e.message})!"
+      end
+    end
+
     attr_reader :files, :thread, :monitor
 end

data/spec/class_loader_spec/autogeneration/some_namespace/some_class.rb

@@ -0,0 +1,2 @@
+class SomeNamespace::SomeClass
+end

data/spec/class_loader_spec/namespace_resolving/some_namespace.rb

@@ -1,2 +1,2 @@
-module SomeNamespace
+class SomeNamespace
 end

data/spec/class_loader_spec.rb

@@ -56,8 +56,15 @@ describe 'Autoloading classes' do
     with_load_path "#{spec_dir}/namespace_resolving" do
       SomeNamespace
 
-      SomeNamespace.class.should == Module
+      SomeNamespace.class.should == Class
+      SomeNamespace::SomeClass
+    end
+  end
+
+  it "should automatically generate modules corresponding to folders" do
+    with_load_path "#{spec_dir}/autogeneration" do
       SomeNamespace::SomeClass
+      SomeNamespace.class.should == Module
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: class_loader
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-30 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -28,6 +28,7 @@ files:
 - spec/class_loader_spec/another_namespace/some_namespace/namespace_a.rb
 - spec/class_loader_spec/another_namespace/some_namespace/namespace_b.rb
 - spec/class_loader_spec/another_namespace/some_namespace.rb
+- spec/class_loader_spec/autogeneration/some_namespace/some_class.rb
 - spec/class_loader_spec/basics/another_class.rb
 - spec/class_loader_spec/basics/some_class.rb
 - spec/class_loader_spec/basics/some_namespace/some_class.rb