class_loader 0.4.15 → 3.0.0

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

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

data/spec/class_loader_spec/another_namespace/some_namespace/namespace_a.rb

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

data/spec/class_loader_spec/another_namespace/{AnotherNamespace/NamespaceB.rb → some_namespace/namespace_b.rb}

@@ -1,4 +1,4 @@
-class NamespaceB
+class SomeNamespace::NamespaceB
   class InnerClass; end
 
   InnerClass::NamespaceA

data/spec/class_loader_spec/another_namespace/some_namespace.rb

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

data/spec/class_loader_spec/basics/another_class.rb

@@ -0,0 +1,2 @@
+class AnotherClass
+end

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

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

data/spec/class_loader_spec/basics/some_namespace.rb

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

data/spec/class_loader_spec/infinity_loop/some_class.rb

@@ -0,0 +1,2 @@
+class InvalidNameOfSomeClass
+end

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

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

data/spec/class_loader_spec/namespace_resolving/some_namespace.rb

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

data/spec/class_loader_spec/preloading/some_namespace/another_class.rb

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

data/spec/class_loader_spec/preloading/some_namespace.rb

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

data/spec/class_loader_spec/reloading/some_class.rb

@@ -0,0 +1,3 @@
+class SomeClass
+  def self.version; 1 end
+end

data/spec/class_loader_spec.rb

@@ -1,11 +1,20 @@
 require 'rspec_ext'
 require "class_loader"
 
-describe ClassLoader do
+describe 'Autoloading classes' do
   with_tmp_spec_dir
 
-  after :all do
+  after do
+    ClassLoader.loaded_classes.clear
+    ClassLoader.watcher.stop
+
     remove_constants %w(
+      SomeNamespace
+      AnotherNamespace
+
+      SomeClass
+      AnotherClass
+
       BasicSpec
       OnlyOnceSpec
       NamespaceTypeResolving NamespaceIsAlreadyDefinedAsClass
@@ -16,122 +25,131 @@ describe ClassLoader do
       UnloadOldClass
       PreloadingSpec
       UnderscoredNamespace
+      Tmp
     )
   end
 
-  after do
-    ClassLoader.clear
-  end
+  it "basics" do
+    with_load_path "#{spec_dir}/basics" do
+      SomeClass.name.should == 'SomeClass'
+      SomeClass.class.should == Class
 
-  it "should load classes from class path" do
-    autoload_path "#{spec_dir}/basic"
+      SomeNamespace::SomeClass.name.should == 'SomeNamespace::SomeClass'
+      SomeNamespace.class.should == Module
 
-    BasicSpec
-    BasicSpec::SomeNamespace::SomeClass
+      SomeNamespace::AnotherClass
+    end
   end
 
   it "should load classes only once" do
-    autoload_path "#{spec_dir}/only_once"
+    begin
+      Tmp = []
+      ClassLoader.class_eval do
+        class << self
+          alias_method :load_without_test, :load
+          def load_with_test namespace, const
+            Tmp << const
+            load_without_test namespace, const
+          end
+          alias_method :load, :load_with_test
+        end
+      end
 
-    check = mock
-    check.should_receive(:loaded).once
-    ClassLoader.add_observer do |klass|
-      klass.name.should == "OnlyOnceSpec"
-      check.loaded
-    end
+      with_load_path "#{spec_dir}/only_once" do
+        SomeClass
+        SomeClass
+      end
 
-    OnlyOnceSpec
-    OnlyOnceSpec
+      Tmp.should == [:SomeClass]
+    ensure
+      ClassLoader.class_eval do
+        class << self
+          alias_method :load, :load_without_test
+        end
+      end
+    end
   end
 
-  it "should resolve is namespace a class or module" do
-    autoload_path "#{spec_dir}/namespace_type_resolving"
-
-    NamespaceTypeResolving.class.should == Class
-    NamespaceTypeResolving::SomeClass
+  it "should resolve namespace" do
+    with_load_path "#{spec_dir}/namespace_resolving" do
+      SomeNamespace
 
-    class NamespaceIsAlreadyDefinedAsClass; end
-    NamespaceIsAlreadyDefinedAsClass::SomeClass
+      SomeNamespace.class.should == Module
+      SomeNamespace::SomeClass
+    end
   end
 
   it "should recognize infinity loop" do
-    autoload_path "#{spec_dir}/infinity_loop"
-
-    -> {InfinityLoop}.should raise_error(/Class Name .+ doesn't correspond to File Name/)
+    with_load_path "#{spec_dir}/infinity_loop" do
+      -> {SomeClass}.should raise_error(/class name 'SomeClass' doesn't correspond to file name 'some_class'/)
+    end
   end
 
   it "should correctly works inside of anonymous class" do
-    autoload_path "#{spec_dir}/anonymous_class"
-
-    module ::AnonymousSpec
-      class << self
-        def anonymous
-          ClassInsideOfAnonymousClass
+    with_load_path "#{spec_dir}/anonymous_class" do
+      module SomeNamespace
+        class << self
+          def anonymous
+            SomeClass
+          end
         end
       end
-    end
 
-    AnonymousSpec.anonymous
+      SomeNamespace.anonymous
+    end
   end
 
   it "should raise exception if class defined in another namespace" do
-    autoload_path "#{spec_dir}/another_namespace"
-
-    AnotherNamespace::NamespaceA
-    # ClassLoader.error_on_defined_constant = true
-    -> {
-      AnotherNamespace::NamespaceB
-    }.should raise_error(/something wrong with/)
-    # }.should raise_error(/Class '.+' is not defined in the '.+' Namespace!/)
+    with_load_path "#{spec_dir}/another_namespace" do
+      SomeNamespace::NamespaceA
+      -> {SomeNamespace::NamespaceB}.should raise_error(/something wrong with/)
+    end
   end
 
-  describe "reloading" do
-    it "should reload class files" do
-      class_reloading_dir = "#{spec_dir}/class_reloading"
-      fname = "#{class_reloading_dir}/ClassReloadingSpec.rb"
-      autoload_path class_reloading_dir
+  it "should reload class files" do
+    with_load_path "#{spec_dir}/reloading" do
+      watcher = ClassLoader.watcher
+      watcher.paths << "#{spec_dir}/reloading"
 
-      code = <<-RUBY
-class ClassReloadingSpec
-  def self.check; :value end
-end
-RUBY
+      # Watcher should not load classes by itself.
+      watcher.check
+      Object.const_defined?(:SomeClass).should be_false
 
-      File.open(fname, 'w'){|f| f.write code}
-
-      ClassReloadingSpec.check.should == :value
+      # Autoloading class.
+      SomeClass.version.should == 1
 
+      # Writing new version of file.
       code = <<-RUBY
-class ClassReloadingSpec
-  def self.check; :another_value end
+class SomeClass
+def self.version; 2 end
 end
 RUBY
 
-      File.open(fname, 'w'){|f| f.write code}
+      class_path = "#{spec_dir}/reloading/some_class.rb"
+      File.open(class_path, 'w'){|f| f.write code}
 
-      ClassLoader.reload_class(ClassReloadingSpec.name)
-      ClassReloadingSpec.check.should == :another_value
-    end
+      # File system doesn't notice small changes in file update date, so
+      # we stubbing it.
+      updated_at = File.mtime class_path
+      File.stub!(:mtime).and_return(updated_at + 1)
 
-    # Outdated
-    # it "should unload old classes before reloading" do
-    #   autoload_path "#{spec_dir}/unload_old_class"
-    #   UnloadOldClass.instance_variable_set "@value", :value
-    #   ClassLoader.reload_class(UnloadOldClass.name)
-    #   UnloadOldClass.instance_variable_get("@value").should == nil
-    # end
+      # Should reload class.
+      watcher.stub! :warn
+      ClassLoader.watcher.check
+      SomeClass.version.should == 2
+    end
   end
 
   it "should be able to preload all classes in production" do
-    autoload_path "#{spec_dir}/preloading"
-    Object.const_defined?(:PreloadingSpec).should be_false
-    ClassLoader.preload!
-    Object.const_defined?(:PreloadingSpec).should be_true
-  end
+    with_load_path "#{spec_dir}/preloading" do
+      Object.const_defined?(:SomeClass).should be_false
+      Object.const_defined?(:SomeNamespace).should be_false
 
-  it "underscored smoke test" do
-    autoload_path "#{spec_dir}/underscored"
+      ClassLoader.preload "#{spec_dir}/preloading"
 
-    UnderscoredNamespace::UnderscoredClass
+      Object.const_defined?(:SomeClass).should be_true
+      Object.const_defined?(:SomeNamespace).should be_true
+      SomeNamespace.const_defined?(:AnotherClass).should be_true
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: class_loader
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-10-29 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -19,36 +19,29 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
-- lib/class_loader/chained_adapter.rb
 - lib/class_loader/class_loader.rb
-- lib/class_loader/file_system_adapter/camel_case_translator.rb
-- lib/class_loader/file_system_adapter/underscored_translator.rb
-- lib/class_loader/file_system_adapter.rb
-- lib/class_loader/spec.rb
 - lib/class_loader/support.rb
-- lib/class_loader/tasks.rb
+- lib/class_loader/watcher.rb
 - lib/class_loader.rb
-- spec/class_loader_spec/anonymous_class/AnonymousSpec/ClassInsideOfAnonymousClass.rb
-- spec/class_loader_spec/another_namespace/AnotherNamespace/NamespaceA.rb
-- spec/class_loader_spec/another_namespace/AnotherNamespace/NamespaceB.rb
-- spec/class_loader_spec/basic/BasicSpec/SomeNamespace/SomeClass.rb
-- spec/class_loader_spec/basic/BasicSpec.rb
-- spec/class_loader_spec/infinity_loop/InfinityLoop.rb
-- spec/class_loader_spec/namespace_type_resolving/NamespaceIsAlreadyDefinedAsClass/SomeClass.rb
-- spec/class_loader_spec/namespace_type_resolving/NamespaceTypeResolving/SomeClass.rb
-- spec/class_loader_spec/namespace_type_resolving/NamespaceTypeResolving.rb
-- spec/class_loader_spec/only_once/OnlyOnceSpec.rb
-- spec/class_loader_spec/preloading/PreloadingSpec.rb
+- spec/class_loader_spec/anonymous_class/some_namespace/some_class.rb
+- 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/basics/another_class.rb
+- spec/class_loader_spec/basics/some_class.rb
+- spec/class_loader_spec/basics/some_namespace/some_class.rb
+- spec/class_loader_spec/basics/some_namespace.rb
+- spec/class_loader_spec/infinity_loop/some_class.rb
+- spec/class_loader_spec/namespace_resolving/some_namespace/some_class.rb
+- spec/class_loader_spec/namespace_resolving/some_namespace.rb
+- spec/class_loader_spec/only_once/some_class.rb
+- spec/class_loader_spec/preloading/some_class.rb
+- spec/class_loader_spec/preloading/some_namespace/another_class.rb
+- spec/class_loader_spec/preloading/some_namespace.rb
+- spec/class_loader_spec/reloading/some_class.rb
 - spec/class_loader_spec/underscored/underscored_namespace/underscored_class.rb
 - spec/class_loader_spec/unload_old_class/UnloadOldClass.rb
 - spec/class_loader_spec.rb
-- spec/file_system_adapter_spec/common/SomeNamespace/SomeClass.rb
-- spec/file_system_adapter_spec/multiple_class_paths/path_a/ClassInPathA.rb
-- spec/file_system_adapter_spec/multiple_class_paths/path_b/ClassInPathB.rb
-- spec/file_system_adapter_spec/shouldnt_mess/CamelCaseClass.rb
-- spec/file_system_adapter_spec/shouldnt_mess/underscored_class.rb
-- spec/file_system_adapter_spec.rb
-- spec/translators_spec.rb
 homepage: http://github.com/alexeypetrushin/class_loader
 licenses: []
 post_install_message: 
@@ -72,5 +65,5 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Automatically finds, loads and reloads classes
+summary: Automatically find, load and reload classes
 test_files: []

data/lib/class_loader/chained_adapter.rb

@@ -1,48 +0,0 @@
-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
-      end
-    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 delete_path *args
-    adapters.each do |a|
-      a.add_path *args if a.respond_to? :delete_path
-    end
-  end
-end

data/lib/class_loader/file_system_adapter/camel_case_translator.rb

@@ -1,16 +0,0 @@
-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,16 +0,0 @@
-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