class_loader 0.3.10 → 0.4

data/Rakefile

@@ -1,10 +1,10 @@
 require 'rake_ext'
 
 project(
-  :name => "class_loader",
-  :version => "0.3.10",
-  :summary => "Automatically finds and loads classes",
+  name: "class_loader",
+  version: "0.4",
+  summary: "Automatically finds, loads and reloads Classes",
 
-  :author => "Alexey Petrushin",
-  :homepage => "http://github.com/alexeypetrushin/class_loader"
+  author: "Alexey Petrushin",
+  homepage: "http://github.com/alexeypetrushin/class_loader"
 )

data/lib/class_loader/class_loader.rb

@@ -5,43 +5,38 @@ module ClassLoader
   SYNC = Monitor.new
   
   class << self        
-    # 
-    # Class loading logic
-    # 
-    attr_accessor :error_on_defined_constant
     def loaded_classes; @loaded_classes ||= {} end            
     
-    def load_class namespace, const, reload = false
+    def load_class namespace, const, reload = false  
       SYNC.synchronize do
+        original_namespace = namespace
         namespace = nil if namespace == Object or namespace == Module
         target_namespace = namespace
       
         # Name hack (for anonymous classes)
+
         namespace = eval "#{name_hack(namespace)}" if namespace
-      
+
         class_name = namespace ? "#{namespace.name}::#{const}" : const
         simple_also_tried = false
         begin
           simple_also_tried = (namespace == nil)
         
-          if try_load(class_name, const)
+          if adapter.exist? class_name            
+            if loaded_classes.include?(class_name) and !reload
+              raise_without_self NameError, "something wrong with '#{const}' referenced from '#{original_namespace}' scope!"
+            end
+            
+            load(class_name, const)
+            
             defined_in_home_scope = namespace ? namespace.const_defined?(const) : Object.const_defined?(const)            
           
             unless defined_in_home_scope
               msg = "Class Name '#{class_name}' doesn't correspond to File Name '#{adapter.to_file_path(class_name)}'!"
-              raise_without_self NameError, msg
+              raise msg
+              # raise_without_self NameError, msg
             end
                         
-            unless reload
-              if loaded_classes.include? class_name
-                if error_on_defined_constant  
-                  raise_without_self NameError, "Class '#{class_name}' is not defined in the '#{target_namespace}' Namespace!"
-                else
-                  warn "Warn: Class '#{class_name}' is not defined in the '#{target_namespace}' Namespace!"
-                end
-              end
-            end
-            
             result = namespace ? namespace.const_get(const) : Object.const_get(const)
           
             loaded_classes[class_name] = target_namespace
@@ -53,7 +48,7 @@ module ClassLoader
           end
         end until simple_also_tried
         
-        raise_without_self NameError, "uninitialized constant '#{class_name}'!"
+        return false
       end
     end
     
@@ -99,7 +94,7 @@ module ClassLoader
     def clear
       self.adapter = nil
       self.observers = []
-      self.error_on_defined_constant = false
+      # self.error_on_defined_constant = false
     end
     
     attr_accessor :observers    
@@ -112,10 +107,15 @@ module ClassLoader
       return if @hooked
 
       ::Module.class_eval do
-        alias_method :const_missing_without_cl, :const_missing
+        alias_method :const_missing_without_class_loader, :const_missing
+        protected :const_missing_without_class_loader
         def const_missing const
-          return ClassLoader.load_class self, const.to_s
-        end
+         if klass = ClassLoader.load_class(self, const.to_s)
+            klass
+          else
+            const_missing_without_class_loader const
+          end
+        end        
       end
       @hooked = true
     end
@@ -166,25 +166,21 @@ module ClassLoader
         adapter        
       end
       
-      def try_load class_name, const
-        if adapter.exist? class_name
-          script = adapter.read class_name
-          script = wrap_inside_namespace Module.namespace_for(class_name), script          
-          file_path = adapter.to_file_path(class_name)          
-          eval script, TOPLEVEL_BINDING, file_path
-        else
-          return false
-        end
-        return true
+      def load class_name, const   
+        script = adapter.read class_name
+        script = wrap_inside_namespace Module.namespace_for(class_name), script          
+        file_path = adapter.to_file_path(class_name)          
+        eval script, TOPLEVEL_BINDING, file_path
       end
       
       def raise_without_self exception, message
-        raise exception, message, caller.select{|path| path !~ /\/lib\/class_loader\//}
+        raise exception, message, caller.select{|path| path !~ /\/lib\/class_loader\// and path !~ /monitor\.rb/}
       end
     
-      def name_hack namespace
+      def name_hack namespace        
         if namespace
-          namespace.to_s.gsub("#<Class:", "").gsub(">", "")
+          result = namespace.to_s.gsub("#<Class:", "").gsub(">", "")
+          result =~ /^\d/ ? "" : result
         else
           ""
         end

data/lib/class_loader/support.rb

@@ -1,5 +1,5 @@
 class String
-  unless "".respond_to? :underscore
+  unless method_defined? :underscore
     def underscore
       word = self.dup
       word.gsub!(/::/, '/')
@@ -11,7 +11,7 @@ class String
     end
   end
   
-  unless "".respond_to? :camelize
+  unless method_defined? :camelize
     def camelize first_letter_in_uppercase = true
       if first_letter_in_uppercase
         gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
@@ -24,6 +24,7 @@ end
 
 class Module
   unless respond_to? :namespace_for
+    # TODO3 cache it?
     def self.namespace_for class_name
       list = class_name.split("::")
       if list.size > 1

data/readme.md

@@ -42,4 +42,4 @@ There's currently a known bug in Ruby 1.8.x - class loading isn't thread safe, s
 	
 ## Please let me know about bugs and your proposals, there's the 'Issues' tab at the top, feel free to submit.
 	
-Copyright (c) 2010 Alexey Petrushin http://bos-tec.com, released under the MIT license.
+Copyright (c) 2011 Alexey Petrushin http://4ire.net, released under the MIT license.

data/spec/class_loader_spec.rb

@@ -16,10 +16,10 @@ describe ClassLoader do
       UnloadOldClass
       PreloadingSpec
       UnderscoredNamespace
-    )        
+    )
   end
   
-  after :each do
+  after do
     ClassLoader.clear
   end
   
@@ -57,7 +57,7 @@ describe ClassLoader do
   it "should recognize infinity loop" do
     autoload_dir "#{spec_dir}/infinity_loop"
     
-    lambda{InfinityLoop}.should raise_error(/Class Name .+ doesn't correspond to File Name/)
+    -> {InfinityLoop}.should raise_error(/Class Name .+ doesn't correspond to File Name/)
   end
   
   it "should correctly works inside of anonymous class" do
@@ -78,10 +78,11 @@ describe ClassLoader do
     autoload_dir "#{spec_dir}/another_namespace"
     
     AnotherNamespace::NamespaceA
-    ClassLoader.error_on_defined_constant = true
-    lambda{
+    # ClassLoader.error_on_defined_constant = true
+    -> {
       AnotherNamespace::NamespaceB
-    }.should raise_error(/Class '.+' is not defined in the '.+' Namespace!/)
+    }.should raise_error(/something wrong with/)
+    # }.should raise_error(/Class '.+' is not defined in the '.+' Namespace!/)
   end
   
   describe "reloading" do  

data/spec/file_system_adapter_spec.rb

@@ -4,7 +4,7 @@ require "class_loader"
 describe ClassLoader::FileSystemAdapter do  
   with_tmp_spec_dir
   
-  before :each do
+  before do
     @fs_adapter = ClassLoader::FileSystemAdapter.new(ClassLoader::CamelCaseTranslator)    
     
     # Actually we are testing both ChainedAdapter and FileSystemAdapter
@@ -83,7 +83,7 @@ describe ClassLoader::FileSystemAdapter do
   end
   
   describe "Underscored shouldn't mess with CamelCase" do
-    before :each do
+    before do
       @camel_case_adapter = ClassLoader::FileSystemAdapter.new(ClassLoader::CamelCaseTranslator)      
       @camel_case_adapter.add_path "#{spec_dir}/shouldnt_mess", true
       @camel_case_file_path = "#{spec_dir}/shouldnt_mess/CamelCaseClass.rb"

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: class_loader
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 10
-  version: 0.3.10
+version: !ruby/object:Gem::Version
+  version: '0.4'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alexey Petrushin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-13 00:00:00 +03:00
+date: 2011-04-10 00:00:00.000000000 +04:00
 default_executable: 
 dependencies: []
-
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - readme.md
 - lib/class_loader/chained_adapter.rb
@@ -61,36 +51,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/alexeypetrushin/class_loader
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
-summary: Automatically finds and loads classes
+summary: Automatically finds, loads and reloads Classes
 test_files: []
-