class_loader 0.4.2 → 0.4.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake_ext'
 
 project(
   name: "class_loader",
-  version: "0.4.2",
+  version: "0.4.3",
   summary: "Automatically finds, loads and reloads Classes",
 
   author: "Alexey Petrushin",

data/lib/class_loader.rb

@@ -1,5 +1,8 @@
 raise 'ruby 1.9.2 or higher required!' if RUBY_VERSION < '1.9.2'
 
+module ClassLoader
+end
+
 %w(
   support
   file_system_adapter/camel_case_translator

data/lib/class_loader/chained_adapter.rb

@@ -1,44 +1,42 @@
-module ClassLoader
-  class ChainedAdapter
-    attr_accessor :adapters
+class ClassLoader::ChainedAdapter
+  attr_accessor :adapters
 
-    def initialize
-      @adapters = []
-    end
-    
-    %w(
-      exist?
-      read
-      to_file_path
-      to_class_name
-    ).each do |method|
-      define_method method do |*args|
-        catch :found do
-          adapters.each do |a|
-            value = a.send method, *args
-            throw :found, value if value
-          end
-          nil
+  def initialize
+    @adapters = []
+  end
+  
+  %w(
+    exist?
+    read
+    to_file_path
+    to_class_name
+  ).each do |method|
+    define_method method do |*args|
+      catch :found do
+        adapters.each do |a|
+          value = a.send method, *args
+          throw :found, value if value
         end
+        nil
       end
     end
-    
-    def each_changed_class &block      
-      adapters.each{|a| a.each_changed_class &block}
-    end
-    
-    def each_class &block
-      adapters.each{|a| a.each_class &block}
-    end
-    
-    def clear
-      adapters.each{|a| a.clear}
-    end
-    
-    def add_path *args
-      adapters.each do |a|
-        a.add_path *args if a.respond_to? :add_path
-      end
+  end
+  
+  def each_changed_class &block      
+    adapters.each{|a| a.each_changed_class &block}
+  end
+  
+  def each_class &block
+    adapters.each{|a| a.each_class &block}
+  end
+  
+  def clear
+    adapters.each{|a| a.clear}
+  end
+  
+  def add_path *args
+    adapters.each do |a|
+      a.add_path *args if a.respond_to? :add_path
     end
   end
 end

data/lib/class_loader/class_loader.rb

@@ -1,13 +1,15 @@
 require 'monitor'
 
+warn 'ClassLoader: working in slow, debug mode with explicit tmp file generation!' if defined?(CLASS_LOADER_GENERATE_TMP_FILES)
+
 module ClassLoader
   @observers = []
   SYNC = Monitor.new
   
   class << self        
-    def loaded_classes; @loaded_classes ||= {} end            
+    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
@@ -52,16 +54,16 @@ module ClassLoader
       end
     end
     
-    def reload_class class_name
+    def reload_class class_name      
       SYNC.synchronize do
         class_name = class_name.sub(/^::/, "")
         namespace = Module.namespace_for(class_name)
         name = class_name.sub(/^#{namespace}::/, "")      
-        
+      
         # removing old class
         # class_container = (namespace || Object)
         # class_container.send :remove_const, name if class_container.const_defined? name
-        
+      
         return load_class namespace, name, true
       end
     end
@@ -131,6 +133,9 @@ module ClassLoader
     # 
     attr_accessor :watch_interval
     def start_watching!
+      # reloading doesn works in debug mode, because we by ourself are generating tmp source files
+      return if defined?(CLASS_LOADER_GENERATE_TMP_FILES)
+        
       unless @watching_thread      
         @watching_thread = Thread.new do        
           while true
@@ -169,8 +174,25 @@ module ClassLoader
       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
+        file_path = adapter.to_file_path(class_name)
+
+        # sometimes we need to generate file explicitly
+        # for example evaluated code will not be shown in Ruby coverage tool
+        unless defined?(CLASS_LOADER_GENERATE_TMP_FILES)
+          eval script, TOPLEVEL_BINDING, file_path
+        else          
+          if file_path =~ /\.rb$/
+            tmp_file_path = file_path.sub /\.rb$/, '.cltmp.rb'
+            begin
+              File.open(tmp_file_path, "w"){|f| f.write(script)}
+              Kernel.load tmp_file_path
+            ensure
+              File.delete tmp_file_path if defined?(CLASS_LOADER_CLEAN) and ::File.exist?(tmp_file_path)
+            end
+          else
+            eval script, TOPLEVEL_BINDING, file_path
+          end
+        end
       end
       
       def raise_without_self exception, message

data/lib/class_loader/file_system_adapter.rb

@@ -1,141 +1,139 @@
-module ClassLoader
-  class FileSystemAdapter
-    attr_reader :translator
-    
-    def initialize class_name_translator      
-      @translator = class_name_translator
-      @paths, @watched_paths, @file_name_cache = [], [], {}
-      @watched_files, @first_check = {}, true
-    end
-    
-    def exist? class_name
-      !!to_file_path(class_name)
-    end
-    alias_method :exists?, :exist?
-    
-    def read class_name      
-      file_path = to_file_path class_name
-      return nil unless file_path
-      
-      if file_path =~ /\.rb$/
-        File.open(file_path){|f| f.read}        
-      else
-        "module #{class_name}; end;"
-      end  
-    end
+class ClassLoader::FileSystemAdapter
+  attr_reader :translator
+  
+  def initialize class_name_translator      
+    @translator = class_name_translator
+    @paths, @watched_paths, @file_name_cache = [], [], {}
+    @watched_files, @first_check = {}, true
+  end
+  
+  def exist? class_name
+    !!to_file_path(class_name)
+  end
+  alias_method :exists?, :exist?
+  
+  def read class_name      
+    file_path = to_file_path class_name
+    return nil unless file_path
     
-    def to_file_path class_name
-      file_path, exist = @file_name_cache[class_name] || []
-      unless exist
-        normalized_name = translator.to_file_path class_name
-        file_path = catch :found do
-          # files
-          paths.each do |base|
-            try = "#{base}/#{normalized_name}.rb"
-            if File.exist? try
-              throw :found, try
-            end
-          end
-          
-          # dirs
-          paths.each do |base|
-            try = "#{base}/#{normalized_name}"
-            if File.exist? try
-              throw :found, try
-            end
+    if file_path =~ /\.rb$/
+      File.open(file_path){|f| f.read}        
+    else
+      "module #{class_name}; end;"
+    end  
+  end
+  
+  def to_file_path class_name
+    file_path, exist = @file_name_cache[class_name] || []
+    unless exist
+      normalized_name = translator.to_file_path class_name
+      file_path = catch :found do
+        # files
+        paths.each do |base|
+          try = "#{base}/#{normalized_name}.rb"
+          if File.exist? try
+            throw :found, try
           end
-          
-          nil
         end
-        @file_name_cache[class_name] = [file_path, true]        
-      end
-      file_path
-    end
-    
-    def to_class_name normalized_path
-      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$/  
-      
-      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)
+        
+        # dirs
+        paths.each do |base|
+          try = "#{base}/#{normalized_name}"
+          if File.exist? try
+            throw :found, try
           end
         end
+        
+        nil
       end
-      nil
+      @file_name_cache[class_name] = [file_path, true]        
     end
+    file_path
+  end
+  
+  def to_class_name normalized_path
+    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$/  
     
-    def add_path base_path, watch = false      
-      base_path = File.expand_path(base_path)
-      # raise "#{base_path} already added!" if paths.include? base_path
-      unless paths.include? base_path
-        paths << base_path
-        watched_paths << base_path if watch
+    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
-    
-    def clear
-      @paths, @watched_paths, @file_name_cache = [], [], {}
-      @watched_files, @first_check = {}, true
-    end    
-        
-    def each_changed_class &block
-      unless @first_check == @watched_paths
-        @first_check = @watched_paths.clone
-        each_watched_file{|file_path, file_name| remember_file file_path}
-      else        
-        each_watched_file do |file_path, file_name|
-          if file_changed? file_path
-            remember_file file_path
-            
-            normalized_name = file_name.sub(/\.rb$/, "")
-            block.call translator.to_class_name(normalized_name)
-          end
-        end 
-      end      
+    nil
+  end
+  
+  def add_path base_path, watch = false      
+    base_path = File.expand_path(base_path)
+    # raise "#{base_path} already added!" if paths.include? base_path
+    unless paths.include? base_path
+      paths << base_path
+      watched_paths << base_path if watch
     end
-    
-    def each_class &block
-      @paths.each do |base_path|          
-        Dir.glob("#{base_path}/**/*.rb").each do |file_path|
-          normalized_path = file_path.sub(/\.rb$/, "")
+  end
+  
+  def clear
+    @paths, @watched_paths, @file_name_cache = [], [], {}
+    @watched_files, @first_check = {}, true
+  end    
+      
+  def each_changed_class &block
+    unless @first_check == @watched_paths
+      @first_check = @watched_paths.clone
+      each_watched_file{|file_path, file_name| remember_file file_path}
+    else        
+      each_watched_file do |file_path, file_name|
+        if file_changed? file_path
+          remember_file file_path
           
-          normalized_name = normalized_path.sub(base_path + "/", '')
-          class_name = translator.to_class_name(normalized_name)
-          block.call class_name
+          normalized_name = file_name.sub(/\.rb$/, "")
+          block.call translator.to_class_name(normalized_name)
         end
+      end 
+    end      
+  end
+  
+  def each_class &block
+    @paths.each do |base_path|          
+      Dir.glob("#{base_path}/**/*.rb").each do |file_path|
+        normalized_path = file_path.sub(/\.rb$/, "")
+        
+        normalized_name = normalized_path.sub(base_path + "/", '')
+        class_name = translator.to_class_name(normalized_name)
+        block.call class_name
       end
     end
-    
-    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 + '/', '')
+  end
+  
+  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
+        if translator.is_it_class? file_name            
+          block.call file_path, file_name
         end
       end
     end
+  end
+  
+  def inspect
+    "FileSystemAdapter (#{@paths.join(', ')})"
+  end      
+  
+  protected
+    attr_reader :paths, :watched_paths, :watcher, :watched_files      
     
-    def inspect
-      "FileSystemAdapter (#{@paths.join(', ')})"
-    end      
-    
-    protected
-      attr_reader :paths, :watched_paths, :watcher, :watched_files      
-      
-      def file_changed? file_path
-        old_time = watched_files[file_path]
-        old_time == nil or old_time != File.mtime(file_path)
-      end
+    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 file_path
-        watched_files[file_path] = File.mtime(file_path)
-      end
-      
-  end
+    def remember_file file_path
+      watched_files[file_path] = File.mtime(file_path)
+    end
+    
 end

data/lib/class_loader/file_system_adapter/camel_case_translator.rb

@@ -1,18 +1,16 @@
-module ClassLoader
-  class CamelCaseTranslator
-    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
-      raise "internall error, invalid format for #{class_name}!" if class_name =~ /^::/
-      class_name.gsub('::', '/')
-    end
-    
-    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
+class ClassLoader::CamelCaseTranslator
+  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
+    raise "internall error, invalid format for #{class_name}!" if class_name =~ /^::/
+    class_name.gsub('::', '/')
+  end
+  
+  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

data/lib/class_loader/file_system_adapter/underscored_translator.rb

@@ -1,18 +1,16 @@
-module ClassLoader
-  class UnderscoredTranslator
-    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
-      raise "internall error, invalid format for #{class_name}!" if class_name =~ /^::/
-      class_name.underscore
-    end
-    
-    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
+module ClassLoader::UnderscoredTranslator
+  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
+    raise "internall error, invalid format for #{class_name}!" if class_name =~ /^::/
+    class_name.underscore
+  end
+  
+  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

data/lib/class_loader/tasks.rb

@@ -0,0 +1,8 @@
+desc "Cleans tmp files generated by ClassLoader in debug mode"
+namespace :class_loader do
+  task :clean do
+    Dir['../**/*.cltmp.rb'].each do |path|
+      File.delete path
+    end
+  end
+end

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) 2011 Alexey Petrushin http://4ire.net, released under the MIT license.
+Copyright (c) Alexey Petrushin http://4ire.net, released under the MIT license.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: class_loader
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-19 00:00:00.000000000 +04:00
+date: 2011-07-02 00:00:00.000000000 +04:00
 default_executable: 
 dependencies: []
 description: 
@@ -26,6 +26,7 @@ files:
 - lib/class_loader/file_system_adapter/underscored_translator.rb
 - lib/class_loader/file_system_adapter.rb
 - lib/class_loader/support.rb
+- lib/class_loader/tasks.rb
 - lib/class_loader.rb
 - spec/class_loader_spec/anonymous_class/AnonymousSpec/ClassInsideOfAnonymousClass.rb
 - spec/class_loader_spec/another_namespace/AnotherNamespace/NamespaceA.rb