odf-report 0.3.2 → 0.3.3

data/lib/odf-report.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'zip/zipfilesystem'
 require 'fileutils'
-require 'odf-report/file_ops'
-require 'odf-report/hash_gsub'
-require 'odf-report/section'
-require 'odf-report/table'
-require 'odf-report/report'
+require File.expand_path('../odf-report/file_ops',__FILE__)
+require File.expand_path('../odf-report/hash_gsub',__FILE__)
+require File.expand_path('../odf-report/section',__FILE__)
+require File.expand_path('../odf-report/table',__FILE__)
+require File.expand_path('../odf-report/report',__FILE__)

data/lib/odf-report/report.rb

@@ -11,6 +11,7 @@ class Report
     @values = {}
     @tables = []
     @images = {}
+    @image_names_replacements = {}
     @sections = []
 
     @tmp_dir = Dir.tmpdir + "/" + random_filename(:prefix=>'odt_')
@@ -68,7 +69,7 @@ class Report
 
         replace_fields!(txt)
         replace_tables!(txt)
-        replace_image_refs!(txt)
+        find_image_name_matches(txt)
         replace_sections!(txt)
 
       end
@@ -77,9 +78,13 @@ class Report
 
     unless @images.empty?
       image_dir_name = "Pictures"
-      dir = File.join("#{@tmp_dir}", image_dir_name)
-      add_files_to_dir(@images.values, dir)
-      add_dir_to_zip(new_file, dir, image_dir_name)
+      FileUtils.mkdir(File.join("#{@tmp_dir}", image_dir_name))
+      @image_names_replacements.each_pair do |path, template_image|
+        template_image_path = File.join(image_dir_name, template_image)
+        update_file_from_zip(new_file, template_image_path) do |content|
+          content.replace File.read(path)
+        end
+      end
     end
 
     new_file
@@ -108,20 +113,17 @@ private
 
   end
 
-  def replace_image_refs!(content)
+  def find_image_name_matches(content)
     @images.each_pair do |image_name, path|
-      #Set the new image path
-      new_path = File.join("Pictures", File.basename(path))
-      #Search for the image
+      #Search for the image placeholder path
       image_rgx = Regexp.new("draw:name=\"#{image_name}\".*?><draw:image.*?xlink:href=\"([^\s]*)\" .*?/></draw:frame>")
       content_match = content.match(image_rgx)
       if content_match
-        replace_path = content_match[1]
-        content.gsub!(content_match[0], content_match[0].gsub(replace_path, new_path))
+        placeholder_path = content_match[1]
+        @image_names_replacements[path] = File.basename(placeholder_path)
       end
     end
   end
-
 end
 
-end
+end

data/odf-report.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{odf-report}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Duarte"]
-  s.date = %q{2010-05-31}
+  s.date = %q{2011-01-24}
   s.description = %q{Generates ODF files, given a template (.odt) and data, replacing tags}
   s.email = %q{sandrods@gmail.com}
   s.extra_rdoc_files = ["lib/odf-report.rb", "README.textile"]

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: odf-report
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Sandro Duarte
@@ -15,24 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 -03:00
+date: 2011-01-24 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 9
@@ -76,20 +72,16 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
       segments: 
       - 1
       - 2
@@ -97,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Generates ODF files, given a template (.odt) and data, replacing tags