odf-report 0.4.0 → 0.4.1

data/lib/odf-report/images.rb

@@ -5,12 +5,8 @@ module ODFReport
     def find_image_name_matches(content)
 
       @images.each_pair do |image_name, path|
-        #Search for the image placeholder path
-        image_rgx = Regexp.new("draw:name=\"#{image_name}\".*?>.*<draw:image.*?xlink:href=\"([^\s]*)\" .*?\/>.*</draw:frame>", Regexp::MULTILINE)
-        content_match = content.match(image_rgx)
-
-        if content_match
-          placeholder_path = content_match[1]
+        if node = content.xpath("//draw:frame[@draw:name='#{image_name}']/draw:image").first
+          placeholder_path = node.attribute('href').value
           @image_names_replacements[path] = File.basename(placeholder_path)
         end
       end
@@ -34,4 +30,4 @@ module ODFReport
 
   end
 
-end
+end

data/lib/odf-report/report.rb

@@ -59,10 +59,10 @@ class Report
           replace_sections!(doc)
           replace_tables!(doc)
 
+          find_image_name_matches(doc)
+
         end
 
-        #TO_DO: make image use Nokogiri
-        find_image_name_matches(txt)
       end
 
     end

data/lib/odf-report/table.rb

@@ -50,7 +50,7 @@ class Table
     end
 
     @template_rows.each_with_index do |r, i|
-      r.remove if (get_start_node..template_lenght) === i
+      r.remove if (get_start_node..template_length) === i
     end
 
   end # replace
@@ -77,7 +77,7 @@ private
     @row_cursor = get_start_node
   end
 
-  def template_lenght
+  def template_length
     @tl ||= @template_rows.size
   end
 
@@ -93,4 +93,4 @@ private
 
 end
 
-end
+end

data/odf-report.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{odf-report}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Duarte"]
-  s.date = %q{2011-09-23}
+  s.date = %q{2011-10-03}
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odf-report
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+date: 2011-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2152736240 !ruby/object:Gem::Requirement
+  requirement: &2152768780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152736240
+  version_requirements: *2152768780
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152735160 !ruby/object:Gem::Requirement
+  requirement: &2152767820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,7 +38,7 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152735160
+  version_requirements: *2152767820
 description: Generates ODF files, given a template (.odt) and data, replacing tags
 email: sandrods@gmail.com
 executables: []