axlsx_styler 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d3232dd2b096374134b17d0580aa8d4b0fdcbd9
-  data.tar.gz: 9add5f73a45dd461c5b2b2f2edfab0d5a57b828c
+  metadata.gz: a78ec129205b19cc466a29461787fcdd8e4d6113
+  data.tar.gz: 0c04a30a6c48799392eb765e7fbd67c6236ef294
 SHA512:
-  metadata.gz: 04792906e4d28e5c31d7f4e30ca9f1dd9cf598bb10bf05828451a2517b44d3e5afcf72070a0c6beedd13230cddb7f10f19d6a613db94ff05c322ed60997dc6f7
-  data.tar.gz: 90ad8832f1378f4d78770eb0e7756c7ba0f4db6da1bc159213b15cef47002e7167e5b26053073668fa23ddbcde152bd533e901c8a3310c14aed961e3a1f27efb
+  metadata.gz: c280bc771e8bda4131834f6a68502e5ade34ed808b61a996327806927d1467485fd226cebbba347940e97754f894053d15d02cd11b11e0292028197ebe868fdb
+  data.tar.gz: 6aca119eb6c65299047e927836c972dcc5252f02bed720bc4a9d7fc6da0bce77e78a560ad74d6efe617076db2881d0627a1217ccd51462e4d9288dc95144f09f

data/README.md

@@ -38,10 +38,13 @@ You can also add borders to ranges of cells:
 
 ```ruby
 sheet.add_border 'B2:D5'
-sheet.add_border 'B2:D5', [:right]
+sheet.add_border 'B2:D5', [:bottom, :right]
+sheet.add_border 'B2:D5', { edges: [:bottom, :right], style: :thick, color: 'FF0000' }
 ```
 
-When you are done with styling you just need to run
+Border parameters are optional. The default is to draw a thin black border on all four edges of the selected cell range.
+
+The styles are applied with a simple call:
 
 ```ruby
 workbook.apply_styles
@@ -106,7 +109,7 @@ wb.add_worksheet do |sheet|
     border: { style: :thin, color: border_color, edges: [:top, :right, :bottom] }
   })
   sheet.add_row
-  sheet.add_row(["", "Product", "Category", "Price"], 
+  sheet.add_row(["", "Product", "Category", "Price"],
     style: [ nil, top_left_corner, top_edge, top_right_corner ]
   )
 

data/examples/colors_and_borders.rb

@@ -17,7 +17,7 @@ workbook.add_worksheet do |sheet|
   sheet.add_style 'B3:D5', bg_color: 'E2F89C'
   sheet.add_style 'D3:D5', alignment: { horizontal: :left }
   sheet.add_border 'B2:D5'
-  sheet.add_border 'B3:D3', [:top]
+  sheet.add_border 'B3:D3', [:top], :thick
 end
 workbook.apply_styles
 axlsx.serialize File.expand_path('../../tmp/grocery.xlsx', __FILE__)

data/lib/axlsx_styler/axlsx_worksheet.rb

@@ -21,13 +21,14 @@ module AxlsxStyler
       end
 
       # Examples:
-      #   add_border 'B2:F8', [:left, :top]
+      #   add_border 'B2:F8', [:left, :top], :medium, '00330f'
+      #   add_border 'B2:F8', [:left, :top], :medium
       #   add_border 'C2:G10', [:top]
       #   add_border 'C2:G10'
-      # @TODO: allow to pass in custom border style
-      def add_border(cell_ref, edges = :all)
+      #   add_border 'B2:D5', { style: :thick, color: '00330f', edges: [:left, :right] }
+      def add_border(cell_ref, args = :all)
         cells = self[cell_ref]
-        BorderCreator.new(self, cells, edges).draw
+        BorderCreator.new(self, cells, args).draw
       end
     end
   end

data/lib/axlsx_styler/border_creator.rb

@@ -1,14 +1,22 @@
 class BorderCreator
-  attr_reader :worksheet, :cells, :edges
+  attr_reader :worksheet, :cells, :edges, :width, :color
 
-  def initialize(worksheet, cells, edges)
+  def initialize(worksheet, cells, args)
     @worksheet = worksheet
     @cells     = cells
-    @edges     = edges
+    if args.is_a?(Hash)
+      @edges = args[:edges] || :all
+      @width = args[:style] || :thin
+      @color = args[:color] || '000000'
+    else
+      @edges = args || :all
+      @width = :thin
+      @color = '000000'
+    end
   end
 
   def draw
-    selected_edges(edges).each { |edge| add_border(edge) }
+    selected_edges(edges).each { |edge| add_border(edge, width, color) }
   end
 
   private
@@ -24,14 +32,13 @@ class BorderCreator
     end
   end
 
-  def add_border(position)
+  def add_border(position, width, color)
     style = {
       border: {
-        style: :thin, color: '000000', edges: [position.to_sym]
+        style: width, color: color, edges: [position.to_sym]
       }
     }
     worksheet.add_style border_cells[position.to_sym], style
-    # add_style border_cells(cell_ref)[position.to_sym], style
   end
 
   def border_cells

data/lib/axlsx_styler/version.rb

@@ -1,3 +1,3 @@
 module AxlsxStyler
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/test/integration_test.rb

@@ -31,12 +31,65 @@ class IntegrationTest < MiniTest::Test
       sheet.add_style 'D3:D6', alignment: { horizontal: :left }
       sheet.add_border 'B2:D6'
       sheet.add_border 'B3:D3', [:top]
+      sheet.add_border 'B3:D3', edges: [:bottom], style: :medium
+      sheet.add_border 'B3:D3', edges: [:bottom], style: :medium, color: '32f332'
     end
     @workbook.apply_styles
     assert_equal 12, @workbook.style_index.count
     assert_equal 12 + 2, @workbook.style_index.keys.max
   end
 
+  def test_duplicate_borders
+    @filename = 'duplicate_borders_test'
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', 'B2', 'C2', 'D2']
+      sheet.add_row ['', 'B3', 'C3', 'D3']
+      sheet.add_row ['', 'B4', 'C4', 'D4']
+
+      sheet.add_border 'B2:D4'
+      sheet.add_border 'B2:D4'
+    end
+    @workbook.apply_styles
+    assert_equal 8, @workbook.style_index.count
+    assert_equal 8, @workbook.styled_cells.count
+  end
+
+  def test_multiple_style_borders_on_same_sells
+    @filename = 'multiple_style_borders'
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', 'B2', 'C2', 'D2']
+      sheet.add_row ['', 'B3', 'C3', 'D3']
+
+      sheet.add_border 'B2:D3', :all
+      sheet.add_border 'B2:D2', edges: [:bottom], style: :thick, color: 'ff0000'
+    end
+    @workbook.apply_styles
+    assert_equal 6, @workbook.style_index.count
+    assert_equal 6, @workbook.styled_cells.count
+
+    b2_cell_style = {
+      border: {
+        style: :thick,
+        color: 'ff0000',
+        edges: [:top, :left, :bottom]
+      }
+    }
+    assert_equal b2_cell_style, @workbook.style_index
+      .find { |_, v| v[:border][:edges] == [:top, :left, :bottom] }[1]
+
+    d3_cell_style = {
+      border: {
+        style: :thin,
+        color: '000000',
+        edges: [:right, :bottom]
+      }
+    }
+    assert_equal d3_cell_style, @workbook.style_index
+      .find { |_, v| v[:border][:edges] == [:right, :bottom] }[1]
+  end
+
   def test_table_with_num_fmt
     @filename = 'num_fmt_test'
     t = Time.now

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axlsx_styler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Anton Sakovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx