impromptu 1.5.0 → 1.5.1

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/impromptu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{impromptu}
-  s.version = "1.5.0"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Will Cannings"]
-  s.date = %q{2011-01-23}
+  s.date = %q{2011-03-10}
   s.description = %q{Component and dependency manager for Ruby}
   s.email = %q{me@willcannings.com}
   s.extra_rdoc_files = [

data/lib/impromptu/file.rb

@@ -31,6 +31,7 @@ module Impromptu
     # Indicate whether this file needs to be preloaded
     def preload=(preload)
       @preload = preload
+      @resources.each {|resource| resource.preload = preload}
     end
     
     # True if this file needs to be preloaded before other files

data/lib/impromptu/folder.rb

@@ -81,10 +81,18 @@ module Impromptu
       @options[:preload]
     end
     
+    # Turn preloading on for this folder (can be done after initialisation)
+    # and run an initial preload. Ensures files are always loaded.
+    def preload!
+      @options[:preload] = true
+      @files.each {|file| file.preload = true}
+      preload
+    end
+    
     # Preload the resources defined by this folder. Should only be called
     # by the Impromptu module, and only once (at app startup).
     def preload
-      return unless preload?
+      return unless preload? || force
       @files.each do |file|
         file.reload
       end

data/test/test_integration.rb

@@ -416,5 +416,28 @@ class TestIntegration < Test::Unit::TestCase
         assert Framework::Klass2.new_method
       end
     end
+    
+    
+    # ----------------------------------------
+    # Preloading a folder after initialisation
+    # ----------------------------------------
+    context "and preloading a folder" do
+      setup do
+        Impromptu.components.first.folders.first.preload!
+      end
+      
+      should "preload the folder and all files and resources associated with it" do
+        folder = Impromptu.components.first.folders.first
+        assert folder.preload?
+        
+        folder.files.each do |file|
+          assert file.preload?  
+          file.resources.each do |resource|
+            assert resource.preload?
+          end
+        end  
+      end
+      
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Will Cannings
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +11:00
+date: 2011-03-10 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency