impromptu 1.4.0 → 1.5.0

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

data/impromptu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{impromptu}
-  s.version = "1.4.0"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Will Cannings"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-01-23}
   s.description = %q{Component and dependency manager for Ruby}
   s.email = %q{me@willcannings.com}
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
     "test/framework/folder_namespace/two_names.rb",
     "test/framework/lib/group/klass2.rb",
     "test/framework/lib/klass.rb",
+    "test/framework/lib/sub_klass.rb",
     "test/framework/other/also.rb",
     "test/framework/other/ignore.rb",
     "test/framework/other/load.rb",
@@ -82,6 +83,7 @@ Gem::Specification.new do |s|
     "test/framework/folder_namespace/two_names.rb",
     "test/framework/lib/group/klass2.rb",
     "test/framework/lib/klass.rb",
+    "test/framework/lib/sub_klass.rb",
     "test/framework/other/also.rb",
     "test/framework/other/ignore.rb",
     "test/framework/other/load.rb",

data/lib/impromptu/impromptu.rb

@@ -15,13 +15,17 @@ module Impromptu
   # have been marked as reloadable. Any modified files will be
   # reloaded, any new files will have their assiciated resources
   # inserted in the resource tree, and any removed files will be
-  # unloaded.
+  # unloaded. Any preloaded resources which are unloaded as a
+  # result of an update will automatically be reloaded again.
   def self.update
     components.each do |component|
       component.folders.each do |folder|
         folder.reload if folder.reloadable?
       end
     end
+    
+    # force any unloaded preloading resources to reload
+    self.root_resource.reload_preloaded_resources
   end
   
   # Reset Impromptu by removing all known components and resources.

data/lib/impromptu/resource.rb

@@ -70,10 +70,26 @@ module Impromptu
     
     # Unload the resource by undefining the constant representing it.
     # Any resources contained within this resource will also be
-    # unloaded. This allows the resource to be garbage collected.
+    # unloaded. This allows the resource to be garbage collected. If
+    # the resource is a class, you can define a class method called
+    # 'descendants' that returns an array of references to subclasses.
+    # Any subclasses known to Impromptu will also be unloaded, just as
+    # namespaced children are. This prevents subclasses holding a
+    # reference to a stale version of a super class.
     def unload
       return unless loaded?
+      
+      # unload namespaced children
       @children.each_value(&:unload)
+      
+      # unload descendants if they can be reloaded by impromptu
+      if reference.respond_to? :descendants
+        reference.descendants.each do |descendant|
+          resource = Impromptu.root_resource.child(descendant.name.to_sym)
+          resource.unload unless resource.nil?
+        end
+      end
+      
       unless @dont_undef
         @parent.reference.send(:remove_const, @base_symbol)
         @reference = nil
@@ -217,6 +233,10 @@ module Impromptu
       @children.each_value(&:load_if_extending_stdlib)
     end
     
+    # Loads this resource, and any child resources, if the resource is
+    # marked as requiring preloading, and the resource is not currently
+    # loaded. This loading may happen multiple times during the application
+    # life cycle depending on whether parent resources are reloaded and so on.
     def reload_preloaded_resources
       reload if !loaded? && preload?
       @children.each_value(&:reload_preloaded_resources)

data/test/framework/copies/new_klass.rb

@@ -6,5 +6,14 @@ module Framework
     
     def self.new_method
     end
+    
+    def self.descendants
+      @descendants ||= []
+    end
+
+    def self.inherited(child)
+      super(child)
+      descendants << child
+    end
   end
 end

data/test/framework/copies/original_klass.rb

@@ -6,5 +6,14 @@ module Framework
     def self.overriden_method
       1
     end
+    
+    def self.descendants
+      @descendants ||= []
+    end
+
+    def self.inherited(child)
+      super(child)
+      descendants << child
+    end
   end
 end

data/test/framework/lib/klass.rb

@@ -6,5 +6,14 @@ module Framework
     def self.overriden_method
       1
     end
+    
+    def self.descendants
+      @descendants ||= []
+    end
+
+    def self.inherited(child)
+      super(child)
+      descendants << child
+    end
   end
 end

data/test/framework/lib/sub_klass.rb

@@ -0,0 +1,4 @@
+module Framework
+  class SubKlass < Klass
+  end
+end

data/test/test_integration.rb

@@ -35,19 +35,20 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal nil, Impromptu.components['other'].namespace
     end
     
-    should "05 start tracking 11 files" do
-      assert_equal 2, Impromptu.components['framework'].folders.first.files.size
+    should "05 start tracking all files" do
+      assert_equal 3, Impromptu.components['framework'].folders.first.files.size
       assert_equal 2, Impromptu.components['framework.extensions'].folders.first.files.size
       assert_equal 3, Impromptu.components['other'].folders.first.files.size
       assert_equal 2, Impromptu.components['private'].folders.first.files.size
       assert_equal 2, Impromptu.components['folder_namespace'].folders.first.files.size
     end
     
-    should "06 load definitions for 13 resources" do
+    should "06 load definitions for all resources" do
       assert Impromptu.root_resource.child?(:Framework)
       assert Impromptu.root_resource.child(:Framework).child?(:Extensions)
       assert Impromptu.root_resource.child(:Framework).child(:Extensions).child?(:Blog)
       assert Impromptu.root_resource.child(:Framework).child?(:Klass)
+      assert Impromptu.root_resource.child(:Framework).child?(:SubKlass)
       assert Impromptu.root_resource.child(:Framework).child?(:Klass2)
       assert Impromptu.root_resource.child(:Framework).child?(:Preload)
       assert Impromptu.root_resource.child?(:Load)
@@ -65,6 +66,7 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal false, Impromptu.root_resource.child(:Framework).child(:Extensions).namespace?
       assert_equal false, Impromptu.root_resource.child(:Framework).child(:Extensions).child(:Blog).namespace?
       assert_equal false, Impromptu.root_resource.child(:Framework).child(:Klass).namespace?
+      assert_equal false, Impromptu.root_resource.child(:Framework).child(:SubKlass).namespace?
       assert_equal false, Impromptu.root_resource.child(:Framework).child(:Klass2).namespace?
       assert_equal false, Impromptu.root_resource.child(:Load).namespace?
       assert_equal false, Impromptu.root_resource.child(:OtherName).namespace?
@@ -81,6 +83,7 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal false, Impromptu.root_resource.child(:'Framework::Extensions').loaded?
       assert_equal false, Impromptu.root_resource.child(:'Framework::Extensions::Blog').loaded?
       assert_equal false, Impromptu.root_resource.child(:'Framework::Klass').loaded?
+      assert_equal false, Impromptu.root_resource.child(:'Framework::SubKlass').loaded?
       assert_equal false, Impromptu.root_resource.child(:'Framework::Klass2').loaded?
       assert_equal false, Impromptu.root_resource.child(:'Load').loaded?
       assert_equal false, Impromptu.root_resource.child(:'OtherName').loaded?
@@ -101,6 +104,7 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal 1, Impromptu.root_resource.child(:'Framework::Extensions').files.size
       assert_equal 1, Impromptu.root_resource.child(:'Framework::Extensions::Blog').files.size
       assert_equal 2, Impromptu.root_resource.child(:'Framework::Klass').files.size
+      assert_equal 1, Impromptu.root_resource.child(:'Framework::SubKlass').files.size
       assert_equal 1, Impromptu.root_resource.child(:'Framework::Klass2').files.size
       assert_equal 1, Impromptu.root_resource.child(:'Framework::Preload').files.size
       assert_equal 1, Impromptu.root_resource.child(:'Framework::Klass2').files.size
@@ -292,9 +296,10 @@ class TestIntegration < Test::Unit::TestCase
         File.open('test/framework/lib/klass.rb', 'w') do |file|
           file.write old_klass
         end
+        sleep 1 # because file mod times are in seconds, delay by 1s so further tests so an updated timestamp
       end
       
-      should "reload a class definition correctly when a file is changed" do        
+      should "reload a class definition correctly when a file is changed" do
         # update impromptu and test the new klass is loaded
         assert_respond_to Framework::Klass, :standard_method
         assert_equal 2, Framework::Klass.overriden_method
@@ -303,6 +308,19 @@ class TestIntegration < Test::Unit::TestCase
         assert_equal false, Framework::Klass.respond_to?(:standard_method)
         assert_equal 2, Framework::Klass.overriden_method
       end
+      
+      should "unload a subclass if a parent class file is updated" do
+        assert_respond_to Framework::SubKlass, :standard_method
+        assert_equal 2, Framework::SubKlass.overriden_method
+
+        Impromptu.update
+        
+        assert_equal false, Impromptu.root_resource.child(:'Framework::SubKlass').loaded?
+        Impromptu.root_resource.child(:'Framework::SubKlass').reload
+        assert_respond_to Framework::SubKlass, :new_method
+        assert_equal false, Framework::SubKlass.respond_to?(:standard_method)
+        assert_equal 2, Framework::SubKlass.overriden_method
+      end
     end
     
     

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Will Cannings
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +11:00
+date: 2011-01-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - test/framework/folder_namespace/two_names.rb
 - test/framework/lib/group/klass2.rb
 - test/framework/lib/klass.rb
+- test/framework/lib/sub_klass.rb
 - test/framework/other/also.rb
 - test/framework/other/ignore.rb
 - test/framework/other/load.rb
@@ -132,6 +133,7 @@ test_files:
 - test/framework/folder_namespace/two_names.rb
 - test/framework/lib/group/klass2.rb
 - test/framework/lib/klass.rb
+- test/framework/lib/sub_klass.rb
 - test/framework/other/also.rb
 - test/framework/other/ignore.rb
 - test/framework/other/load.rb