xlsx_writer 0.1.2 → 0.2.0

data/.gitignore

@@ -10,4 +10,6 @@ tmp
 notes.txt
 *.\#*
 *.rbc
-pkg
+pkg
+.DS_Store
+Gemfile.lock

data/CHANGELOG

@@ -0,0 +1,13 @@
+0.2.0 / 2012-04-23
+
+* Enhancements
+
+  * Add tests
+  * Test on MRI 1.8, MRI 1.9, and JRuby 1.6.7+
+  * Simply, DRY, and make thread-safe
+  * Use unix_utils instead of our own spawning code
+  * Stop using autoload
+
+* Bug fixes
+
+  * Wrap croptop and cropleft in quotes

data/Gemfile

@@ -1,3 +1,9 @@
 source :rubygems
 
-gemspec :path => '.'
+gemspec
+
+# development dependencies
+gem 'minitest'
+gem 'minitest-reporters'
+gem 'yard'
+gem 'remote_table'

data/Rakefile

@@ -1,13 +1,15 @@
-require 'rubygems'
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+
 require 'rake'
 require 'rake/testtask'
-
-task :default => [:test]
-
-Rake::TestTask.new do |test|
-  test.libs       << "test"
-  test.test_files =  Dir['test/**/*_test.rb'].sort
-  test.verbose    =  true
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
+task :default => :test
 
+require 'yard'
+YARD::Rake::YardocTask.new

data/lib/xlsx_writer/cell.rb

@@ -64,7 +64,6 @@ module XlsxWriter
       alias :excel_decimal :excel_number
       
       # doesn't necessarily work for times yet
-      JAN_1_1900 = ::Time.parse('1900-01-01')
       def excel_date(value)
         if value.is_a?(::String)
           ((::Time.parse(str) - JAN_1_1900) / 86_400).round
@@ -76,61 +75,102 @@ module XlsxWriter
       def excel_boolean(value)
         value ? 1 : 0
       end
+
+      # width = Truncate([{Number of Characters} * {Maximum Digit Width} + {5 pixel padding}]/{Maximum Digit Width}*256)/256
+      # Using the Calibri font as an example, the maximum digit width of 11 point font size is 7 pixels (at 96 dpi). In fact, each digit is the same width for this font. Therefore if the cell width is 8 characters wide, the value of this attribute shall be Truncate([8*7+5]/7*256)/256 = 8.7109375.
+      def pixel_width(character_width)
+        [
+          ((character_width.to_f*MAX_DIGIT_WIDTH+5)/MAX_DIGIT_WIDTH*256)/256,
+          MAX_REASONABLE_WIDTH
+        ].min
+      end
+
+      def calculate_type(value)
+        if value.is_a?(::Date)
+          :Date
+        elsif value.is_a?(::Integer)
+          :Integer
+        elsif value.is_a?(::Float) or (defined?(::BigDecimal) and value.is_a?(::BigDecimal)) or (defined?(::Decimal) and value.is_a?(::Decimal))
+          :Decimal
+        elsif value.is_a?(::Numeric)
+          :Number
+        else
+          :String
+        end
+      end
+
+      def character_width(value, calculated_type = nil)
+        calculated_type ||= calculate_type(value)
+        case calculated_type
+        when :String
+          value.to_s.length
+        when :Number, :Integer, :Decimal
+          # -1000000.5
+          len = round(value, 2).to_s.length
+          len += 2 if calculated_type == :Decimal
+          len += 1 if value < 0
+          len
+        when :Currency
+          # (1,000,000.50)
+          len = round(value, 2).to_s.length + log_base(value.abs, 1e3).floor
+          len += 2 if value < 0
+          len
+        when :Date
+          DATE_LENGTH
+        when :Boolean
+          BOOLEAN_LENGTH
+        end
+      end
+
+      if ::RUBY_VERSION >= '1.9'
+        def round(number, precision)
+          number.round precision
+        end
+        def log_base(number, base)
+          ::Math.log number, base
+        end
+      else
+        def round(number, precision)
+          (number * (10 ** precision).to_i).round / (10 ** precision).to_f
+        end
+        # http://blog.vagmim.com/2010/01/logarithm-to-any-base-in-ruby.html
+        def log_base(number, base)
+          ::Math.log(number) / ::Math.log(base)
+        end
+      end
     end
     
     ABC = ('A'..'Z').to_a
-    
-    attr_reader :row
-    attr_reader :data
-    
-    def initialize(row, data)
-      @row = row
-      @data = data.is_a?(::Hash) ? data.symbolize_keys : data
-    end
-    
-    # width = Truncate([{Number of Characters} * {Maximum Digit Width} + {5 pixel padding}]/{Maximum Digit Width}*256)/256
-    # Using the Calibri font as an example, the maximum digit width of 11 point font size is 7 pixels (at 96 dpi). In fact, each digit is the same width for this font. Therefore if the cell width is 8 characters wide, the value of this attribute shall be Truncate([8*7+5]/7*256)/256 = 8.7109375.
     MAX_DIGIT_WIDTH = 5
     MAX_REASONABLE_WIDTH = 75
-    def pixel_width
-      @pixel_width ||= [
-        ((character_width.to_f*MAX_DIGIT_WIDTH+5)/MAX_DIGIT_WIDTH*256)/256,
-        MAX_REASONABLE_WIDTH
-      ].min
-    end
-    
     DATE_LENGTH = 'YYYY-MM-DD'.length
     BOOLEAN_LENGTH = 'FALSE'.length
-    def character_width
-      @character_width ||= case calculated_type
-      when :String
-        value.to_s.length
-      when :Number, :Integer, :Decimal
-        # -1000000.5
-        len = value.round(2).to_s.length
-        len += 2 if calculated_type == :Decimal
-        len += 1 if value < 0
-        len
-      when :Currency
-        # (1,000,000.50)
-        len = value.round(2).to_s.length + ::Math.log(value.abs, 1_000).floor
-        len += 2 if value < 0
-        len
-      when :Date
-        DATE_LENGTH
-      when :Boolean
-        BOOLEAN_LENGTH
-      end
-    end
-    
-    def unstyled?
-      !styled?
-    end
+    JAN_1_1900 = ::Time.parse '1900-01-01'
     
-    def styled?
-      data.is_a?(::Hash)
+    attr_reader :row
+    attr_reader :value
+    attr_reader :pixel_width
+    attr_reader :excel_type
+    attr_reader :excel_style_number
+    attr_reader :excel_value
+
+    def initialize(row, data)
+      @row = row
+      if data.is_a?(::Hash)
+        data = data.symbolize_keys
+        calculated_type = data[:type]
+        @value = data[:value]
+      else
+        @value = data
+        calculated_type = Cell.calculate_type @value
+      end
+      character_width = Cell.character_width @value, calculated_type
+      @pixel_width = Cell.pixel_width character_width
+      @excel_type = Cell.excel_type calculated_type
+      @excel_style_number = Cell.excel_style_number calculated_type
+      @excel_value = Cell.send "excel_#{calculated_type.to_s.underscore}", @value
     end
-    
+
     def to_xml
       if value.blank?
         %{<c r="#{excel_column_letter}#{row.ndx}" s="0" t="inlineStr" />}
@@ -145,38 +185,5 @@ module XlsxWriter
     def excel_column_letter
       Cell.excel_column_letter row.cells.index(self)
     end
-    
-    # detect dates here, even if we're not styled
-    def excel_type
-      Cell.excel_type calculated_type
-    end
-    
-    def excel_style_number
-      Cell.excel_style_number calculated_type
-    end
-
-    def calculated_type
-      @calculated_type ||= if styled?
-        data[:type]
-      elsif value.is_a?(::Date)
-        :Date
-      elsif value.is_a?(::Integer)
-        :Integer
-      elsif value.is_a?(::Float) or (defined?(::BigDecimal) and value.is_a?(::BigDecimal)) or (defined?(::Decimal) and value.is_a?(::Decimal))
-        :Decimal
-      elsif value.is_a?(::Numeric)
-        :Number
-      else
-        :String
-      end
-    end
-    
-    def value
-      styled? ? data[:value] : data
-    end
-    
-    def excel_value
-      Cell.send "excel_#{calculated_type.to_s.underscore}", value
-    end
   end
 end

data/lib/xlsx_writer/document.rb

@@ -11,6 +11,23 @@ module XlsxWriter
         end
       end
     end
+
+    attr_reader :staging_dir
+    attr_reader :sheets
+    attr_reader :images
+    attr_reader :page_setup
+    attr_reader :header_footer
+
+    def initialize
+      staging_dir = ::UnixUtils.tmp_path 'xlsx_writer'
+      ::FileUtils.mkdir_p staging_dir
+      @staging_dir = staging_dir
+      @sheets = []
+      @images = []
+      @page_setup = PageSetup.new
+      @header_footer = HeaderFooter.new
+      @mutex = ::Mutex.new
+    end
     
     def add_sheet(name)
       raise ::RuntimeError, "Can't add sheet, already generated!" if generated?
@@ -19,14 +36,6 @@ module XlsxWriter
       sheet
     end
     
-    def page_setup
-      @page_setup ||= PageSetup.new
-    end
-    
-    def header_footer
-      @header_footer ||= HeaderFooter.new self
-    end
-    
     delegate :header, :footer, :to => :header_footer
     
     def add_image(path, width, height)
@@ -37,44 +46,34 @@ module XlsxWriter
     end
 
     def path
-      generate unless generated?
-      @path
+      @path || @mutex.synchronize do
+        @path ||= begin 
+          sheets.each(&:generate)
+          images.each(&:generate)
+          Document.auto.each do |part|
+            part.new(self).generate
+          end
+          with_zip_extname = ::UnixUtils.zip staging_dir
+          with_xlsx_extname = with_zip_extname.sub(/.zip$/, '.xlsx')
+          ::FileUtils.mv with_zip_extname, with_xlsx_extname
+          @generated = true
+          with_xlsx_extname
+        end
+      end
     end
 
     def cleanup
-      ::File.unlink(@path) if ::File.exist?(@path)
-      ::FileUtils.rm_rf(@staging_dir) if ::File.exist?(@staging_dir)
-      @path = nil
-      @staging_dir = nil
-      @generated = false
-    end
-
-    def sheets #:nodoc:
-      @sheets ||= []
-    end
-    
-    def images
-      @images ||= []
-    end
-    
-    def staging_dir
-      @staging_dir ||= Utils.tmp_path
-      ::FileUtils.mkdir_p @staging_dir
-      @staging_dir
+      ::FileUtils.rm_rf(@staging_dir) if ::File.exist?(@staging_dir.to_s)
+      if generated?
+        ::File.unlink(@path) if ::File.exist?(@path.to_s)
+      end
     end
-
-    private
     
     def generate
-      sheets.each(&:generate)
-      images.each(&:generate)
-      Document.auto.each do |part|
-        part.new(self).generate
-      end
-      @path = Utils.zip staging_dir
-      @generated = true
+      path
+      true
     end
-
+    
     def generated?
       @generated == true
     end

data/lib/xlsx_writer/generators/image.rb

@@ -1,24 +1,44 @@
 require 'fileutils'
+
 module XlsxWriter
-  class Image < ::Struct.new(:document, :original_path, :width, :height, :lcr, :croptop, :cropleft)
-    
+  class Image
+    DEFAULT = {
+      :croptop => 0,
+      :cropleft => 0
+    }
     AUTO = false
-    
+
+    attr_reader :document
+    attr_reader :original_path
+    attr_reader :width
+    attr_reader :height
+    attr_accessor :lcr
+    attr_writer :croptop
+    attr_writer :cropleft
+
+    def initialize(document, original_path, width, height)
+      @document = document
+      @original_path = original_path
+      @width = width
+      @height = height
+      @mutex = ::Mutex.new
+    end
+
     def to_xml
       <<-EOS
 <v:shape id="#{id}" o:spid="#{o_spid}" type="#_x0000_t75" style="position:absolute;margin-left:0;margin-top:0;width:#{width}pt;height:#{height}pt;z-index:1">
-  <v:imagedata o:relid="#{rid}" o:title="#{o_title}" croptop=#{croptop} cropleft=#{cropleft}/>
+  <v:imagedata o:relid="#{rid}" o:title="#{o_title}" croptop="#{croptop}" cropleft="#{cropleft}"/>
   <o:lock v:ext="edit" rotation="t"/>
 </v:shape>
 EOS
     end
     
     def croptop
-      self[:croptop] || 0
+      @croptop || DEFAULT[:croptop]
     end
     
     def cropleft
-      self[:cropleft] || 0
+      @cropleft || DEFAULT[:cropleft]
     end
     
     def id
@@ -28,9 +48,26 @@ EOS
         o_spid #?
       end
     end
-    
+
     def generate
-      ::FileUtils.cp original_path, staging_path
+      path
+      true
+    end
+
+    def generated?
+      @generated == true
+    end
+
+    def path
+      @path || @mutex.synchronize do
+        @path ||= begin
+          memo = ::File.join document.staging_dir, relative_path
+          ::FileUtils.mkdir_p ::File.dirname(memo)
+          ::FileUtils.cp original_path, memo
+          @generated = true
+          memo
+        end
+      end
     end
     
     def ndx
@@ -53,16 +90,8 @@ EOS
       "/#{relative_path}"
     end
 
-    private
-
     def relative_path
       "xl/media/image#{ndx}.emf"
     end
-    
-    def staging_path
-      p = ::File.join document.staging_dir, relative_path
-      ::FileUtils.mkdir_p ::File.dirname(p)
-      p
-    end
   end
 end

data/lib/xlsx_writer/generators/sheet.rb

@@ -15,10 +15,14 @@ module XlsxWriter
     AUTO = false
     
     attr_reader :name
+    attr_reader :rows
+    attr_reader :autofilters
 
     def initialize(document, name)
-      @document = document
       @name = Sheet.excel_name name
+      @rows = []
+      @autofilters = []
+      super document
     end
     
     def ndx
@@ -38,20 +42,12 @@ module XlsxWriter
       "/#{relative_path}"
     end
 
-    def autofilters
-      @autofilters ||= []
-    end
-
     # specify range like "A1:C1"
     def add_autofilter(range)
       raise ::RuntimeError, "Can't add autofilter, already generated!" if generated?
       autofilters << Autofilter.new(range)
     end
         
-    def rows
-      @rows ||= []
-    end
-    
     def add_row(data)
       raise ::RuntimeError, "Can't add row, already generated!" if generated?
       row = Row.new self, data
@@ -60,18 +56,23 @@ module XlsxWriter
     end
         
     # override Xml method to save memory
-    def generate
-      @path = staging_path
-      ::File.open(@path, 'wb') do |out|
-        to_file out
+    def path
+      @path || @mutex.synchronize do
+        @path ||= begin
+          memo = ::File.join document.staging_dir, relative_path
+          ::FileUtils.mkdir_p ::File.dirname(memo)
+          ::File.open(memo, 'wb') do |f|
+            to_file f
+          end
+          converted = UnixUtils.unix2dos memo
+          ::FileUtils.mv converted, memo
+          SheetRels.new(document, self).path
+          @generated = true
+          memo
+        end
       end
-      Utils.unix2dos @path
-      SheetRels.new(document, self).generate
-      @generated = true
     end
-    
-    delegate :header_footer, :page_setup, :to => :document
-    
+
     private
     
     # not using ERB to save memory
@@ -89,17 +90,25 @@ EOS
       rows.each { |row| f.puts row.to_xml }
       f.puts %{</sheetData>}
       autofilters.each { |autofilter| f.puts autofilter.to_xml }
-      f.puts page_setup.to_xml
-      f.puts header_footer.to_xml
+      f.puts document.page_setup.to_xml
+      f.puts document.header_footer.to_xml
       f.puts %{</worksheet>}
     end
     
     def max_length
-      rows.max_by { |row| row.length }.length
+      if max = rows.max_by { |row| row.length }
+        max.length
+      else
+        1
+      end
     end
     
     def max_cell_width(x)
-      rows.max_by { |row| row.cell_width(x) }.cell_width(x)
+      if max = rows.max_by { |row| row.cell_width(x) }
+        max.cell_width x
+      else
+        Cell.pixel_width 5
+      end
     end
   end
 end

data/lib/xlsx_writer/generators/sheet_rels.rb

@@ -6,8 +6,8 @@ module XlsxWriter
     attr_reader :sheet
 
     def initialize(document, sheet)
-      @document = document
       @sheet = sheet
+      super document
     end
     
     def relative_path

data/lib/xlsx_writer/header_footer.rb

@@ -1,13 +1,13 @@
 module XlsxWriter
-  class HeaderFooter < ::Struct.new(:document, :header, :footer)
-    def header
-      self[:header] ||= H.new self
-    end
-    
-    def footer
-      self[:footer] ||= F.new self
+  class HeaderFooter
+    attr_reader :header
+    attr_reader :footer
+
+    def initialize
+      @header = HF.new 'H', 'oddHeader'
+      @footer = HF.new 'F', 'oddFooter'
     end
-    
+
     def to_xml
       lines = []
       lines << %{<headerFooter>}
@@ -20,25 +20,23 @@ module XlsxWriter
       lines.join("\n")
     end
     
-    class HF < ::Struct.new(:header_footer, :left, :center, :right)
-      def left
-        self[:left] ||= L.new self
-      end
+    class HF
+      attr_reader :id
+      attr_reader :tag
+      attr_reader :left
+      attr_reader :center
+      attr_reader :right
       
-      def center
-        self[:center] ||= C.new self
-      end
-      
-      def right
-        self[:right] ||= R.new self
-      end
-      
-      def hf
-        self.class.name.demodulize
+      def initialize(id, tag)
+        @id = id
+        @tag = tag
+        @left = LCR.new self, 'L'
+        @center = LCR.new self, 'C'
+        @right = LCR.new self, 'R'
       end
       
       def to_xml
-        %{<#{tag}>#{parts.map(&:to_s).join}</#{tag}>}
+        %{<#{tag}>#{parts.map(&:code).join}</#{tag}>}
       end
       
       def parts
@@ -49,10 +47,19 @@ module XlsxWriter
         parts.any?(&:has_image?)
       end
       
-      class LCR < ::Struct.new(:hf, :contents)
+      class LCR
         FONT = %{"Arial,Regular"}
         SIZE = 10
 
+        attr_accessor :contents
+        attr_reader :hf
+        attr_reader :id
+
+        def initialize(hf, id)
+          @hf = hf
+          @id = id
+        end
+
         def present?
           contents.present?
         end
@@ -61,12 +68,8 @@ module XlsxWriter
           ::Array.wrap(contents).any? { |v| v.is_a?(XlsxWriter::Image) }
         end
         
-        def lcr
-          self.class.name.demodulize
-        end
-        
         def image_id
-          [ lcr, hf.hf ].join
+          [ id, hf.id ].join
         end
         
         def render
@@ -92,25 +95,10 @@ module XlsxWriter
           "K000000#{out}"
         end
         
-        def to_s
-          [ '', lcr, FONT, SIZE, render ].join('&amp;')
+        def code
+          [ '', id, FONT, SIZE, render ].join('&amp;')
         end
       end
-      
-      class L < LCR; end
-      class C < LCR; end
-      class R < LCR; end
-    end
-
-    class H < HF
-      def tag
-        'oddHeader'
-      end
-    end
-    class F < HF
-      def tag
-        'oddFooter'
-      end
     end
   end
 end

data/lib/xlsx_writer/page_setup.rb

@@ -1,39 +1,22 @@
 module XlsxWriter
-  class PageSetup < ::Struct.new(:top, :right, :bottom, :left, :header, :footer, :orientation, :vertical_dpi, :horizontal_dpi)
-    def top
-      self[:top] || 1.0
-    end
-    
-    def right
-      self[:right] || 0.75
-    end
-    
-    def bottom
-      self[:bottom] || 1.0
-    end
-    
-    def left
-      self[:left] || 0.75
-    end
-    
-    def header
-      self[:header] || 0.5
-    end
-    
-    def footer
-      self[:footer] || 0.5
-    end
-    
-    def orientation
-      self[:orientation] || 'landscape'
-    end
-    
-    def vertical_dpi
-      self[:vertical_dpi] || 4294967292
-    end
-    
-    def horizontal_dpi
-      self[:horizontal_dpi] || 4294967292
+  class PageSetup
+    DEFAULT = {
+      :top            => 1.0,
+      :right          => 0.75,
+      :bottom         => 1.0,
+      :left           => 0.75,
+      :header         => 0.5,
+      :footer         => 0.5,
+      :orientation    => 'landscape',
+      :vertical_dpi   => 4294967292,
+      :horizontal_dpi => 4294967292
+    }
+
+    DEFAULT.keys.each do |attr|
+      attr_writer attr
+      define_method attr do
+        instance_variable_get(:"@#{attr}") || DEFAULT[attr]
+      end
     end
     
     def to_xml

data/lib/xlsx_writer/row.rb

@@ -2,8 +2,10 @@ module XlsxWriter
   class Row
     attr_reader :sheet
     attr_reader :cells
+    attr_reader :width
     
     def initialize(sheet, columns)
+      @width = {}
       @sheet = sheet
       @cells = columns.map do |column|
         Cell.new self, column
@@ -19,7 +21,7 @@ module XlsxWriter
     end
     
     def cell_width(x)
-      if cell = cells[x]
+      @width[x] ||= if (cell = cells[x])
         cell.pixel_width
       else
         0
@@ -35,8 +37,5 @@ module XlsxWriter
       ary << %{</row>}
       ary.join
     end
-    
-    extend ::ActiveSupport::Memoizable
-    memoize :cell_width
   end
 end

data/lib/xlsx_writer/version.rb

@@ -1,3 +1,3 @@
 module XlsxWriter
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/xlsx_writer/xml.rb

@@ -4,26 +4,37 @@ require 'fileutils'
 module XlsxWriter
   class Xml
     attr_reader :document
-    
+
     def initialize(document)
       @document = document
+      @mutex = ::Mutex.new
     end
-    
-    def path
-      generate unless generated?
-      @path
+
+    def generate
+      path
+      true
     end
-    
+
     def generated?
       @generated == true
     end
     
-    def staging_path
-      p = ::File.join document.staging_dir, relative_path
-      ::FileUtils.mkdir_p ::File.dirname(p)
-      p
+    def path
+      @path || @mutex.synchronize do
+        @path ||= begin
+          memo = ::File.join document.staging_dir, relative_path
+          ::FileUtils.mkdir_p ::File.dirname(memo)
+          ::File.open(memo, 'wb') do |f|
+            f.write render
+          end
+          converted = ::UnixUtils.unix2dos memo
+          ::FileUtils.mv converted, memo
+          @generated = true
+          memo
+        end
+      end
     end
-    
+        
     def template_path
       ::File.expand_path "../generators/#{self.class.name.demodulize.underscore}.erb", __FILE__
     end
@@ -31,14 +42,5 @@ module XlsxWriter
     def render
       ::ERB.new(::File.read(template_path), nil, '<>').result(binding)
     end
-    
-    def generate
-      @path = staging_path
-      ::File.open(@path, 'wb') do |out|
-        out.write render
-      end
-      Utils.unix2dos @path
-      @generated = true
-    end
   end
 end

data/lib/xlsx_writer.rb

@@ -1,34 +1,30 @@
+require 'thread'
 require 'active_support/core_ext'
-
-require 'xlsx_writer/version'
+require 'unix_utils'
 
 module XlsxWriter
-  def self.gem_dir
-    ::File.join ::File.dirname(__FILE__), 'xlsx_writer'
-  end
-  
-  autoload :Cell, "#{gem_dir}/cell"
-  autoload :Document, "#{gem_dir}/document"
-  autoload :Row, "#{gem_dir}/row"
-  autoload :Utils, "#{gem_dir}/utils"
-  autoload :Xml, "#{gem_dir}/xml"
-  autoload :HeaderFooter, "#{gem_dir}/header_footer"
-  autoload :Autofilter, "#{gem_dir}/autofilter"
-  autoload :PageSetup, "#{gem_dir}/page_setup"
-  
-  # manual
-  autoload :Sheet, "#{gem_dir}/generators/sheet"
-  autoload :SheetRels, "#{gem_dir}/generators/sheet_rels"
-  autoload :Image, "#{gem_dir}/generators/image"
-  
-  # generators
-  autoload :App, "#{gem_dir}/generators/app"
-  autoload :ContentTypes, "#{gem_dir}/generators/content_types"
-  autoload :DocProps, "#{gem_dir}/generators/doc_props"
-  autoload :Rels, "#{gem_dir}/generators/rels"
-  autoload :Styles, "#{gem_dir}/generators/styles"
-  autoload :Workbook, "#{gem_dir}/generators/workbook"
-  autoload :WorkbookRels, "#{gem_dir}/generators/workbook_rels"
-  autoload :VmlDrawing, "#{gem_dir}/generators/vml_drawing"
-  autoload :VmlDrawingRels, "#{gem_dir}/generators/vml_drawing_rels"
 end
+
+require 'xlsx_writer/cell'
+require 'xlsx_writer/document'
+require 'xlsx_writer/row'
+require 'xlsx_writer/xml'
+require 'xlsx_writer/header_footer'
+require 'xlsx_writer/autofilter'
+require 'xlsx_writer/page_setup'
+
+# manual
+require 'xlsx_writer/generators/sheet'
+require 'xlsx_writer/generators/sheet_rels'
+require 'xlsx_writer/generators/image'
+
+# generators
+require 'xlsx_writer/generators/app'
+require 'xlsx_writer/generators/content_types'
+require 'xlsx_writer/generators/doc_props'
+require 'xlsx_writer/generators/rels'
+require 'xlsx_writer/generators/styles'
+require 'xlsx_writer/generators/workbook'
+require 'xlsx_writer/generators/workbook_rels'
+require 'xlsx_writer/generators/vml_drawing'
+require 'xlsx_writer/generators/vml_drawing_rels'

data/test/helper.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'minitest/reporters'
+MiniTest::Unit.runner = MiniTest::SuiteRunner.new
+MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
+
+require 'remote_table'
+
+require 'xlsx_writer'

data/test/test_xlsx_writer.rb

@@ -0,0 +1,110 @@
+# encoding: UTF-8
+require 'helper'
+
+describe XlsxWriter do
+  describe "hello world example" do
+    before do
+      @doc = XlsxWriter::Document.new
+      @sheet1 = @doc.add_sheet("People")
+      @sheet1.add_row(['header1', 'header2'])
+      @sheet1.add_row(['hello', 'world'])
+    end
+    after do
+      @doc.cleanup
+    end
+    it "returns a path to an xlsx" do
+      File.exist?(@doc.path).must_equal true
+      File.extname(@doc.path).must_equal '.xlsx'
+    end
+    it "is a readable xlsx" do
+      RemoteTable.new("file://#{@doc.path}", :format => :xlsx).rows.first.must_equal('header1' => 'hello', 'header2' => 'world')
+    end
+    it "only generates once" do
+      @doc.generate
+      mtime = File.mtime(@doc.path)
+      md5 = UnixUtils.md5sum(@doc.path)
+      @doc.generate
+      File.mtime(@doc.path).must_equal mtime
+      UnixUtils.md5sum(@doc.path).must_equal md5
+    end
+    it "won't accept new sheets once it's been generated" do
+      @doc.add_sheet 'okfine'
+      @doc.generate
+      lambda {
+        @doc.add_sheet 'toolate'
+      }.must_raise(RuntimeError, /already generated/)
+    end
+    it "won't accept new rows once it's been generated" do
+      @sheet1.add_row(['phew'])
+      @doc.generate
+      lambda {
+        @sheet1.add_row(['too', 'late', 'to', 'apologize'])
+      }.must_raise(RuntimeError, /already generated/)
+    end
+    it "automatically generates if you call #path" do
+      @doc.generated?.must_equal false
+      @doc.path
+      @doc.generated?.must_equal true
+    end
+  end
+
+  describe "example with autofilter, header image, and footer text" do
+    before do
+      @doc = XlsxWriter::Document.new
+      sheet1 = @doc.add_sheet("People")
+      # DATA
+      sheet1.add_row(%w{DoB Name Occupation Number Integer Float})
+      sheet1.add_row([
+        Date.parse("July 31, 1912"), 
+        "Milton Friedman",
+        "Economist / Statistician",
+        {:type => :Currency, :value => 99_000_000},
+        500_000,
+        500_000.00,
+      ])
+      sheet1.add_autofilter 'A1:F1'
+      # FORMATTING
+      @doc.page_setup.top = 1.5
+      # hint: set up your header/footer in Excel, save, unzip the xlsx, get the .emf files, croptop, etc. from there
+      left_header_image = @doc.add_image(File.expand_path('../support/image1.emf', __FILE__), 118, 107)
+      left_header_image.croptop = '11025f'
+      left_header_image.cropleft = '9997f'
+      center_footer_image = @doc.add_image(File.expand_path('../support/image2.emf', __FILE__), 116, 36)
+      @doc.page_setup.header = 0
+      @doc.page_setup.footer = 0
+      @doc.header.left.contents = left_header_image
+      @doc.header.right.contents = 'Reporting Program'
+      @doc.footer.center.contents = [ 'Powered by ', center_footer_image ]
+      @doc.footer.right.contents = :page_x_of_y
+    end
+    after do
+      @doc.cleanup
+    end
+    it "has an autofilter" do
+      contents = UnixUtils.unzip @doc.path
+      File.read("#{contents}/xl/worksheets/sheet1.xml").must_include %{<autoFilter ref="A1:F1" />}
+    end
+    it "has a header image" do
+      contents = UnixUtils.unzip @doc.path
+      File.read("#{contents}/xl/drawings/_rels/vmlDrawing1.vml.rels").must_include %{<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="/xl/media/image1.emf"/>}
+      File.read("#{contents}/xl/drawings/vmlDrawing1.vml").must_include %{<v:imagedata o:relid="rId1" o:title="image1.emf" croptop="11025f" cropleft="9997f"/>}
+      original = UnixUtils.md5sum File.expand_path("../support/image1.emf", __FILE__)
+      UnixUtils.md5sum("#{contents}/xl/media/image1.emf").must_equal original
+    end
+  end
+
+  describe 'Cell' do
+    describe :round do
+      it "works same in 1.8 and 1.9" do
+        XlsxWriter::Cell.round(12.3456, 1).must_equal 12.3
+        XlsxWriter::Cell.round(12.3456, 2).must_equal 12.35
+      end
+    end
+    describe :log_base do
+      it "works same in 1.8 and 1.9" do
+        XlsxWriter::Cell.log_base(4, 1e3).must_be_close_to 0.2
+        XlsxWriter::Cell.log_base(4, 12.345).must_be_close_to 0.552
+      end
+    end
+  end
+end

data/xlsx_writer.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require 'xlsx_writer/version'
+require File.expand_path('../lib/xlsx_writer/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "xlsx_writer"
@@ -13,7 +12,7 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'fast_xs'
-  s.add_runtime_dependency 'posix-spawn'
+  s.add_runtime_dependency 'unix_utils'
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlsx_writer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2182482680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2182482680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fast_xs
-  requirement: &2182482200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2182482200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: posix-spawn
-  requirement: &2182481720 !ruby/object:Gem::Requirement
+  name: unix_utils
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +55,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2182481720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Writes XLSX files. Minimal XML and style. Supports autofilters and headers/footers
   with images and page numbers.
 email:
@@ -56,12 +71,12 @@ extra_rdoc_files: []
 files:
 - .bundle/config
 - .gitignore
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - lib/xlsx_writer.rb
-- lib/xlsx_writer/.DS_Store
 - lib/xlsx_writer/autofilter.rb
 - lib/xlsx_writer/cell.rb
 - lib/xlsx_writer/document.rb
@@ -90,9 +105,12 @@ files:
 - lib/xlsx_writer/header_footer.rb
 - lib/xlsx_writer/page_setup.rb
 - lib/xlsx_writer/row.rb
-- lib/xlsx_writer/utils.rb
 - lib/xlsx_writer/version.rb
 - lib/xlsx_writer/xml.rb
+- test/helper.rb
+- test/support/image1.emf
+- test/support/image2.emf
+- test/test_xlsx_writer.rb
 - xlsx_writer.gemspec
 homepage: https://github.com/seamusabshere/xlsx_writer
 licenses: []
@@ -114,9 +132,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Writes XLSX files. Minimal XML and style. Supports autofilters and headers/footers
   with images and page numbers.
-test_files: []
+test_files:
+- test/helper.rb
+- test/support/image1.emf
+- test/support/image2.emf
+- test/test_xlsx_writer.rb
+has_rdoc: 

data/lib/xlsx_writer/utils.rb

@@ -1,34 +0,0 @@
-require 'fileutils'
-require 'tmpdir'
-require 'posix/spawn'
-
-module XlsxWriter
-  module Utils
-    def self.tmp_path(basename = nil, extname = nil)
-      ::Kernel.srand
-      ::File.join ::Dir.tmpdir, "XlsxWriter-#{basename}#{::Kernel.rand(99999999)}#{extname ? ".#{extname}" : ''}"
-    end
-    
-    # zip -r -q #{filename} .
-    def self.zip(src_dir)
-      out_path = tmp_path('zip', 'zip')
-      child = ::POSIX::Spawn::Child.new 'zip', '-rq', out_path, '.', :chdir => src_dir
-      if child.success?
-        out_path
-      else
-        raise ::RuntimeError, child.err
-      end
-    end
-
-    # use awk to convert [CR]LF to CRLF
-    def self.unix2dos(path)
-      out_path = tmp_path
-      ::File.open(out_path, 'wb') do |out|
-        pid = ::POSIX::Spawn.spawn 'awk', '{ sub(/\r?$/,"\r"); print }', path, :out => out
-        ::Process.waitpid pid
-      end
-      ::FileUtils.mv out_path, path
-      path
-    end
-  end
-end