odf-report 0.3.0 → 0.3.1

data/lib/odf-report/hash_gsub.rb

@@ -4,7 +4,9 @@ module ODFReport
 
     def hash_gsub!(_text, hash_of_values)
       hash_of_values.each do |key, val|
-        _text.gsub!("[#{key.to_s.upcase}]", html_escape(val))
+        txt = html_escape(val)
+        txt = odf_linebreak(txt)
+        _text.gsub!("[#{key.to_s.upcase}]", txt)
       end
     end
 
@@ -15,6 +17,11 @@ module ODFReport
       s.to_s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }
     end
 
+    def odf_linebreak(s)
+      return "" unless s
+      s.to_s.gsub("\n", "<text:line-break/>")
+    end
+
   end
 
 end

data/lib/odf-report/section.rb

@@ -108,19 +108,6 @@ private
     return collection
   end
 
-  def hash_gsub!(_text, hash_of_values)
-    hash_of_values.each do |key, val|
-      _text.gsub!("[#{key.to_s.upcase}]", html_escape(val))
-    end
-  end
-
-  HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
-
-  def html_escape(s)
-    return "" unless s
-    s.to_s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }
-  end
-
 end
 
 end

data/lib/odf-report/table.rb

@@ -126,19 +126,6 @@ private
     return ret[0]
   end
 
-  def hash_gsub!(_text, hash_of_values)
-    hash_of_values.each do |key, val|
-      _text.gsub!("[#{key.to_s.upcase}]", html_escape(val))
-    end
-  end
-
-  HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
-
-  def html_escape(s)
-    return "" unless s
-    s.to_s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }
-  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.0"
+  s.version = "0.3.1"
 
   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-18}
+  s.date = %q{2010-05-31}
   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"]

data/test/test.rb

@@ -11,6 +11,7 @@ col2 = []
 col2 << OpenStruct.new({:name=>"josh harnet",   :id=>"02", :address=>"testing <&> ",                 :phone=>99025668, :zip=>"90420-002"})
 col2 << OpenStruct.new({:name=>"sandro duarte", :id=>"45", :address=>"address with &",               :phone=>88774451, :zip=>"90490-002"})
 col2 << OpenStruct.new({:name=>"ellen bicca",   :id=>"77", :address=>"<address with escaped html>",  :phone=>77025668, :zip=>"94420-002"})
+col2 << OpenStruct.new({:name=>"luiz garcia",   :id=>"88", :address=>"address with\nlinebreak",      :phone=>27025668, :zip=>"94520-025"})
 
 report = ODFReport::Report.new("test.odt") do |r|
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sandro Duarte
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -03:00
+date: 2010-05-31 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency