xlsx_writer 0.1.1 → 0.1.2

data/README.markdown

@@ -34,14 +34,16 @@ Features not present in simple_xlsx_writer:
       "Name",
       "Occupation",
       "Salary",
-      "Citations"
+      "Citations",
+      "Average citations per paper"
     ])
     sheet1.add_row([
       Date.parse("July 31, 1912"), 
       "Milton Friedman",
       "Economist / Statistician",
       {:type => :Currency, :value => 10_000},
-      500_000
+      500_000,
+      0.31
     ])
     sheet1.add_autofilter 'A1:E1'
 

data/lib/xlsx_writer/cell.rb

@@ -8,12 +8,12 @@ module XlsxWriter
         case calculated_type
         when :String
           :inlineStr
-        when :Number, :Date, :Currency
+        when :Number, :Integer, :Decimal, :Date, :Currency
           :n
         when :Boolean
           :b
         else
-          raise ::ArgumentError, "Unknown cell type #{k}"
+          raise ::ArgumentError, "Unknown cell type #{calculated_type}"
         end
       end
       
@@ -22,14 +22,16 @@ module XlsxWriter
         case calculated_type
         when :String
           0
-        when :Number
-          3
+        when :Boolean
+          0 # todo
         when :Currency
           1
         when :Date
           2
-        when :Boolean
-          0 # todo
+        when :Number, :Integer
+          3
+        when :Decimal
+          4
         else
           raise ::ArgumentError, "Unknown cell type #{k}"
         end
@@ -58,6 +60,8 @@ module XlsxWriter
       end
       
       alias :excel_currency :excel_number
+      alias :excel_integer :excel_number
+      alias :excel_decimal :excel_number
       
       # doesn't necessarily work for times yet
       JAN_1_1900 = ::Time.parse('1900-01-01')
@@ -101,9 +105,10 @@ module XlsxWriter
       @character_width ||= case calculated_type
       when :String
         value.to_s.length
-      when :Number
+      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
@@ -155,6 +160,10 @@ module XlsxWriter
         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

data/lib/xlsx_writer/generators/styles.erb

@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+  <numFmts count="1">
+    <numFmt numFmtId="164" formatCode="0.00" />
+  </numFmts>
+
   <fonts count="1">
     <font>
       <sz val="10"/>
       <name val="Arial"/>
     </font>
   </fonts>
-  
+
   <fills count="1">
     <fill />
   </fills>
-  
+
   <borders count="1">
     <border />
   </borders>
-  
+
   <cellStyleXfs count="2">
     <!-- general -->
     <xf />
     <!-- currency -->
     <xf builtinId="4" />
   </cellStyleXfs>
-  
-  <cellXfs count="4">
+
+  <cellXfs count="5">
     <!-- general -->
     <xf numFmtId="0" fontId="0">
       <alignment vertical="top" horizontal="left" />
@@ -35,9 +39,13 @@
     <xf numFmtId="14" fontId="0">
       <alignment vertical="top" horizontal="left" />
     </xf>
-    <!-- number -->
+    <!-- integer -->
     <xf numFmtId="0" fontId="0">
       <alignment vertical="top" horizontal="right" />
     </xf>
+    <!-- float/decimal/etc. -->
+    <xf numFmtId="164" fontId="0">
+      <alignment vertical="top" horizontal="right" />
+    </xf>
   </cellXfs>
 </styleSheet>

data/lib/xlsx_writer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlsx_writer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
+date: 2011-12-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160880880 !ruby/object:Gem::Requirement
+  requirement: &2182482680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160880880
+  version_requirements: *2182482680
 - !ruby/object:Gem::Dependency
   name: fast_xs
-  requirement: &2160880320 !ruby/object:Gem::Requirement
+  requirement: &2182482200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160880320
+  version_requirements: *2182482200
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &2160879900 !ruby/object:Gem::Requirement
+  requirement: &2182481720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160879900
+  version_requirements: *2182481720
 description: Writes XLSX files. Minimal XML and style. Supports autofilters and headers/footers
   with images and page numbers.
 email: