axlsx 1.0.8 → 1.0.9

data/lib/axlsx/workbook/worksheet/cell.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Axlsx
   # A cell in a worksheet. 
   # Cell stores inforamation requried to serialize a single worksheet cell to xml. You must provde the Row that the cell belongs to and the cells value. The data type will automatically be determed if you do not specify the :type option. The default style will be applied if you do not supply the :style option. Changing the cell's type will recast the value to the type specified. Altering the cell's value via the property accessor will also automatically cast the provided value to the cell's type.
@@ -25,7 +26,7 @@ module Axlsx
     # The index of the cellXfs item to be applied to this cell.
     # @return [Integer] 
     # @see Axlsx::Styles
-    attr_accessor :style
+    attr_reader :style
 
     # The row this cell belongs to.
     # @return [Row]
@@ -42,12 +43,24 @@ module Axlsx
     #   :string to :integer or :float, type coversions always return 0 or 0.0    
     #   :string, :integer, or :float to :time conversions always return the original value as a string and set the cells type to :string.
     #  No support is currently implemented for parsing time strings.
-    #
-    attr_accessor :type
+    attr_reader :type
+    # @see type
+    def type=(v) 
+      RestrictionValidator.validate "Cell.type", [:time, :float, :integer, :string], v      
+      @type=v 
+      self.value = @value
+    end
+
 
     # The value of this cell.
     # @return casted value based on cell's type attribute.
-    attr_accessor :value
+    attr_reader :value
+    # @see value
+    def value=(v)
+      #TODO: consider doing value based type determination first?
+      @value = cast_value(v)
+    end
+
 
     # @param [Row] row The row this cell belongs to.
     # @param [Any] value The value associated with this cell. 
@@ -91,16 +104,7 @@ module Axlsx
       @style = v
     end
 
-    def type=(v) 
-      RestrictionValidator.validate "Cell.type", [:time, :float, :integer, :string], v      
-      @type=v 
-      self.value = @value
-    end
 
-    def value=(v)
-      #TODO: consider doing value based type determination first?
-      @value = cast_value(v)
-    end
 
     # Serializes the cell
     # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
@@ -108,14 +112,19 @@ module Axlsx
     # @note
     #   Shared Strings are not used in this library. All values are set directly in the each sheet.
     def to_xml(xml)
-      if @type == :string
-        #NOTE not sure why, but xml.t @v renders the text as html entities of unicode data
-        xml.c(:r => r, :t=>:inlineStr, :s=>style) { xml.is { xml << "<t>#{value}</t>" } }
+      # Both 1.8 and 1.9 return the same 'fast_xf'
+      # &#12491;&#12507;&#12531;&#12468;
+      # &#12491;&#12507;&#12531;&#12468;
+      
+      # however nokogiri does a nice 'force_encoding' which we shall remove!
+      if @type == :string 
+        xml.c(:r => r, :t=>:inlineStr, :s=>style) { xml.is { xml.t @value.to_s } }
       else
         xml.c(:r => r, :s => style) { xml.v value }
       end
     end
 
+
     private 
 
     # assigns the owning row for this cell.

data/lib/axlsx/workbook/worksheet/row.rb

@@ -12,10 +12,6 @@ module Axlsx
     # @return [SimpleTypedList]
     attr_reader :cells
 
-    # The index of this row in the worksheet
-    # @return [Integer]
-    attr_reader :index
-
     # Creates a new row. New Cell objects are created based on the values, types and style options.
     # A new cell is created for each item in the values array. style and types options are applied as follows:
     #   If the types option is defined and is a symbol it is applied to all the cells created.
@@ -37,6 +33,8 @@ module Axlsx
       array_to_cells(values, options)
     end
 
+    # The index of this row in the worksheet
+    # @return [Integer]
     def index 
       worksheet.rows.index(self)
     end

data/lib/axlsx/workbook/worksheet/worksheet.rb

@@ -6,49 +6,24 @@ module Axlsx
     
     # The name of the worksheet
     # @return [String]
-    attr_accessor :name
+    attr_reader :name
 
     # The workbook that owns this worksheet
     # @return [Workbook]
     attr_reader :workbook
 
-    # The worksheet relationships. This is managed automatically by the worksheet
-    # @return [Relationships]
-    attr_reader :relationships
 
     # The rows in this worksheet
     # @note The recommended way to manage rows is Worksheet#add_row
     # @return [SimpleTypedList]
     # @see Worksheet#add_row
     attr_reader :rows
-    
-    # The drawing associated with this worksheet.
-    # @note the recommended way to work with drawings and charts is Worksheet#add_chart
-    # @return [Drawing]
-    # @see Worksheet#add_chart
-    attr_reader :drawing
 
     # An array of content based calculated column widths.
     # @note a single auto fit data item is a hash with :longest => [String] and :sz=> [Integer] members.
     # @return [Array] of Hash 
     attr_reader :auto_fit_data
 
-    # The part name of this worksheet
-    # @return [String]
-    attr_reader :pn
-
-    # The relationship part name of this worksheet
-    # @return [String]
-    attr_reader :rels_pn
-
-    # The relationship Id of thiw worksheet
-    # @return [String]
-    attr_reader :rId
-
-    # The index of this worksheet in the owning Workbook's worksheets list.
-    # @return [Integer]
-    attr_reader :index
-
     # TODO Merge Cells
     # attr_reader :merge_cells
     
@@ -57,6 +32,7 @@ module Axlsx
     # @see Workbook#add_worksheet
     # @option options [String] name The name of this sheet.
     def initialize(wb, options={})
+      @drawing = nil
       @rows = SimpleTypedList.new Row
       self.workbook = wb
       @workbook.worksheets << self
@@ -65,25 +41,38 @@ module Axlsx
       @magick_draw = Magick::Draw.new
     end
 
-    
+    # The name of the worksheet
+    # @param [String] v
     def name=(v) DataTypeValidator.validate "Worksheet.name", String, v; @name=v end
-    
+
+    # The part name of this worksheet
+    # @return [String]
     def pn
       "#{WORKSHEET_PN % (index+1)}"
     end
 
+    # The relationship part name of this worksheet
+    # @return [String]
     def rels_pn
       "#{WORKSHEET_RELS_PN % (index+1)}"
     end
 
+    # The relationship Id of thiw worksheet
+    # @return [String]
     def rId
       "rId#{index+1}"
     end
-    
+
+    # The index of this worksheet in the owning Workbook's worksheets list.
+    # @return [Integer]
     def index
       @workbook.worksheets.index(self)
     end
 
+    # The drawing associated with this worksheet.
+    # @note the recommended way to work with drawings and charts is Worksheet#add_chart
+    # @return [Drawing]
+    # @see Worksheet#add_chart
     def drawing
       @drawing || @drawing = Axlsx::Drawing.new(self)
     end
@@ -149,10 +138,11 @@ module Axlsx
           xml.drawing :"r:id"=>"rId1" if @drawing          
         }
       end
-      builder.to_xml(:indent=>0, :save_with=>0)
+      builder.to_xml
     end
 
-    # The worksheet's relationships.
+    # The worksheet relationships. This is managed automatically by the worksheet
+    # @return [Relationships]
     def relationships
         r = Relationships.new
         r << Relationship.new(DRAWING_R, "../#{@drawing.pn}") if @drawing
@@ -193,7 +183,7 @@ module Axlsx
     #  From ECMA docs
     #   Column width measured as the number of characters of the maximum digit width of the numbers 0 .. 9 as 
     #   rendered in the normal style's font. There are 4 pixels of margin padding (two on each side), plus 1 pixel padding for the gridlines.
-    #   width = Truncate([{Number of Characters} * {Maximum Digit Width} + {5 pixel padding}]/{Maximum Digit Width}*256)/256
+    #   width = Truncate([!{Number of Characters} * !{Maximum Digit Width} + !{5 pixel padding}]/!{Maximum Digit Width}*256)/256
     # @return [Float]
     # @param [Hash] A hash of auto_fit_data 
     def auto_width(col)
@@ -201,6 +191,7 @@ module Axlsx
       mdw_count = 0 
       best_guess = 1.5  #direct testing shows the results of the documented formula to be a bit too small. This is a best guess scaling
       font_scale = col[:sz].to_f / (self.workbook.styles.fonts[0].sz.to_f || 11.0)
+      
       col[:longest].scan(/./mu).each do |i|
         mdw_count +=1 if @magick_draw.get_type_metrics(i).width >= mdw 
       end

data/test/drawing/tc_one_cell_anchor.rb

@@ -30,7 +30,7 @@ class TestOneCellAnchor < Test::Unit::TestCase
   end
 
   def test_index
-    assert(@anchor.index, @anchor.drawing.anchors.index(@anchor))
+    assert_equal(@anchor.index, @anchor.drawing.anchors.index(@anchor))
   end
 
   def test_width

metadata

@@ -1,162 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: axlsx
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 1.0.9
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 8
-  version: 1.0.8
 platform: ruby
-authors: 
+authors:
 - Randy Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152120880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        version: "1"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: active_support
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152120880
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: &2152119200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152119200
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: &2152117140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152117140
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: &2152114660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id004
-description: "    axslx allows you to create Office Open XML Spreadsheet documents.\n    It supports automated column widths, multiple worksheets, custom styles, cusomizable charts and allows you to validate your xlsx package before serialization. \n"
-email: digital.ipeseity@gmail.com
-executables: []
+  prerelease: false
+  version_requirements: *2152114660
+description: ! '    xlsx generation with charts, images, automated column width, customizable
+  styles and full schema validation. Axlsx excels at helping you generate beautiful
+  Office Open XML Spreadsheet documents without having to understand the entire ECMA
+  specification. Check out the README for some examples of how easy it is. Best of
+  all, you can validate your xlsx file before serialization so you know for sure that
+  anything generated is going to load on your client''s machine.
 
+'
+email: digital.ipseity@gmail.com
+executables: []
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- doc/_index.html
-- doc/Axlsx/App.html
-- doc/Axlsx/Axis.html
-- doc/Axlsx/Bar3DChart.html
-- doc/Axlsx/BarSeries.html
-- doc/Axlsx/Border.html
-- doc/Axlsx/BorderPr.html
-- doc/Axlsx/CatAxis.html
-- doc/Axlsx/CatAxisData.html
-- doc/Axlsx/Cell.html
-- doc/Axlsx/CellAlignment.html
-- doc/Axlsx/CellProtection.html
-- doc/Axlsx/CellStyle.html
-- doc/Axlsx/Chart.html
-- doc/Axlsx/Color.html
-- doc/Axlsx/ContentType.html
-- doc/Axlsx/Core.html
-- doc/Axlsx/DataTypeValidator.html
-- doc/Axlsx/Default.html
-- doc/Axlsx/Drawing.html
-- doc/Axlsx/Fill.html
-- doc/Axlsx/Font.html
-- doc/Axlsx/GradientFill.html
-- doc/Axlsx/GradientStop.html
-- doc/Axlsx/GraphicFrame.html
-- doc/Axlsx/Line3DChart.html
-- doc/Axlsx/LineSeries.html
-- doc/Axlsx/Marker.html
-- doc/Axlsx/NumFmt.html
-- doc/Axlsx/OneCellAnchor.html
-- doc/Axlsx/Override.html
-- doc/Axlsx/Package.html
-- doc/Axlsx/PatternFill.html
-- doc/Axlsx/Pic.html
-- doc/Axlsx/Pie3DChart.html
-- doc/Axlsx/PieSeries.html
-- doc/Axlsx/RegexValidator.html
-- doc/Axlsx/Relationship.html
-- doc/Axlsx/Relationships.html
-- doc/Axlsx/RestrictionValidator.html
-- doc/Axlsx/Row.html
-- doc/Axlsx/Scaling.html
-- doc/Axlsx/SerAxis.html
-- doc/Axlsx/Series.html
-- doc/Axlsx/SeriesTitle.html
-- doc/Axlsx/SimpleTypedList.html
-- doc/Axlsx/Styles.html
-- doc/Axlsx/TableStyle.html
-- doc/Axlsx/TableStyleElement.html
-- doc/Axlsx/TableStyles.html
-- doc/Axlsx/Title.html
-- doc/Axlsx/TwoCellAnchor.html
-- doc/Axlsx/ValAxis.html
-- doc/Axlsx/ValAxisData.html
-- doc/Axlsx/View3D.html
-- doc/Axlsx/Workbook.html
-- doc/Axlsx/Worksheet.html
-- doc/Axlsx/Xf.html
-- doc/Axlsx.html
-- doc/class_list.html
-- doc/css/common.css
-- doc/css/full_list.css
-- doc/css/style.css
-- doc/file.README.html
-- doc/file_list.html
-- doc/frames.html
-- doc/index.html
-- doc/js/app.js
-- doc/js/full_list.js
-- doc/js/jquery.js
-- doc/method_list.html
-- doc/top-level-namespace.html
+files:
+- axlsx.gemspec
+- CHANGELOG.md
+- LICENSE
+- Rakefile
+- README.md
 - lib/axlsx/content_type/content_type.rb
 - lib/axlsx/content_type/default.rb
 - lib/axlsx/content_type/override.rb
@@ -216,10 +132,8 @@ files:
 - lib/axlsx/workbook/worksheet/worksheet.rb
 - lib/axlsx.rb
 - lib/schema/dc.xsd
-- lib/schema/dc.xsd~
 - lib/schema/dcmitype.xsd
 - lib/schema/dcterms.xsd
-- lib/schema/dcterms.xsd~
 - lib/schema/dml-chart.xsd
 - lib/schema/dml-chartDrawing.xsd
 - lib/schema/dml-compatibility.xsd
@@ -231,7 +145,6 @@ files:
 - lib/schema/dml-wordprocessingDrawing.xsd
 - lib/schema/opc-contentTypes.xsd
 - lib/schema/opc-coreProperties.xsd
-- lib/schema/opc-coreProperties.xsd~
 - lib/schema/opc-digSig.xsd
 - lib/schema/opc-relationships.xsd
 - lib/schema/pml.xsd
@@ -253,6 +166,78 @@ files:
 - lib/schema/vml-wordprocessingDrawing.xsd
 - lib/schema/wml.xsd
 - lib/schema/xml.xsd
+- doc/_index.html
+- doc/Axlsx/App.html
+- doc/Axlsx/Axis.html
+- doc/Axlsx/Bar3DChart.html
+- doc/Axlsx/BarSeries.html
+- doc/Axlsx/Border.html
+- doc/Axlsx/BorderPr.html
+- doc/Axlsx/CatAxis.html
+- doc/Axlsx/CatAxisData.html
+- doc/Axlsx/Cell.html
+- doc/Axlsx/CellAlignment.html
+- doc/Axlsx/CellProtection.html
+- doc/Axlsx/CellStyle.html
+- doc/Axlsx/Chart.html
+- doc/Axlsx/Color.html
+- doc/Axlsx/ContentType.html
+- doc/Axlsx/Core.html
+- doc/Axlsx/DataTypeValidator.html
+- doc/Axlsx/Default.html
+- doc/Axlsx/Drawing.html
+- doc/Axlsx/Fill.html
+- doc/Axlsx/Font.html
+- doc/Axlsx/GradientFill.html
+- doc/Axlsx/GradientStop.html
+- doc/Axlsx/GraphicFrame.html
+- doc/Axlsx/Line3DChart.html
+- doc/Axlsx/LineSeries.html
+- doc/Axlsx/Marker.html
+- doc/Axlsx/NumFmt.html
+- doc/Axlsx/OneCellAnchor.html
+- doc/Axlsx/Override.html
+- doc/Axlsx/Package.html
+- doc/Axlsx/PatternFill.html
+- doc/Axlsx/Pic.html
+- doc/Axlsx/Pie3DChart.html
+- doc/Axlsx/PieSeries.html
+- doc/Axlsx/RegexValidator.html
+- doc/Axlsx/Relationship.html
+- doc/Axlsx/Relationships.html
+- doc/Axlsx/RestrictionValidator.html
+- doc/Axlsx/Row.html
+- doc/Axlsx/Scaling.html
+- doc/Axlsx/SerAxis.html
+- doc/Axlsx/Series.html
+- doc/Axlsx/SeriesTitle.html
+- doc/Axlsx/Styles.html
+- doc/Axlsx/TableStyle.html
+- doc/Axlsx/TableStyleElement.html
+- doc/Axlsx/TableStyles.html
+- doc/Axlsx/Title.html
+- doc/Axlsx/TwoCellAnchor.html
+- doc/Axlsx/ValAxis.html
+- doc/Axlsx/ValAxisData.html
+- doc/Axlsx/View3D.html
+- doc/Axlsx/Workbook.html
+- doc/Axlsx/Worksheet.html
+- doc/Axlsx/Xf.html
+- doc/Axlsx.html
+- doc/class_list.html
+- doc/css/common.css
+- doc/css/full_list.css
+- doc/css/style.css
+- doc/file.LICENSE.html
+- doc/file.README.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/js/app.js
+- doc/js/full_list.js
+- doc/js/jquery.js
+- doc/method_list.html
+- doc/top-level-namespace.html
 - test/content_type/tc_content_type.rb
 - test/content_type/tc_default.rb
 - test/content_type/tc_override.rb
@@ -268,7 +253,6 @@ files:
 - test/drawing/tc_graphic_frame.rb
 - test/drawing/tc_line_3d_chart.rb
 - test/drawing/tc_line_series.rb
-- test/drawing/tc_line_series.tc~
 - test/drawing/tc_marker.rb
 - test/drawing/tc_one_cell_anchor.rb
 - test/drawing/tc_pic.rb
@@ -314,43 +298,29 @@ files:
 - examples/image1.jpeg
 - examples/image1.jpg
 - examples/image1.png
-- LICENSE
-- README.md
-- Rakefile
-- CHANGELOG.md
 homepage: https://github.com/randym/axlsx
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.8.7
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: axlsx
-rubygems_version: 1.8.11
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Author fully validated xlsx files with custom charts and styles
+summary: OOXML (xlsx) with charts, styles, images and autowidth columns.
 test_files: []
-
 has_rdoc: axlsx