Lazy load image content

lib/sablon/content.rb

@@ -184,15 +184,23 @@ def inspect
         "#<Image #{name}:#{@rid_by_file}>"
       end
 
+      # image data being lazily loaded by procs, we need to actually execute
+      # the procs to test that the generated images are the same
+      def ==(other)
+        self.class == other.class &&
+          name == other.name && properties == other.properties &&
+            data.call == other.data.call
+      end
+
       def initialize(source, attributes = {})
         attributes = Hash[attributes.map { |k, v| [k.to_s, v] }]
         # If the source object is readable, use it as such otherwise open
-        # and read the content
+        # and lazily read the content
         if source.respond_to?(:read)
           name, img_data = process_readable(source, attributes)
         else
           name = File.basename(source)
-          img_data = IO.binread(source)
+          img_data = -> { IO.binread(source) }
         end
         #
         super name, img_data
@@ -233,8 +241,8 @@ def process_readable(source, attributes)
             raise ArgumentError, "Error: Could not determine filename from source, try: `Sablon.content(readable_obj, filename: '...')`"
           end
         end
-        #
-        [File.basename(name), source.read]
+        # delay loading the image with a lambda
+        [File.basename(name), -> { source.read } ]
       end
 
       # Convert centimeters or inches to Word specific emu format

lib/sablon/operations.rb

@@ -136,7 +136,7 @@ def set_local_rid(env, image)
           rel_attr = {
             Type: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image'
           }
-          rid = env.document.add_media(image.name, image.data, rel_attr)
+          rid = env.document.add_media(image.name, image.data.call, rel_attr)
           image.rid_by_file[env.document.current_entry] = rid
         elsif image.rid_by_file[env.document.current_entry].nil?
           # locate an existing relationship and duplicate it