xlsx_writer 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,13 @@
+0.2.2 / 2012-07-04
+
+* Bug fixes
+
+  * Properly render FALSE boolean cells
+
+* Enhancements
+
+  * Add :faded option for cells
+
 0.2.1 / 2012-06-08
 
 * Bug fixes

data/README.markdown

@@ -2,6 +2,12 @@
 
 Writes (doesn't read or modify) XLSX files.
 
+## Real-world usage
+
+<p><a href="http://brighterplanet.com"><img src="https://s3.amazonaws.com/static.brighterplanet.com/assets/logos/flush-left/inline/green/rasterized/brighter_planet-160-transparent.png" alt="Brighter Planet logo"/></a></p>
+
+We use `xlsx_writer` for [sustainability analytics at Brighter Planet](http://brighterplanet.com/case_studies).
+
 ## Credit
 
 Based on the [original simple\_xlsx\_writer gem](https://github.com/harvesthq/simple_xlsx_writer) and [patches by mumboe](https://github.com/mumboe/simple_xlsx_writer)
@@ -74,3 +80,6 @@ Features not present in simple_xlsx_writer:
     # don't forget
     doc.cleanup
 
+## Copyright
+
+Copyright (c) 2012 Dee Zsombor, Justin Beck, Seamus Abshere. See LICENSE for details.

data/foo.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'bundler/setup'
 
 if ::Bundler.definition.specs['debugger'].first
@@ -10,15 +11,22 @@ require 'xlsx_writer'
 
 @doc = XlsxWriter::Document.new
 
-@sheet1 = @doc.add_sheet("Sheet1")
-@sheet1.add_row(['a', 'a'])
-@sheet1.add_row(['a', 'a'])
-@sheet1.add_row(['a', 'a'])
-# @sheet1.add_row(['foo', 'bar'])
-@sheet1.add_autofilter 'A1:B1'
+# @sheet1 = @doc.add_sheet("Sheet1")
+# @sheet1.add_row(['a', 'a'])
+# @sheet1.add_row(['a', { :value => 'a', :faded => true, :type => :String }])
+# @sheet1.add_row(['a', 'a'])
+# # @sheet1.add_row(['foo', 'bar'])
+# @sheet1.add_autofilter 'A1:B1'
 
 @sheet2 = @doc.add_sheet("Sheet2")
 @sheet2.add_row(['a', 'a'])
+@sheet2.add_row(['false1', false])
+@sheet2.add_row(['false2', {:value => false, :type => :Boolean}])
+@sheet2.add_row(['false3', 'faLse'])
+@sheet2.add_row(['true1', true])
+@sheet2.add_row(['true2', {:value => true, :type => :Boolean}])
+@sheet2.add_row(['true3', 'trUe'])
+
 # @sheet2.add_row(['hello', 'world'])
 # @sheet2.add_row(['yo', 'there'])
 # @sheet2.add_row(['foo', 'bar'])

data/lib/xlsx_writer/cell.rb

@@ -18,8 +18,8 @@ module XlsxWriter
       end
       
       # TODO make a class for this
-      def excel_style_number(calculated_type)
-        case calculated_type
+      def excel_style_number(calculated_type, faded = false)
+        i = case calculated_type
         when :String
           0
         when :Boolean
@@ -35,6 +35,11 @@ module XlsxWriter
         else
           raise ::ArgumentError, "Unknown cell type #{k}"
         end
+        if faded
+          i * 2 + 1
+        else
+          i * 2
+        end
       end
       
       def excel_column_letter(i)
@@ -86,16 +91,23 @@ module XlsxWriter
       end
 
       def calculate_type(value)
-        if value.is_a?(::Date)
+        case value
+        when Date
           :Date
-        elsif value.is_a?(::Integer)
+        when Integer
           :Integer
-        elsif value.is_a?(::Float) or (defined?(::BigDecimal) and value.is_a?(::BigDecimal)) or (defined?(::Decimal) and value.is_a?(::Decimal))
+        when Float
           :Decimal
-        elsif value.is_a?(::Numeric)
+        when Numeric
           :Number
+        when TrueClass, FalseClass, TRUE_FALSE_PATTERN
+          :Boolean
         else
-          :String
+          if (defined?(Decimal) and value.is_a?(Decimal)) or (defined?(BigDecimal) and value.is_a?(BigDecimal))
+            :Decimal
+          else
+            :String
+          end
         end
       end
 
@@ -144,8 +156,9 @@ module XlsxWriter
     MAX_DIGIT_WIDTH = 5
     MAX_REASONABLE_WIDTH = 75
     DATE_LENGTH = 'YYYY-MM-DD'.length
-    BOOLEAN_LENGTH = 'FALSE'.length
+    BOOLEAN_LENGTH = 'FALSE'.length + 1
     JAN_1_1900 = ::Time.parse '1900-01-01'
+    TRUE_FALSE_PATTERN = %r{^true|false$}i
     
     attr_reader :row
     attr_reader :value
@@ -158,21 +171,23 @@ module XlsxWriter
       @row = row
       if data.is_a?(::Hash)
         data = data.symbolize_keys
-        calculated_type = data[:type]
         @value = data[:value]
+        faded = data[:faded]
+        calculated_type = data[:type] || Cell.calculate_type(@value)
       else
         @value = data
+        faded = false
         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_style_number = Cell.excel_style_number calculated_type, faded
       @excel_value = Cell.send "excel_#{calculated_type.to_s.underscore}", @value
     end
 
     def to_xml
-      if value.blank?
+      if value.nil? or (value.is_a?(String) and value.empty?)
         %{<c r="#{excel_column_letter}#{row.ndx}" s="0" t="inlineStr" />}
       elsif excel_type == :inlineStr
         %{<c r="#{excel_column_letter}#{row.ndx}" s="#{excel_style_number}" t="#{excel_type}"><is><t>#{excel_value}</t></is></c>}

data/lib/xlsx_writer/generators/styles.erb

@@ -4,11 +4,17 @@
     <numFmt numFmtId="164" formatCode="0.00" />
   </numFmts>
 
-  <fonts count="1">
+  <fonts count="2">
     <font>
       <sz val="10"/>
       <name val="Arial"/>
     </font>
+    <!-- faded -->
+    <font>
+      <color rgb="FFCCCCCC"/>
+      <sz val="10"/>
+      <name val="Arial"/>
+    </font>
   </fonts>
 
   <fills count="1">
@@ -26,26 +32,21 @@
     <xf builtinId="4" />
   </cellStyleXfs>
 
-  <cellXfs count="5">
+  <cellXfs count="10">
     <!-- general -->
-    <xf numFmtId="0" fontId="0">
-      <alignment vertical="top" horizontal="left" />
-    </xf>
+    <xf numFmtId="0" fontId="0"><alignment vertical="top" horizontal="left" /></xf>
+    <xf numFmtId="0" fontId="1"><alignment vertical="top" horizontal="left" /></xf>
     <!-- currency (really accounting) -->
-    <xf numFmtId="39" fontId="0" xfId="1">
-      <alignment vertical="top" horizontal="right" />
-    </xf>
+    <xf numFmtId="39" fontId="0" xfId="1"><alignment vertical="top" horizontal="right" /></xf>
+    <xf numFmtId="39" fontId="1" xfId="1"><alignment vertical="top" horizontal="right" /></xf>
     <!-- date -->
-    <xf numFmtId="14" fontId="0">
-      <alignment vertical="top" horizontal="left" />
-    </xf>
+    <xf numFmtId="14" fontId="0"><alignment vertical="top" horizontal="left" /></xf>
+    <xf numFmtId="14" fontId="1"><alignment vertical="top" horizontal="left" /></xf>
     <!-- integer -->
-    <xf numFmtId="0" fontId="0">
-      <alignment vertical="top" horizontal="right" />
-    </xf>
+    <xf numFmtId="0" fontId="0"><alignment vertical="top" horizontal="right" /></xf>
+    <xf numFmtId="0" fontId="1"><alignment vertical="top" horizontal="right" /></xf>
     <!-- float/decimal/etc. -->
-    <xf numFmtId="164" fontId="0">
-      <alignment vertical="top" horizontal="right" />
-    </xf>
+    <xf numFmtId="164" fontId="0"><alignment vertical="top" horizontal="right" /></xf>
+    <xf numFmtId="164" fontId="1"><alignment vertical="top" horizontal="right" /></xf>
   </cellXfs>
 </styleSheet>

data/lib/xlsx_writer/version.rb

@@ -1,3 +1,3 @@
 module XlsxWriter
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlsx_writer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport