class_loader 0.3.5 → 0.3.6

data/Rakefile

@@ -1,66 +1,10 @@
-require 'rake'
-require 'fileutils'
-current_dir = File.expand_path(File.dirname(__FILE__))
-Dir.chdir current_dir
+require 'rake_ext'
 
-
-# 
-# Specs
-# 
-require 'spec/rake/spectask'
-
-task :default => :spec
-
-Spec::Rake::SpecTask.new('spec') do |t|
-	t.spec_files = FileList["spec/**/*_spec.rb"].select{|f| f !~ /\/_/}
-  t.libs = ["#{current_dir}/lib"]
-end
-
-
-# 
-# Gem
-# 
-require 'rake/clean'
-require 'rake/gempackagetask'
-
-gem_options = {
+gem_spec(
   :name => "class_loader",
-  :version => "0.3.5",
+  :version => "0.3.6",
   :summary => "Automatically finds and loads classes",
-  :dependencies => %w()
-}
-
-gem_name = gem_options[:name]
-spec = Gem::Specification.new do |s|
-  gem_options.delete(:dependencies).each{|d| s.add_dependency d}
-  gem_options.each{|k, v| s.send "#{k}=", v}
-  
-  s.name = gem_name
-  s.author = "Alexey Petrushin"
-  s.homepage = "http://github.com/alexeypetrushin/#{gem_options[:name]}"
-  s.require_path = "lib"
-  s.files = (%w{Rakefile readme.md} + Dir.glob("{lib,spec}/**/*"))
-  
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true  
-end
-
-package_dir = "#{current_dir}/build"
-Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = true if RUBY_PLATFORM !~ /mswin/
-  p.need_zip = true
-  p.package_dir = package_dir
-end
-
-task :push do
-  # dir = Dir.chdir package_dir do
-  gem_file = Dir.glob("#{package_dir}/#{gem_name}*.gem").first
-  system "gem push #{gem_file}"
-  # end
-end
-
-task :clean do
-  system "rm -r #{package_dir}"
-end
 
-task :release => [:gem, :push, :clean]
+  :author => "Alexey Petrushin",
+  :homepage => "http://github.com/alexeypetrushin/class_loader"
+)

data/lib/class_loader/class_loader.rb

@@ -132,8 +132,8 @@ module ClassLoader
     # 
     attr_accessor :watch_interval
     def start_watching!
-      unless watching_thread      
-        self.watching_thread = Thread.new do        
+      unless @watching_thread      
+        @watching_thread = Thread.new do        
           while true
             sleep(watch_interval || 2)
             adapter.each_changed_class do |class_name|
@@ -146,9 +146,9 @@ module ClassLoader
     end
 
     def stop_watching!
-      if watching_thread
-        watching_thread.kill
-        self.watching_thread = nil
+      if @watching_thread
+        @watching_thread.kill
+        @watching_thread = nil
       end
     end
     

data/lib/class_loader/file_system_adapter.rb

@@ -27,11 +27,11 @@ module ClassLoader
     def to_file_path class_name
       file_path, exist = @file_name_cache[class_name] || []
       unless exist
-        file_name = translator.to_file_path class_name
+        normalized_name = translator.to_file_path class_name
         file_path = catch :found do
           # files
           paths.each do |base|
-            try = "#{base}/#{file_name}.rb"
+            try = "#{base}/#{normalized_name}.rb"
             if File.exist? try
               throw :found, try
             end
@@ -39,7 +39,7 @@ module ClassLoader
           
           # dirs
           paths.each do |base|
-            try = "#{base}/#{file_name}"
+            try = "#{base}/#{normalized_name}"
             if File.exist? try
               throw :found, try
             end
@@ -57,19 +57,23 @@ module ClassLoader
       raise "Internal error, file_name should be absolute path (#{normalized_path})!" unless normalized_path =~ /^\//  
       raise "Internal error, file_name should be without .rb suffix (#{normalized_path})!" if normalized_path =~ /\.rb$/  
       
-      if base_path = paths.find{|path| normalized_path.start_with? path}
-        _to_class_name normalized_path, base_path
-      else
-        nil
+      paths.each do |base_path| 
+        if normalized_path.start_with? base_path
+          normalized_name = normalized_path.sub(base_path, '')          
+          if translator.is_it_class? normalized_name
+            return translator.to_class_name(normalized_name)
+          end
+        end
       end
+      nil
     end
     
-    def add_path path, watch = false      
-      path = File.expand_path(path)
-      raise "#{path} already added!" if paths.include? path
+    def add_path base_path, watch = false      
+      base_path = File.expand_path(base_path)
+      raise "#{base_path} already added!" if paths.include? base_path
       
-      paths << path
-      watched_paths << path if watch
+      paths << base_path
+      watched_paths << base_path if watch
     end
     
     def clear
@@ -79,15 +83,15 @@ module ClassLoader
         
     def each_changed_class &block
       if @first_check
-        each_watched_file{|base_path, file_path| remember_file file_path}
+        each_watched_file{|file_path, file_name| remember_file file_path}
         @first_check = false
       else
-        each_watched_file do |base_path, file_path|
+        each_watched_file do |file_path, file_name|
           if file_changed? file_path
             remember_file file_path
             
-            normalized_path = file_path.sub(/\.rb$/, "")
-            block.call _to_class_name(normalized_path, base_path)
+            normalized_name = file_name.sub(/\.rb$/, "")
+            block.call translator.to_class_name(normalized_name)
           end
         end
       end      
@@ -97,34 +101,36 @@ module ClassLoader
       @paths.each do |base_path|          
         Dir.glob("#{base_path}/**/*.rb").each do |file_path|
           normalized_path = file_path.sub(/\.rb$/, "")
-          block.call _to_class_name(normalized_path, base_path)
+          
+          normalized_name = normalized_path.sub(base_path, '')
+          class_name = translator.to_class_name(normalized_name)
+          block.call class_name
         end
       end
     end
     
-    protected
-      attr_reader :paths, :watched_paths, :watcher, :watched_files
-      
-      def each_watched_file &block
-        @watched_paths.each do |base_path|          
-          Dir.glob("#{base_path}/**/*.rb").each do |file_path|
-            block.call base_path, file_path
+    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
+            block.call file_path, file_name
           end
         end
       end
+    end
+    
+    protected
+      attr_reader :paths, :watched_paths, :watcher, :watched_files      
       
-      def file_changed? path        
-        old_time = watched_files[path]
-        old_time == nil or old_time != File.mtime(path)
+      def file_changed? file_path
+        old_time = watched_files[file_path]
+        old_time == nil or old_time != File.mtime(file_path)
       end
 
-      def remember_file path
-        watched_files[path] = File.mtime(path)
+      def remember_file file_path
+        watched_files[file_path] = File.mtime(file_path)
       end
       
-      def _to_class_name file_path, base_path
-        relative_name = file_path.sub(base_path, '')
-        translator.to_class_name(relative_name)
-      end
   end
 end

data/lib/class_loader/file_system_adapter/camel_case_translator.rb

@@ -7,5 +7,9 @@ module ClassLoader
     def self.to_file_path class_name
       class_name.sub(/^::/, '').gsub('::', '/')
     end
+    
+    def self.is_it_class? file_name
+      file_name !~ /_/
+    end
   end
 end

data/lib/class_loader/file_system_adapter/underscored_translator.rb

@@ -7,5 +7,9 @@ module ClassLoader
     def self.to_file_path class_name
       class_name.sub(/^::/, '').underscore
     end
+    
+    def self.is_it_class? file_name
+      file_name !~ /[A-Z]/
+    end
   end
 end

data/spec/class_loader_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.expand_path(File.dirname(__FILE__))}/helper"
+require 'rspec_ext'
 require "class_loader"
 
 describe ClassLoader do  

data/spec/file_system_adapter_spec.rb

@@ -1,5 +1,8 @@
-require "#{File.expand_path(File.dirname(__FILE__))}/helper"
+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"
 
@@ -61,7 +64,7 @@ describe ClassLoader::FileSystemAdapter do
     lambda{@adapter.add_path "#{@dir}/common"}.should raise_error(/already added/)
   end
   
-  describe "file watching" do  
+  describe "file watching" do      
     def changed_classes
       changed = []
       @adapter.each_changed_class{|c| changed << c}
@@ -80,12 +83,40 @@ describe ClassLoader::FileSystemAdapter do
       @adapter.add_path "#{@dir}/watching", true
       
       changed_classes.should == []        
-
+    
       sleep(1) && write_file("watching/SomeClass.rb", "SomeClass")      
       changed_classes.should == ["SomeClass"]
     
       sleep(1) && write_file("watching/SomeClass.rb", "SomeClass")
       changed_classes.should == ["SomeClass"]
-    end    
+    end
+  end
+  
+  describe "Underscored shouldn't mess with CamelCase" do
+    before :each do
+      @camel_case_adapter = ClassLoader::FileSystemAdapter.new(ClassLoader::CamelCaseTranslator)      
+      @camel_case_adapter.add_path "#{@dir}/shouldnt_mess", true
+      @camel_case_file_path = "#{@dir}/shouldnt_mess/CamelCaseClass.rb"
+      
+      @underscored_adapter = ClassLoader::FileSystemAdapter.new(ClassLoader::UnderscoredTranslator)  
+      @underscored_adapter.add_path "#{@dir}/shouldnt_mess", true
+      @underscored_file_path = "#{@dir}/shouldnt_mess/underscored_class.rb"
+    end
+    
+    
+    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 = []
+      @underscored_adapter.each_watched_file{|file_path, relative_name| watched << relative_name}
+      watched.should == ["/underscored_class.rb"]
+    end
+    
+    it "CamelCase to_class_name shouldn't translate Underscored" do
+      @camel_case_adapter.to_class_name(@camel_case_file_path.sub(/\.rb$/, '')).should == "CamelCaseClass"
+      @underscored_adapter.to_class_name(@underscored_file_path.sub(/\.rb$/, '')).should == "UnderscoredClass"
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: class_loader
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 +04:00
+date: 2010-10-12 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -55,8 +55,8 @@ files:
 - spec/file_system_adapter_spec_data/common/SomeNamespace/SomeClass.rb
 - spec/file_system_adapter_spec_data/multiple_class_paths/path_a/ClassInPathA.rb
 - spec/file_system_adapter_spec_data/multiple_class_paths/path_b/ClassInPathB.rb
-- spec/helper.rb
-- spec/spec.opts
+- spec/file_system_adapter_spec_data/shouldnt_mess/CamelCaseClass.rb
+- spec/file_system_adapter_spec_data/shouldnt_mess/underscored_class.rb
 has_rdoc: true
 homepage: http://github.com/alexeypetrushin/class_loader
 licenses: []

data/spec/helper.rb

@@ -1,22 +0,0 @@
-require 'spec'
-require 'fileutils'
-
-def prepare_spec_data spec_file_name
-  dir = File.expand_path(spec_file_name.sub(/\.rb$/, ''))
-  original_data_dir = dir + "_data"
-    
-  FileUtils.rm_r dir if File.exist? dir
-  FileUtils.cp_r original_data_dir, dir
-    
-  dir
-end
-
-def clean_spec_data spec_file_name
-  dir = spec_file_name.sub(/\.rb$/, '')
-  FileUtils.rm_r dir if File.exist? dir
-end
-
-def remove_constants *args
-  args = args.first if args.size == 1 and args.first.is_a?(Array)
-  args.each{|c| Object.send :remove_const, c if Object.const_defined? c}       
-end

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---reverse