impromptu 1.3.0 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/impromptu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{impromptu}
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Will Cannings"]

data/lib/impromptu/file.rb

@@ -1,9 +1,9 @@
 module Impromptu
   class File
-    attr_reader :path, :folder, :resources, :related_resources, :related_files, :modified_time
+    attr_reader :path, :folder, :resources, :related_resources, :related_files, :modified_time, :preload
     RELOADABLE_EXTENSIONS = %w{rb}
     
-    def initialize(path, folder, provides=[])
+    def initialize(path, folder, preload=false, provides=[])
       @path               = path
       @folder             = folder
       @resources          = OrderedSet.new
@@ -12,6 +12,7 @@ module Impromptu
       @frozen             = false
       @modified_time      = nil
       @dirty              = true
+      @preload            = preload
       @provides           = [provides].compact.flatten
     end
     
@@ -27,6 +28,17 @@ module Impromptu
       @path.hash
     end
     
+    # Indicate whether this file needs to be preloaded
+    def preload=(preload)
+      @preload = preload
+    end
+    
+    # True if this file needs to be preloaded before other files
+    # are automatically loaded on demand
+    def preload?
+      @preload
+    end
+    
     # Traverse the file/resource graph to determine which total
     # set of files and resources are related to this file. For
     # instance, if a resource provided by this file is also
@@ -181,6 +193,7 @@ module Impromptu
       @provides.each do |resource_name|
         resource = Impromptu.root_resource.get_or_create_child(combine_symbol_with_namespace(resource_name))
         resource.add_file(self)
+        resource.preload = preload?
         @resources << resource
       end
     end

data/lib/impromptu/folder.rb

@@ -129,7 +129,8 @@ module Impromptu
     # * provides (required): an array of symbols, or a symbol
     #   indicating the name of the resource(s) provided by the file
     def file(name, options={})
-      file = Impromptu::File.new(@folder.join(*name).realpath, self, options[:provides])
+      file_preload = options[:preload] || preload?
+      file = Impromptu::File.new(@folder.join(*name).realpath, self, file_preload, options[:provides])
       @files.push(file).add_resource_definition
     end
     
@@ -158,7 +159,7 @@ module Impromptu
       # find all source files and add unseen files to the files list
       @folder.find do |path|
         next unless source_file?(path)
-        file = Impromptu::File.new(path.realpath, self)
+        file = Impromptu::File.new(path.realpath, self, preload?)
         new_file_set << file
         unless @files.include?(file)
           changes = true
@@ -178,16 +179,6 @@ module Impromptu
           file.refreeze
         end
       end
-      
-      # ensure all resources defined by this folder
-      # are marked to be preloaded if required
-      if preload?
-        @files.each do |file|
-          file.resources.each do |resource|
-            resource.preload = true
-          end
-        end
-      end
     end
     
     

data/lib/impromptu/resource.rb

@@ -33,12 +33,13 @@ module Impromptu
       @name.hash
     end
     
-    # Define this resource as preloaded
+    # Indicate whether this resource needs to be preloaded
     def preload=(preload)
       @preload = preload
     end
     
-    # True if this resource is defined as preloaded
+    # True if this resource needs to be preloaded before other files
+    # are automatically loaded on demand
     def preload?
       @preload
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Will Cannings