axlsx_styler 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 756a9d8d271760c9ae1255f24ca3f4fe8a2a1629
-  data.tar.gz: 5ebf73fd12289d2092630753093eb5ef2b841bea
+  metadata.gz: 21d5d36b1a846a693e3dace67325bb9e8d2317ba
+  data.tar.gz: 06e8c8cd836d25e99e6a9d1463536b6e7711a974
 SHA512:
-  metadata.gz: 5b323e60aca00a19f961e19a5e1888812eef5eddba3cb45b912237f3c9eb41d9f3078ebccf4a47cf55c00a150b42a009b559f667c5aab0520ba34da611f97f39
-  data.tar.gz: a0e8b748ef3acfef9dcc7837fad747625e1ffa446002ee625e9cb167a63587ee624040fd2726f0f07d2d2551a81fccda7c3fbc1bbfc184b94973681bd34779c3
+  metadata.gz: e84cc140bac5013b7881c81b5c5dd14cabcf8dfe9843729dce817c8ab2f536064d0ec6fd761af1b264682659dbecac42baa32e3cc03a32abbefc117f77f64e54
+  data.tar.gz: 8385e37dacf3f373951132a884ab7e6775e7770584d76eae8fa23827e6efff550dd1d19a5983fe2d3b7267dec94eedf895821c04726b6de45dd7a252b347e9fd

data/axlsx_styler.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency "axlsx", "~> 2.0"
   spec.add_dependency "activesupport", "~> 3.1"
@@ -31,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 0.9"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'awesome_print', '~> 1.6'
 end

data/examples/colors_and_borders.rb

@@ -1,26 +1,26 @@
-require_relative '../lib/axlsx_styler'
+require 'axlsx_styler'
 
 axlsx = Axlsx::Package.new
 workbook = axlsx.workbook
 
 workbook.add_worksheet do |sheet|
   sheet.add_row
-  sheet.add_row ["", "Product", "Category", "Price"]
-  sheet.add_row ["", "Butter", "Dairy", 4.99]
-  sheet.add_row ["", "Bread", "Baked Goods", 3.45]
-  sheet.add_row ["", "Broccoli", "Produce", 2.99]
+  sheet.add_row ['', 'Product', 'Category',  'Price']
+  sheet.add_row ['', 'Butter', 'Dairy',      4.99]
+  sheet.add_row ['', 'Bread', 'Baked Goods', 3.45]
+  sheet.add_row ['', 'Broccoli', 'Produce',  2.99]
   sheet.column_widths 5, 20, 20, 20
 
   # using AxlsxStyler DSL
-  sheet["B2:D2"].add_style b: true
-  sheet["B2:B5"].add_style b: true
-  sheet["B2:D2"].add_style bg_color: "95AFBA"
-  sheet["B3:D5"].add_style bg_color: "E2F89C"
-  sheet["D3:D5"].add_style alignment: { horizontal: :left }
-  sheet["B2:D5"].add_border
-  sheet["B3:D3"].add_border [:top]
+  sheet['B2:D2'].add_style b: true
+  sheet['B2:B5'].add_style b: true
+  sheet['B2:D2'].add_style bg_color: '95AFBA'
+  sheet['B3:D5'].add_style bg_color: 'E2F89C'
+  sheet['D3:D5'].add_style alignment: { horizontal: :left }
+  sheet['B2:D5'].add_border
+  sheet['B3:D3'].add_border [:top]
 end
 
 workbook.apply_styles
 
-axlsx.serialize "../grocery.xlsx"
+axlsx.serialize File.expand_path('../../tmp/grocery.xlsx', __FILE__)

data/lib/axlsx_styler.rb

@@ -2,7 +2,8 @@ require 'axlsx'
 
 require 'axlsx_styler/version'
 require 'axlsx_styler/array'
-require 'axlsx_styler/axlsx_extensions'
+require 'axlsx_styler/axlsx_workbook'
+require 'axlsx_styler/axlsx_cell'
 
 Array.send :include, AxlsxStyler::Array
 Axlsx::Workbook.send :include, AxlsxStyler::Axlsx::Workbook

data/lib/axlsx_styler/{axlsx_extensions.rb → axlsx_cell.rb}

@@ -2,35 +2,21 @@ require 'active_support/core_ext/hash/deep_merge'
 
 module AxlsxStyler
   module Axlsx
-    module Workbook
-      attr_accessor :styled_cells
-
-      def add_styled_cell(cell)
-        self.styled_cells ||= []
-        self.styled_cells << cell
-      end
-
-      def apply_styles
-        return unless styled_cells
-        styled_cells.each do |cell|
-          cell.style = styles.add_style(cell.raw_style)
-        end
-      end
-    end
-
     module Cell
       attr_accessor :raw_style
 
-      def workbook
-        row.worksheet.workbook
-      end
-
       def add_style(style)
         self.raw_style ||= {}
         add_to_raw_style(style)
         workbook.add_styled_cell self
       end
 
+      private
+
+      def workbook
+        row.worksheet.workbook
+      end
+
       def add_to_raw_style(style)
         # using deep_merge from active_support:
         # with regular Hash#merge adding borders fails miserably

data/lib/axlsx_styler/axlsx_workbook.rb

@@ -0,0 +1,53 @@
+module AxlsxStyler
+  module Axlsx
+    module Workbook
+      # An array that holds all cells with styles
+      attr_accessor :styled_cells
+
+      # An index for cell styles
+      #   {
+      #     < style_hash > => 1,
+      #     < style_hash > => 2,
+      #     ...
+      #     < style_hash > => K
+      #   }
+      # where keys are Cell#raw_style and values are styles
+      # codes as per Axlsx::Style
+      attr_accessor :style_index
+
+      def add_styled_cell(cell)
+        self.styled_cells ||= Set.new
+        self.styled_cells << cell
+      end
+
+      def apply_styles
+        return unless styled_cells
+        styled_cells.each do |cell|
+          set_style_index(cell)
+        end
+      end
+
+      private
+
+      # Check if style code
+      def set_style_index(cell)
+        # @TODO fix this hack
+        self.style_index ||= {}
+
+        style = style_index[cell.raw_style]
+        if style
+          cell.style = style
+        else
+          new_style = styles.add_style(cell.raw_style)
+          cell.style = new_style
+
+          # :num_fmt is distinct even though the styles are
+          # the same; not sure if it's intended functionality
+          cell.raw_style.delete(:num_fmt)
+
+          style_index[cell.raw_style] = new_style
+        end
+      end
+    end
+  end
+end

data/lib/axlsx_styler/version.rb

@@ -1,3 +1,3 @@
 module AxlsxStyler
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'
 end

data/test/integration_test.rb

@@ -0,0 +1,55 @@
+require 'test_helper'
+
+class IntegrationTest < MiniTest::Test
+  # taken from /examples
+  def test_table_with_borders
+    axlsx = Axlsx::Package.new
+    workbook = axlsx.workbook
+    workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', 'Product', 'Category',  'Price']
+      sheet.add_row ['', 'Butter', 'Dairy',      4.99]
+      sheet.add_row ['', 'Bread', 'Baked Goods', 3.45]
+      sheet.add_row ['', 'Broccoli', 'Produce',  2.99]
+      sheet.add_row ['', 'Pizza', 'Frozen Foods',  4.99]
+      sheet.column_widths 5, 20, 20, 20
+
+      # using AxlsxStyler DSL
+      sheet['B2:D2'].add_style b: true
+      sheet['B2:B6'].add_style b: true
+      sheet['B2:D2'].add_style bg_color: '95AFBA'
+      sheet['B3:D6'].add_style bg_color: 'E2F89C'
+      sheet['D3:D6'].add_style alignment: { horizontal: :left }
+      sheet['B2:D6'].add_border
+      sheet['B3:D3'].add_border [:top]
+    end
+    workbook.apply_styles
+    axlsx.serialize File.expand_path(
+      '../../tmp/borders_test.xlsx',
+      __FILE__
+    )
+    assert_equal 12, workbook.style_index.count
+  end
+
+  def test_table_with_num_fmt
+    axlsx = Axlsx::Package.new
+    workbook = axlsx.workbook
+    t = Time.now
+    day = 24 * 60 * 60
+    workbook.add_worksheet do |sheet|
+      sheet.add_row %w(Date Count Percent)
+      sheet.add_row [t - 2 * day, 2, 2.to_f / 11]
+      sheet.add_row [t - 1 * day, 3, 3.to_f / 11]
+      sheet.add_row [t,           6, 6.to_f / 11]
+
+      sheet['A1:B1'].add_style b: true
+      sheet['A2:A4'].add_style format_code: 'YYYY-MM-DD hh:mm:ss'
+    end
+    workbook.apply_styles
+    assert_equal 2, workbook.style_index.count
+    axlsx.serialize File.expand_path(
+      '../../tmp/num_fmt_test.xlsx',
+      __FILE__
+    )
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
 require 'axlsx_styler'
 require 'minitest/autorun'
 require 'minitest/pride'
+require 'awesome_print'

data/test/workbook_test.rb

@@ -4,6 +4,6 @@ class WorkbookTest < MiniTest::Test
     wb = p.workbook
     wb.add_styled_cell 'Cell 1'
     wb.add_styled_cell 'Cell 2'
-    assert_equal ['Cell 1', 'Cell 2'], wb.styled_cells
+    assert_equal ['Cell 1', 'Cell 2'].to_set, wb.styled_cells
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axlsx_styler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Anton Sakovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: "\n    Axlsx gem is an excellent tool to build Excel worksheets. The
   sheets are\n    created row-by-row and styles are immediately added to each cell
   when a\n    row is created. This gem allows to follow an alternative route: fill
@@ -101,11 +115,13 @@ files:
 - examples/colors_and_borders.rb
 - lib/axlsx_styler.rb
 - lib/axlsx_styler/array.rb
-- lib/axlsx_styler/axlsx_extensions.rb
+- lib/axlsx_styler/axlsx_cell.rb
+- lib/axlsx_styler/axlsx_workbook.rb
 - lib/axlsx_styler/version.rb
 - spreadsheet.png
 - test/array_test.rb
 - test/cell_test.rb
+- test/integration_test.rb
 - test/test_helper.rb
 - test/workbook_test.rb
 homepage: https://github.com/sakovias/axlsx_styler
@@ -120,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -135,5 +151,6 @@ summary: This gem allows to separate data from styles when using Axlsx gem.
 test_files:
 - test/array_test.rb
 - test/cell_test.rb
+- test/integration_test.rb
 - test/test_helper.rb
 - test/workbook_test.rb