class_loader 0.3.7 → 0.3.8

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake_ext'
 
 project(
   :name => "class_loader",
-  :version => "0.3.7",
+  :version => "0.3.8",
   :summary => "Automatically finds and loads classes",
 
   :author => "Alexey Petrushin",

data/lib/class_loader/class_loader.rb

@@ -11,7 +11,7 @@ module ClassLoader
     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
         namespace = nil if namespace == Object or namespace == Module
         target_namespace = namespace
@@ -38,7 +38,6 @@ module ClassLoader
                   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!"
-                  puts caller
                 end
               end
             end
@@ -65,8 +64,8 @@ module ClassLoader
         name = class_name.sub(/^#{namespace}::/, "")      
         
         # removing old class
-        class_container = (namespace || Object)
-        class_container.send :remove_const, name if class_container.const_defined? name
+        # class_container = (namespace || Object)
+        # class_container.send :remove_const, name if class_container.const_defined? name
         
         return load_class namespace, name, true
       end

data/lib/class_loader/file_system_adapter/camel_case_translator.rb

@@ -1,15 +1,18 @@
 module ClassLoader
   class CamelCaseTranslator
-    def self.to_class_name file_path
-      file_path.sub(/^\//, '').gsub('/', '::')
+    def self.to_class_name normalized_file_name
+      raise "internall error, invalid format for #{normalized_file_name}!" if normalized_file_name =~ /^\//
+      normalized_file_name.gsub('/', '::')
     end
     
     def self.to_file_path class_name
-      class_name.sub(/^::/, '').gsub('::', '/')
+      raise "internall error, invalid format for #{class_name}!" if class_name =~ /^::/
+      class_name.gsub('::', '/')
     end
     
-    def self.is_it_class? file_name
-      file_name !~ /_/
+    def self.is_it_class? normalized_file_name
+      raise "internall error, invalid format for #{normalized_file_name}!" if normalized_file_name =~ /^\//
+      normalized_file_name[0..0] =~ /[A-Z]/
     end
   end
 end

data/lib/class_loader/file_system_adapter/underscored_translator.rb

@@ -1,15 +1,18 @@
 module ClassLoader
   class UnderscoredTranslator
-    def self.to_class_name file_path
-      file_path.sub(/^\//, '').camelize
+    def self.to_class_name normalized_file_name
+      raise "internall error, invalid format for #{normalized_file_name}!" if normalized_file_name =~ /^\//
+      normalized_file_name.camelize
     end
     
     def self.to_file_path class_name
-      class_name.sub(/^::/, '').underscore
+      raise "internall error, invalid format for #{class_name}!" if class_name =~ /^::/
+      class_name.underscore
     end
     
-    def self.is_it_class? file_name
-      file_name !~ /[A-Z]/
+    def self.is_it_class? normalized_file_name
+      raise "internall error, invalid format for #{normalized_file_name}!" if normalized_file_name =~ /^\//
+      normalized_file_name[0..0] =~ /[a-z]/
     end
   end
 end

data/lib/class_loader/file_system_adapter.rb

@@ -59,7 +59,7 @@ module ClassLoader
       
       paths.each do |base_path| 
         if normalized_path.start_with? base_path
-          normalized_name = normalized_path.sub(base_path, '')          
+          normalized_name = normalized_path.sub(base_path + '/', '')          
           if translator.is_it_class? normalized_name
             return translator.to_class_name(normalized_name)
           end
@@ -102,7 +102,7 @@ module ClassLoader
         Dir.glob("#{base_path}/**/*.rb").each do |file_path|
           normalized_path = file_path.sub(/\.rb$/, "")
           
-          normalized_name = normalized_path.sub(base_path, '')
+          normalized_name = normalized_path.sub(base_path + "/", '')
           class_name = translator.to_class_name(normalized_name)
           block.call class_name
         end
@@ -112,8 +112,9 @@ module ClassLoader
     def each_watched_file &block
       @watched_paths.each do |base_path|          
         Dir.glob("#{base_path}/**/*.rb").each do |file_path|
-          file_name = file_path.sub(base_path, '')
-          if translator.is_it_class? file_name
+          file_name = file_path.sub(base_path + '/', '')
+
+          if translator.is_it_class? file_name            
             block.call file_path, file_name
           end
         end

data/readme.md

@@ -38,7 +38,7 @@ There's currently a known bug in Ruby 1.8.x - class loading isn't thread safe, s
 
 ## Installation
 
-	$ gem install class-loader
+	$ gem install class_loader
 	
 ## Please let me know about bugs and your proposals, there's the 'Issues' tab at the top, feel free to submit.
 	

data/spec/class_loader_spec.rb

@@ -115,13 +115,14 @@ RUBY
       ClassLoader.reload_class(ClassReloadingSpec.name)
       ClassReloadingSpec.check.should == :another_value
     end
-  
-    it "should unload old classes before reloading" do
-      autoload_dir "#{@dir}/unload_old_class"
-      UnloadOldClass.instance_variable_set "@value", :value
-      ClassLoader.reload_class(UnloadOldClass.name)
-      UnloadOldClass.instance_variable_get("@value").should == nil
-    end
+
+    # Outdated  
+    # it "should unload old classes before reloading" do
+    #   autoload_dir "#{@dir}/unload_old_class"
+    #   UnloadOldClass.instance_variable_set "@value", :value
+    #   ClassLoader.reload_class(UnloadOldClass.name)
+    #   UnloadOldClass.instance_variable_get("@value").should == nil
+    # end
   end
   
   it "should be able to preload all classes in production" do

data/spec/file_system_adapter_spec.rb

@@ -1,17 +1,12 @@
 require "rspec_ext"
-
-require "class_loader/support"
-require "class_loader/file_system_adapter/camel_case_translator"
-require "class_loader/file_system_adapter/underscored_translator"
-require "class_loader/file_system_adapter"
-require "class_loader/chained_adapter"
+require "class_loader"
 
 describe ClassLoader::FileSystemAdapter do  
   before :all do
     @dir = prepare_spec_data __FILE__
   end
   
-  before :each do        
+  before :each do
     @fs_adapter = ClassLoader::FileSystemAdapter.new(ClassLoader::CamelCaseTranslator)    
     
     # Actually we are testing both ChainedAdapter and FileSystemAdapter
@@ -107,11 +102,11 @@ describe ClassLoader::FileSystemAdapter do
     it "should watch only files understable by it's translator (CamelCase shouldn't load Underscored)" do      
       watched = []
       @camel_case_adapter.each_watched_file{|file_path, relative_name| watched << relative_name}
-      watched.should == ["/CamelCaseClass.rb"]
+      watched.should == ["CamelCaseClass.rb"]
             
       watched = []
       @underscored_adapter.each_watched_file{|file_path, relative_name| watched << relative_name}
-      watched.should == ["/underscored_class.rb"]
+      watched.should == ["underscored_class.rb"]
     end
     
     it "CamelCase to_class_name shouldn't translate Underscored" do

data/spec/translators_spec.rb

@@ -0,0 +1,35 @@
+require 'rspec_ext'
+require 'class_loader/file_system_adapter/camel_case_translator'
+require 'class_loader/file_system_adapter/underscored_translator'
+
+describe "Translators" do
+  describe "CamelCase" do
+    before :all do
+      @t = ClassLoader::CamelCaseTranslator
+    end
+    
+    it "is_it_class?" do
+      @t.is_it_class?("SomeClass.rb").should be_true
+      @t.is_it_class?("SomeNamespace/SomeClass.rb").should be_true
+      
+      @t.is_it_class?("someclass.rb").should be_false
+      @t.is_it_class?("some_class.rb").should be_false
+      @t.is_it_class?("some_namespace/some_class.rb").should be_false
+    end
+  end
+  
+  describe "Underscored" do
+    before :all do
+      @t = ClassLoader::UnderscoredTranslator
+    end
+    
+    it "is_it_class?" do
+      @t.is_it_class?("SomeClass.rb").should be_false
+      @t.is_it_class?("SomeNamespace/SomeClass.rb").should be_false
+      
+      @t.is_it_class?("someclass.rb").should be_true
+      @t.is_it_class?("some_class.rb").should be_true
+      @t.is_it_class?("some_namespace/some_class.rb").should be_true
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: class_loader
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +04:00
+date: 2010-10-22 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +57,7 @@ files:
 - spec/file_system_adapter_spec_data/multiple_class_paths/path_b/ClassInPathB.rb
 - spec/file_system_adapter_spec_data/shouldnt_mess/CamelCaseClass.rb
 - spec/file_system_adapter_spec_data/shouldnt_mess/underscored_class.rb
+- spec/translators_spec.rb
 has_rdoc: true
 homepage: http://github.com/alexeypetrushin/class_loader
 licenses: []