impromptu 1.5.1 → 1.5.2

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/impromptu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{impromptu}
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Will Cannings"]
-  s.date = %q{2011-03-10}
+  s.date = %q{2011-03-11}
   s.description = %q{Component and dependency manager for Ruby}
   s.email = %q{me@willcannings.com}
   s.extra_rdoc_files = [
@@ -36,8 +36,10 @@ Gem::Specification.new do |s|
     "lib/impromptu/symbol.rb",
     "test/framework/copies/extra_klass2.rb",
     "test/framework/copies/new_klass.rb",
+    "test/framework/copies/new_sub_klass.rb",
     "test/framework/copies/new_unseen.rb",
     "test/framework/copies/original_klass.rb",
+    "test/framework/copies/original_sub_klass.rb",
     "test/framework/ext/extensions.rb",
     "test/framework/ext/extensions/blog.rb",
     "test/framework/folder_namespace/stream.rb",
@@ -75,8 +77,10 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/framework/copies/extra_klass2.rb",
     "test/framework/copies/new_klass.rb",
+    "test/framework/copies/new_sub_klass.rb",
     "test/framework/copies/new_unseen.rb",
     "test/framework/copies/original_klass.rb",
+    "test/framework/copies/original_sub_klass.rb",
     "test/framework/ext/extensions.rb",
     "test/framework/ext/extensions/blog.rb",
     "test/framework/folder_namespace/stream.rb",

data/lib/impromptu/resource.rb

@@ -90,6 +90,11 @@ module Impromptu
         end
       end
       
+      # remove from the parent's descendants list
+      if reference.respond_to?(:superclass) &&  reference.superclass.respond_to?(:descendants)
+        reference.superclass.descendants.delete(reference)
+      end
+      
       unless @dont_undef
         @parent.reference.send(:remove_const, @base_symbol)
         @reference = nil

data/test/framework/copies/new_sub_klass.rb

@@ -0,0 +1,7 @@
+module Framework
+  class SubKlass < Klass
+    def self.new_sub_method
+      true
+    end
+  end
+end

data/test/framework/copies/original_sub_klass.rb

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

data/test/test_integration.rb

@@ -323,6 +323,36 @@ class TestIntegration < Test::Unit::TestCase
       end
     end
     
+    context "and changing the definition of sub klass" do
+      setup do
+        Impromptu.root_resource.child(:'Framework::SubKlass').reload
+        new_sub_klass = File.open('test/framework/copies/new_sub_klass.rb').read
+        File.open('test/framework/lib/sub_klass.rb', 'w') do |file|
+          file.write new_sub_klass
+        end
+      end
+      
+      teardown do
+        original_sub_klass = File.open('test/framework/copies/original_sub_klass.rb').read
+        File.open('test/framework/lib/sub_klass.rb', 'w') do |file|
+          file.write original_sub_klass
+        end
+        sleep 1 # because file mod times are in seconds, delay by 1s so further tests so an updated timestamp
+      end
+      
+      should "reload sub klass's definition from disk correctly" do
+        assert_equal false, Framework::SubKlass.respond_to?(:new_sub_method)
+        Impromptu.update
+        assert_respond_to Framework::SubKlass, :new_sub_method
+      end
+      
+      should "ensure stale references to sub klass don't persist in klass's descendants list" do
+        assert_equal 1, Framework::Klass.descendants.size
+        Impromptu.update
+        assert_equal 1, Framework::Klass.descendants.size
+      end
+    end
+    
     
     # ----------------------------------------
     # Adding files

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Will Cannings
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +11:00
+date: 2011-03-11 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,8 +59,10 @@ files:
 - lib/impromptu/symbol.rb
 - test/framework/copies/extra_klass2.rb
 - test/framework/copies/new_klass.rb
+- test/framework/copies/new_sub_klass.rb
 - test/framework/copies/new_unseen.rb
 - test/framework/copies/original_klass.rb
+- test/framework/copies/original_sub_klass.rb
 - test/framework/ext/extensions.rb
 - test/framework/ext/extensions/blog.rb
 - test/framework/folder_namespace/stream.rb
@@ -125,8 +127,10 @@ summary: Component and dependency manager for Ruby
 test_files: 
 - test/framework/copies/extra_klass2.rb
 - test/framework/copies/new_klass.rb
+- test/framework/copies/new_sub_klass.rb
 - test/framework/copies/new_unseen.rb
 - test/framework/copies/original_klass.rb
+- test/framework/copies/original_sub_klass.rb
 - test/framework/ext/extensions.rb
 - test/framework/ext/extensions/blog.rb
 - test/framework/folder_namespace/stream.rb