rexcel 0.1.0 → 0.1.1

data/examples/example.rb

@@ -1,11 +1,14 @@
+#encoding: cp1252
 $:.unshift('../lib') if $0 == __FILE__
 require 'rexcel'
 Excel::LOGGER.level = Log4r::DEBUG
 
-wb = Excel::Workbook.new('data')
+wb = Excel::Workbook.new()
 
 wb << [1,2,3,4,5,6,7]
 wb << [:a, :b, :c, :d, :e, :f]
+wb << ['�', '�', '�', '�', '�', '�', '�']
+wb << ['�', '�', '�', '�', '�', '�', '�'].map{|x| x.encode('utf-8')}
 
 
 wb << ws = Excel::Worksheet.new('Formats')

data/lib/rexcel.rb

@@ -71,7 +71,7 @@ require 'singleton'
 Frame for Excel-tools.
 =end
 module Excel
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   LOGGER = Log4r::Logger.new( name )#, Log4r::DEBUG, :trunc => true )
   LOGGER.outputters << Log4r::StdoutOutputter.new('std', :level => Log4r::WARN )
@@ -136,6 +136,7 @@ require 'rexcel/workbook'
 require 'rexcel/worksheet'
 require 'rexcel/row'
 require 'rexcel/cell'
+require 'rexcel/column'
 require 'rexcel/style'
 
 =begin

data/lib/rexcel/cell.rb

@@ -40,10 +40,13 @@ Options:
           @log.warn("Excel::Cell: undefined option #{options}")
       end
     }
-    @content = content      
+    #Convert data to utf-8
+    #Without this, you get problems, when you mix encodings.
+    #~ @content = content      
+    @content = content.respond_to?(:encode) ? content.encode('utf-8') : content
     @type = get_excel_type() unless @type
   end
-  #Content of the cell
+  #Content of the cell. Strings are converted to utf-8.
   attr_reader :content
   #Target type for Excel
   attr_reader :type

data/lib/rexcel/column.rb

@@ -0,0 +1,77 @@
+module Excel
+class Column
+=begin rdoc
+Define identifier and optional other values.
+
+*title: Used for title line. Default: ID
+=end
+  def initialize( id, options = {})
+    @id = id
+    @title = id
+    options.each{|key, value|
+      case key
+        when :title; @title = value.respond_to?(:encode) ? value.encode('utf-8') : value
+        when :width
+          if value.is_a?(Numeric)
+            @width = value
+          elsif value.respond_to?(:to_i)
+            @width = value.to_i
+          else
+            raise ArgumentError, "Width is no Numeric"
+          end
+          raise ArgumentError, "Length zero or less" if @width <= 0
+        when :style
+          raise ArgumentError unless value.is_a?(Style)
+          @style = value
+        else
+          @log.error("#{self.class}: Undefined option #{key}")
+      end
+    }
+  end
+  #Identifier of column. Used for ruby internal reference
+  attr_reader :id
+  #Used for title line in Excel
+  attr_reader :title
+  
+=begin rdoc
+Build the xml a work sheet column.
+
+ns must be a method-object to implement the namespace definitions.
+
+Format options (bold, italic, colors) are forwarded to cells.
+=end
+  def to_xml(xmlbuilder, ns)  
+    options = {}
+    options[ns.call('Width')] = @width if @width
+    options[ns.call('StyleID')] = @style.style_id if @style
+    
+    xmlbuilder[ns.call].Column( options )
+  end
+
+=begin rdoc
+Fill an Excel Columns
+Receives a OLE-cell and optional a row.
+
+
+=end
+  def to_xls()
+    @log.fatal("Not implemented yet")    
+  end
+    
+end #class Column
+end #module Excel
+
+__END__
+Fixmes:
+
+Options:
+  *title
+  *width
+  *color?
+
+to do:
+
+Column.to_xls
+Column.to_xml
+
+Worksheet#titleline

data/lib/rexcel/row.rb

@@ -68,6 +68,8 @@ Format options (bold, italic, colors) are forwarded to cells.
       }
     }
   end #to_xml
-  
+  def inspect
+    "#<Excel::Row:#{object_id} #{columns.size} Columns>"
+  end
 end #class Row
 end #module Excel

data/lib/rexcel/style.rb

@@ -91,7 +91,11 @@ Not implemented (yet)
 * Font
 =end
   def initialize(name, options = {})
+    
     @name = name
+    #Catch, if name was forgotten and options are first parameter.
+    raise ArgumentError, "Style requries key" if name.is_a?(Hash)
+    
     @log = options[:log] || LOGGER    
     @log.debug( "Create Style #{name}")
     

data/lib/rexcel/workbook.rb

@@ -104,12 +104,12 @@ For big files, it is recommended to use the way via xml.
     }
 
     first = true
-    @worksheets.each{|worksheet|
+    #wb.Worksheets.Add appends new worksheets at begin -> reverse for creation to get right sequence.
+    @worksheets.reverse.each{|worksheet|
       if first
         worksheet.to_xls(wb.ActiveSheet)
         first = false
       else
-        @log.error("#{__method__}: Wrong worksheet sequence")
         worksheet.to_xls(wb.Worksheets.Add)
       end
     }

data/lib/rexcel/worksheet.rb

@@ -8,7 +8,8 @@ class Worksheet
   def initialize( name = nil, options = {})
     @log = options[:log] || LOGGER
     @name = name || 'Sheet'
-    @columns = []
+    #Array with columns sequence. Needed to insert Hashes.
+    @columns = {}
     @rows = []
     options.each{|key,value|
       case key
@@ -20,8 +21,6 @@ class Worksheet
   end
   #Name of the sheet
   attr_reader :name
-  #Array with columns sequence. Needed to insert Hashes.
-  attr_reader :columns
   #Array with rows
   attr_reader :rows
 =begin rdoc
@@ -34,15 +33,17 @@ If no actual worksheet is available, a new worksheet i created.
 =end
   def << (insertion)
     case insertion
+      when Column
+        @columns[insertion.id] = insertion
       when Array
         @rows << row = Row.new()
         row << insertion
       when Hash
         raise ArgumentError, "#{Worksheet}: Hash without heading data" if @columns.empty?
         @rows << row = Row.new()
-        @log.fatal("Worksheet: Fixme Columns definition")
-        @columns.each{|column|
-          row << insertion[column]
+        #Hashes keep the order of entry. -> no internal order necessary
+        @columns.each{|id, column|
+          row << insertion[id]
         }
       when Row
         @rows << insertion
@@ -51,6 +52,23 @@ If no actual worksheet is available, a new worksheet i created.
     end
   end
 =begin rdoc
+Add a title line from columns data.
+
+
+=end
+def add_title_row(columns = @columns, style = Style.new("Title_row#{object_id}", :bold => true))
+  #~ raise ArgumentError, "#{Worksheet}##{__method__}: No columns list found" unless columns.respond_to?(:each)
+  raise ArgumentError, "#{Worksheet}##{__method__}: No columns list found" unless columns.is_a?(Hash)
+  raise ArgumentError, "#{Worksheet}##{__method__}: Columns list empty" if columns.empty?
+  
+  @rows << row = Row.new(:style => style )
+  #Hashes keep the order of entry. -> no internal order necessary
+  columns.each{|id, column|
+    row << Cell.new(column.title)
+  }
+  row
+end
+=begin rdoc
 Build the xml for the work sheet.
 
 ns must be a method-object to implement the namespace definitions.
@@ -61,7 +79,7 @@ ns must be a method-object to implement the namespace definitions.
     @log.debug("Prepare XML for worksheet #{@name}")
     xmlbuilder[ns.call].Worksheet(ns.call('Name') => @name){
       xmlbuilder[ns.call].Table(){
-        #~ xmlbuilder[ns.call].Column( ns.call('Width') => 100)
+        @columns.each{|id,column| column.to_xml(xmlbuilder, ns) }
         @rows.each{|row|
           row.to_xml(xmlbuilder, ns)
         } #row

data/unittest/test_rexcel.rb

@@ -94,7 +94,7 @@ end
 
 class Test_excel < Test::Unit::TestCase  
   def test_version()
-    assert_equal('0.1.0', Excel::VERSION)
+    assert_equal('0.1.1', Excel::VERSION)
   end
 end #class Test_excel < Test::Unit::TestCase
   
@@ -282,8 +282,8 @@ class Test_workbook_insertions < Test::Unit::TestCase
     assert_instance_of(Excel::Worksheet, wb.active_worksheet)
     
     ws = wb.active_worksheet
-    ws.columns << 1
-    ws.columns << 2
+    ws << Excel::Column.new( 1 )
+    ws << Excel::Column.new( 2 )
     
     assert_nothing_raised{ wb <<  { 1 => :a, 2 => :b, 3 => :c } }
     assert_equal(1, wb.worksheets.size)#no new worksheet created
@@ -291,6 +291,8 @@ class Test_workbook_insertions < Test::Unit::TestCase
 <ss:Workbook xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet">
     <ss:Worksheet ss:Name="Sheet0">
         <ss:Table>
+            <ss:Column/>
+            <ss:Column/>
             <ss:Row>
                 <ss:Cell>
                     <ss:Data ss:Type="String">a</ss:Data>
@@ -313,6 +315,73 @@ class Test_workbook_insertions < Test::Unit::TestCase
 
 end #class Test_workbook
 
+class Test_Columns < Test::Unit::TestCase
+  def test_init
+    assert_raise(ArgumentError){ Excel::Column.new()}
+    assert_equal(1, Excel::Column.new(1).id)
+    assert_equal(1, Excel::Column.new(1).title)
+  end
+  def test_width
+    assert_raise(ArgumentError){ Excel::Column.new(1, :width => :bold )}
+    assert_raise(ArgumentError){ Excel::Column.new(1, :width => 'xx100' )}  #0
+    
+    assert_raise(ArgumentError){ Excel::Column.new(1, :width => 0 )}
+    assert_raise(ArgumentError){ Excel::Column.new(1, :width => -1 )}
+    
+    assert_nothing_raised{ Excel::Column.new(1, :width => '100')}
+    #~ assert_equal{ 100, Excel::Column.new(1, :width => '100').width}
+    assert_nothing_raised{ Excel::Column.new(1, :width => 1)}
+  end
+  
+  def test_style
+    assert_raise(ArgumentError){ Excel::Column.new(1, :style => 1 )}
+    assert_raise(ArgumentError){ Excel::Column.new(1, :style => :bold )}
+    assert_nothing_raised{ Excel::Column.new(1, :style => Excel::Style.new(1))}
+  end
+end #class Test_Columns < Test::Unit::TestCase
+class Test_Columns_xml < Test::Unit::TestCase
+  def setup()
+    @mock = Mock_document.new
+  end  
+  def test_width
+    col = Excel::Column.new(1,:width => '100')
+    assert_equal(%{<ss:Column ss:Width="100"/>},
+      @mock.testcase{|builder, ns_proc|
+        col.to_xml( builder,ns_proc)
+    })
+  end #def test_width
+  def test_style
+    col = Excel::Column.new(:test,:style => Excel::Style.new(1, :color => 5))
+    #Style id empty, because of the missing workbook in mock.
+    assert_equal(%{<ss:Column ss:StyleID=""/>},
+      @mock.testcase{|builder, ns_proc|
+        col.to_xml( builder,ns_proc)
+    })
+  end #def test_style
+  
+end #class Test_Columns_xml < Test::Unit::TestCase
+  
+class Test_Worksheet < Test::Unit::TestCase
+  def test_init
+    ws = Excel::Worksheet.new()
+    assert_equal('Sheet', ws.name)
+    assert_equal([], ws.rows)
+    #~ assert_equal({}, ws.columns) #only internal.
+  end #def test_init
+  def test_add_title_row
+    ws = Excel::Worksheet.new()
+    assert_raise(ArgumentError){ ws.add_title_row(:xx) } #no #each
+    assert_raise(ArgumentError){ ws.add_title_row([]) } #wrong type
+    assert_raise(ArgumentError){ ws.add_title_row({}) } #empty
+
+    assert_raise(ArgumentError){ ws.add_title_row() }#no columns defined
+    
+    title_row = ws.add_title_row({ 1 => Excel::Column.new(1), 2=> Excel::Column.new(2)})
+    assert_instance_of(Excel::Row, title_row)
+    assert_equal(2, title_row.columns.size)
+
+  end
+end #class Test_Worksheet 
 class Test_Worksheet_insertions < Test::Unit::TestCase
   def setup()
     @mock = Mock_document.new
@@ -374,13 +443,15 @@ class Test_Worksheet_insertions < Test::Unit::TestCase
     assert_raise( ArgumentError ){ ws <<  { 1 => :a, 2 => :b, 3 => :c } }
     assert_equal(0, ws.rows.size)
     
-    ws.columns << 1
-    ws.columns << 2
+    ws << Excel::Column.new(1)
+    ws << Excel::Column.new(2)
     
     assert_nothing_raised{ ws <<  { 1 => :a, 2 => :b, 3 => :c } }
     assert_equal(1, ws.rows.size)
     assert_equal(%{<ss:Worksheet ss:Name="Sheet">
     <ss:Table>
+      <ss:Column/>
+      <ss:Column/>
       <ss:Row>
         <ss:Cell>
           <ss:Data ss:Type="String">a</ss:Data>
@@ -712,14 +783,3 @@ end
 #~ }
   
 __END__
-  
-  #~ build_xml('test_save_xml.xml')
-
-#~ mk_excel(File.join(Dir.pwd, "test_xml.xlsx"),  File.join(Dir.pwd, 'test_save_xml.xml'))
-xls = ExcelXML.new
-#~ xls.save_xml("test_xml.xml")
-File.delete("test_xml.xml") if File.exist?("test_xml.xml")
-xls.mk_excel("test_xml.xlsx")
-#~ xls.mk_excel("test_xml.xlsx", 'example_excel_xml.xml')
-
-#~ mk_excel("./test2.xls", data) #Speichert in Eigene Dateien

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rexcel
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Knut Lickert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +02:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - lib/rexcel/row.rb
 - lib/rexcel/cell.rb
 - lib/rexcel/style.rb
+- lib/rexcel/column.rb
 - examples/example.rb
 - examples/example_format.rb
 - examples/example_color.rb