energon 0.0.3 → 0.0.4

data/lib/energon/document.rb

@@ -21,7 +21,7 @@ module Woa; module Energon
   #   include Woa::Energon
   #   document = Document.new("@author@, @date@, @country@")
   #   document.add_values({:author => "Woa! Kft", :date => Time.now})
-  #   document.add_value(:country => "Hungary")
+  #   document.add_value(:country, "Hungary")
   #   puts document.write #"Woa! Kft, Wed Nov 29 11:31:52 CET 2006, Hungary"
   class Document
 
@@ -83,7 +83,7 @@ module Woa; module Energon
       @placeholders.each do |placeholder|
         data = Parser.merge(placeholder, @datas)
         data = data.join(@new_line) if data.is_a?(Array)
-        @template.gsub!("#{@delimiter}#{placeholder}#{@delimiter}", data)
+        @template.gsub!("#{@delimiter}#{placeholder}#{@delimiter}", data.to_s)
       end
       return(@template) if output.nil?
       output.puts @template

data/lib/energon/excel_document.rb

@@ -1,7 +1,6 @@
 require 'energon/document'
 require 'energon/open_xml_helper'
 require 'rexml/document'
-include REXML
 
 module Woa; module Energon;
   # This is a subclass of Document but it deals with Excel templates
@@ -12,7 +11,8 @@ module Woa; module Energon;
   #
   # :include: rdoc-header
   class ExcelDocument < Document
-
+    include REXML
+    
     def write()
       raise NoPlaceholderFound if @placeholders.empty?
       rows = {}
@@ -48,7 +48,7 @@ module Woa; module Energon;
               continue = false
               break 
             end
-            cell.text = add_shared_string(data.to_s)
+            write_data_to_cell data, cell
           end
           if continue
             new_row = row.deep_clone
@@ -70,7 +70,7 @@ module Woa; module Energon;
         XPath.each(root, 'row') do |element|
           next if element.parent.index(element) <= index
           value = element.attributes.get_attribute('r').value.to_i + inserted_rows
-          element.add_attribute('r', value)
+          element.add_attribute('r', value.to_s)
           XPath.each(element, 'c[@r]') do |element|
             new_value = element.attributes.get_attribute('r').value.to_s.gsub(/\d+/, value.to_s)
             element.add_attribute('r', new_value)
@@ -94,6 +94,16 @@ module Woa; module Energon;
     #############################
     private
     #############################
+    def write_data_to_cell(data, cell)
+      if data.kind_of?(Numeric)
+        cell.text = data.to_s
+        type_attribute = cell.parent.attributes.get_attribute('t')
+        type_attribute.remove if type_attribute
+      else
+        cell.text = add_shared_string(data.to_s)
+      end
+    end
+
     def extract_placeholders
       @openxml = OpenXmlHelper.new_excel(@template)
       @documents = @openxml.documents
@@ -132,7 +142,7 @@ module Woa; module Energon;
       unique_count = root.attributes.get_attribute('uniqueCount').value.to_i.next
       root.add_attribute('count', count.to_s)
       root.add_attribute('uniqueCount', unique_count.to_s)
-      count - 1
+      unique_count - 1
     end
   end
 end; end

data/lib/energon/od_document.rb

@@ -1,7 +1,6 @@
 require 'energon/document'
 require 'energon/open_document_helper'
 require 'rexml/document'
-include REXML
 
 module Woa; module Energon;
   # This is a subclass of Document but it deals with OpenDocument
@@ -13,6 +12,8 @@ module Woa; module Energon;
   #
   # :include: rdoc-header
   class OdDocument < Document
+    include REXML
+    
     def write()
       raise NoPlaceholderFound if @placeholders.empty?
       rows = {}

data/lib/energon/open_xml_helper.rb

@@ -49,7 +49,7 @@ module Woa; module Energon
 ############# tempdir ##############
       n = 0
       begin
-        @tmpdir = "tempdir.#{$$}.#{n}.dir"
+        @tmpdir = File.join(File.dirname(@template), "tempdir.#{$$}.#{n}.dir")
         n = n.next
       end while File.exist?(@tmpdir)
 

data/lib/energon/parser.rb

@@ -232,7 +232,7 @@ module Woa; module Energon
       raise NoDataFound, error unless specific_data.is_a?(Array)
       raise NoDataFound, error if specific_data.empty?
       
-      singular = Inflector::singularize(dynamic)
+      singular = ActiveSupport::Inflector::singularize(dynamic)
       singular = nil if singular == dynamic
       elements = []
       

data/lib/energon/word_document.rb

@@ -1,7 +1,6 @@
 require 'energon/document'
 require 'energon/open_xml_helper'
 require 'rexml/document'
-include REXML
 
 module Woa; module Energon;
   # This is a subclass of Document but it deals with Word templates
@@ -12,7 +11,8 @@ module Woa; module Energon;
   #
   # :include: rdoc-header
   class WordDocument < Document
-
+    include REXML
+    
     def write()
       raise NoPlaceholderFound if @placeholders.empty?
       rows = {}

data/rakefile.rb

@@ -1,57 +1,57 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-
-task :default => :test
-
-desc "Run the tests"
-Rake::TestTask::new do |t|
-    t.test_files = FileList['test/test_*.rb']
-    t.verbose = true
-end
-
-desc "Generate the documentation"
-Rake::RDocTask::new do |rdoc|
-  rdoc.rdoc_dir = 'energon-doc/'
-  rdoc.title    = "Energon Documentation"
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('MIT-LICENSE')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-spec = Gem::Specification::new do |s|
-  s.platform = Gem::Platform::RUBY
-
-  s.name = 'energon'
-  s.version = "0.0.3"
-  s.summary = "Report engine outputting Word/Excel OpenXML documents"
-  s.description = <<EOF
-  Energon is a report engine written in ruby, creating advanced and
-  reliable reports from templates. 
-EOF
-  s.author = 'Woa! Kft'
-  s.email = 'energon@woa.hu'
-  s.homepage = "http://www.woa.hu"
-  
-  s.requirements << 'rubyzip, 0.9.1 or greater'
-  s.add_dependency('rubyzip', '>= 0.9.1')
-
-  s.requirements << 'activesupport, 1.3.1 or greater'
-  s.add_dependency('activesupport', '>= 1.3.1')
-
-  s.require_path = 'lib'
-  s.files = FileList["lib/**/*.rb", "test/**/*.rb", "README","MIT-LICENSE","rakefile.rb"]
-  s.test_files = FileList['test/test*.rb']
-
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "rdoc-header"]
-  s.rdoc_options.concat ['--main',  'README']
-end
-
-desc "Package the library as a gem"
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rake/gempackagetask'
+
+task :default => :test
+
+desc "Run the tests"
+Rake::TestTask::new do |t|
+    t.test_files = FileList['test/test_*.rb']
+    t.verbose = true
+end
+
+desc "Generate the documentation"
+Rake::RDocTask::new do |rdoc|
+  rdoc.rdoc_dir = 'energon-doc/'
+  rdoc.title    = "Energon Documentation"
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('MIT-LICENSE')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+spec = Gem::Specification::new do |s|
+  s.platform = Gem::Platform::RUBY
+
+  s.name = 'energon'
+  s.version = "0.0.4"
+  s.summary = "Report engine outputting Word/Excel OpenXML documents"
+  s.description = <<EOF
+  Energon is a report engine written in ruby, creating advanced and
+  reliable reports from templates. 
+EOF
+  s.author = 'Wopata'
+  s.email = 'energon@wopata.com'
+  s.homepage = "http://www.wopata.com"
+  
+  s.requirements << 'rubyzip, 0.9.1 or greater'
+  s.add_dependency('rubyzip', '>= 0.9.1')
+
+  s.requirements << 'activesupport, 1.3.1 or greater'
+  s.add_dependency('activesupport', '>= 1.3.1')
+
+  s.require_path = 'lib'
+  s.files = FileList["lib/**/*.rb", "test/**/*.rb", "README","MIT-LICENSE","rakefile.rb"]
+  s.test_files = FileList['test/test*.rb']
+
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README", "rdoc-header"]
+  s.rdoc_options.concat ['--main',  'README']
+end
+
+desc "Package the library as a gem"
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end

data/test/test_oo_document.rb

@@ -41,7 +41,8 @@ class TestOdDocument < Test::Unit::TestCase
       ZipFile.open("test/opendocument/template_test.#{hash[:ext]}") {|zipfile| content_orig = zipfile.file.read("content.xml")}
       ZipFile.open(file) {|zipfile| content_new = zipfile.file.read("content.xml")}
 
-      assert_equal(content_orig, content_new)
+      # compare hash equivalents so as to ignore insignificant differences in formatting or attribute ordering
+      assert_equal Hash.from_xml(content_orig), Hash.from_xml(content_new)
       
       FileUtils.rm(file)
     end

metadata

@@ -1,35 +1,47 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: energon
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-03-23 00:00:00 +01:00
-summary: Report engine outputting Word/Excel OpenXML documents
-require_paths: 
-- lib
-email: energon@woa.hu
-homepage: http://www.woa.hu
-rubyforge_project: 
-description: Energon is a report engine written in ruby, creating advanced and reliable reports from templates.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- Woa! Kft
+- Wopata
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-11-22 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+    version: 
+description: "  Energon is a report engine written in ruby, creating advanced and\n  reliable reports from templates. \n"
+email: energon@wopata.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- rdoc-header
 files: 
-- lib/energon.rb
 - lib/energon/document.rb
 - lib/energon/excel_document.rb
 - lib/energon/od_document.rb
@@ -37,6 +49,7 @@ files:
 - lib/energon/open_xml_helper.rb
 - lib/energon/parser.rb
 - lib/energon/word_document.rb
+- lib/energon.rb
 - test/test_document.rb
 - test/test_excel_document.rb
 - test/test_oo_document.rb
@@ -47,6 +60,36 @@ files:
 - MIT-LICENSE
 - rakefile.rb
 - rdoc-header
+has_rdoc: true
+homepage: http://www.wopata.com
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --main
+- README
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: 
+- rubyzip, 0.9.1 or greater
+- activesupport, 1.3.1 or greater
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: Report engine outputting Word/Excel OpenXML documents
 test_files: 
 - test/test_document.rb
 - test/test_excel_document.rb
@@ -54,35 +97,3 @@ test_files:
 - test/test_open_document_helper.rb
 - test/test_open_xml_helper.rb
 - test/test_word_document.rb
-rdoc_options: 
-- --main
-- README
-extra_rdoc_files: 
-- README
-- rdoc-header
-executables: []
-
-extensions: []
-
-requirements: 
-- rubyzip, 0.9.1 or greater
-- activesupport, 1.3.1 or greater
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.1
-    version: