axlsx_styler 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d5d36b1a846a693e3dace67325bb9e8d2317ba
-  data.tar.gz: 06e8c8cd836d25e99e6a9d1463536b6e7711a974
+  metadata.gz: 83dfa2cca4c51645feaa8b0dbf6693af425e42d9
+  data.tar.gz: 770fb362a94bc3ce157dbd4df1d61ff657910882
 SHA512:
-  metadata.gz: e84cc140bac5013b7881c81b5c5dd14cabcf8dfe9843729dce817c8ab2f536064d0ec6fd761af1b264682659dbecac42baa32e3cc03a32abbefc117f77f64e54
-  data.tar.gz: 8385e37dacf3f373951132a884ab7e6775e7770584d76eae8fa23827e6efff550dd1d19a5983fe2d3b7267dec94eedf895821c04726b6de45dd7a252b347e9fd
+  metadata.gz: feba1d502575df2c5742ec0f3aeaf99c12cd9e571e5aab9fb3b58d917ffeea0c866c01b9edfb381b1b3f3b0b41b143fb6d024536c6791348b49d58d747a94ddd
+  data.tar.gz: 11fbe7c050e4091a084062567478ed84c58cee2a1f6e4a3f055002ad0e8974cdcbc2763b323ad81e1c34442b80c7b290cdbacaef9a42814c19f155ec251437bf

data/axlsx_styler.gemspec

@@ -4,33 +4,33 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'axlsx_styler/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "axlsx_styler"
+  spec.name          = 'axlsx_styler'
   spec.version       = AxlsxStyler::VERSION
-  spec.authors       = ["Anton Sakovich"]
-  spec.email         = ["sakovias@gmail.com"]
-  spec.summary       = %q{This gem allows to separate data from styles when using Axlsx gem.}
-  spec.description   = %q{
+  spec.authors       = ['Anton Sakovich']
+  spec.email         = ['sakovias@gmail.com']
+  spec.summary       = %q(This gem allows to separate data from styles when using Axlsx gem.)
+  spec.description   = %q(
     Axlsx gem is an excellent tool to build Excel worksheets. The sheets are
     created row-by-row and styles are immediately added to each cell when a
     row is created. This gem allows to follow an alternative route: fill out
     a spreadsheet with data and apply styles later. Styles can be added
     to individual cells as well as to ranges of cells. As a bonus, this gem
     also simplifies drawing borders around groups of cells.
-  }
-  spec.homepage      = "https://github.com/sakovias/axlsx_styler"
-  spec.license       = "MIT"
+  )
+  spec.homepage      = 'https://github.com/sakovias/axlsx_styler'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   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.require_paths = ['lib']
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency "axlsx", "~> 2.0"
-  spec.add_dependency "activesupport", "~> 3.1"
+  spec.add_dependency 'axlsx', '~> 2.0'
+  spec.add_dependency 'activesupport', '~> 3.1'
 
-  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 '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/lib/axlsx_styler/array.rb

@@ -1,4 +1,9 @@
 module AxlsxStyler
+  # @TODO
+  # Move the functionality from Array to Worksheet. New DSL
+  #   sheet.add_style 'A1:B5', b: true
+  # instead of
+  #   sheet['A1:B5'].add_style, b: true
   module Array
     def add_style(style)
       validate_cells
@@ -13,7 +18,7 @@ module AxlsxStyler
     #   hardcode style to :thin for now
     def add_border(edges = :all)
       validate_cells
-      selected_edges(edges).each{ |edge| add_border_at(edge) }
+      selected_edges(edges).each { |edge| add_border_at(edge) }
     end
 
     private

data/lib/axlsx_styler/axlsx_cell.rb

@@ -23,7 +23,7 @@ module AxlsxStyler
         new_style = raw_style.deep_merge style
         if with_border?(raw_style) && with_border?(style)
           border_at = raw_style[:border][:edges] + style[:border][:edges]
-          new_style[:border][:edges] = border_at
+          new_style[:border][:edges] = border_at.uniq
         elsif with_border?(style)
           new_style[:border] = style[:border]
         end

data/lib/axlsx_styler/axlsx_workbook.rb

@@ -6,10 +6,10 @@ module AxlsxStyler
 
       # An index for cell styles
       #   {
-      #     < style_hash > => 1,
-      #     < style_hash > => 2,
+      #     1 => < style_hash >,
+      #     2 => < style_hash >,
       #     ...
-      #     < style_hash > => K
+      #     K => < style_hash >
       #   }
       # where keys are Cell#raw_style and values are styles
       # codes as per Axlsx::Style
@@ -34,18 +34,15 @@ module AxlsxStyler
         # @TODO fix this hack
         self.style_index ||= {}
 
-        style = style_index[cell.raw_style]
-        if style
-          cell.style = style
+        index_item = style_index.select { |_, v| v == cell.raw_style }.first
+        if index_item
+          cell.style = index_item.first
         else
+          old_style = cell.raw_style.dup
           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
+          # cell.raw_style.delete(:num_fmt)
+          style_index[new_style] = old_style
         end
       end
     end

data/lib/axlsx_styler/version.rb

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

data/test/integration_test.rb

@@ -29,6 +29,7 @@ class IntegrationTest < MiniTest::Test
       __FILE__
     )
     assert_equal 12, workbook.style_index.count
+    assert_equal 12 + 2, workbook.style_index.keys.max
   end
 
   def test_table_with_num_fmt
@@ -52,4 +53,26 @@ class IntegrationTest < MiniTest::Test
       __FILE__
     )
   end
+
+  def test_duplicate_styles
+    axlsx = Axlsx::Package.new
+    workbook = axlsx.workbook
+    workbook.add_worksheet do |sheet|
+      sheet.add_row %w(Index City)
+      sheet.add_row [1, 'Ottawa']
+      sheet.add_row [2, 'Boston']
+
+      sheet['A1:B1'].add_border [:bottom]
+      sheet['A1:B1'].add_border [:bottom]
+      sheet['A1:A3'].add_style b: true
+      sheet['A1:A3'].add_style b: true
+    end
+    workbook.apply_styles
+    assert_equal 4, workbook.styled_cells.count
+    assert_equal 3, workbook.style_index.count
+    axlsx.serialize File.expand_path(
+      '../../tmp/duplicate_styles.xlsx',
+      __FILE__
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axlsx_styler
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Anton Sakovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx