spreadsheet_architect 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c70bffeb66b07a08e65d84e41b84a47595926571
-  data.tar.gz: f70ea264d22245f9771e36eb9bc46d22c05e5f7e
+  metadata.gz: be2d251d985ed779019709a19cd14047e8f26c18
+  data.tar.gz: 5076391ee7d477af958ef6f9dd1cbc438695c57a
 SHA512:
-  metadata.gz: 72c104868f8995b133f3337646ef59f739017ba8306bc31ad0d1d263341ef9c6984730adb3904484563c2f6553d82c8bb3d6b90e61970e3ccbcefe0828caa7c1
-  data.tar.gz: 2d7dbe940b6e56f54b902845fc21a94f75c14296aeb075aff2bc13ab9278a3d1c2f5a6706e497759c47dcd97f906ad24d9dccd3424b133d085b9210920072803
+  metadata.gz: 87ea6396eb5bed677c7fce4bec9da8588620ecd247ea4bbb9fbf964908809803f27e7959527917a8a404b981f60c31d025b76ea92c16856e0f06f36e84f21790
+  data.tar.gz: 3c5022fd0922a7c2fc2eeec0fbdce445b75ef9a8439b561d412b6c1564b9091de5f89f4d4db414e4243cbe83efb961c2baa881a93474a765884a55c09483306b

data/README.md

@@ -105,31 +105,21 @@ end
 ### to_xlsx
 **sheet_name** - *String*
 
-**header_style** - *Hash* - Default: `{bg_color: "AAAAAA", fg_color: "FFFFFF", alignment: { horizontal: :center }, bold: true}`
+**header_style** - *Hash* - Default: `{background_color: "AAAAAA", color: "FFFFFF", align: :center, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false}`
   
-**row_style** - Hash
+**row_style** - Hash - Default: `{background_color: "FFFFFF", color: "FFFFFF", align: :left, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false}`
 
 ### to_ods
 **sheet_name** - *String*
 
-**header_style** - *Hash* - Default: {bold: true} - Note: Currently only supports bold & fg_color style options
+**header_style** - *Hash* - Default: {color: "000000", align: :center, font_size: 10, bold: true} - Note: Currently only supports these options
 
-**row_style** - *Hash*
+**row_style** - *Hash* - Default: {color: "000000", align: :left, font_size: 10, bold: false} - Note: Currently only supports these options
 
 ### to_csv
 Only the generic options
 
 
-# Style Options
-**bg_color** - *6 Digit Hex Color without the # Symbol* - Ex. "AAAAAAA" 
-
-**fg_color** - *Text Color - 6 Digit Hex Color without the # Symbol* - Ex. "0000000" 
-
-**alignment** - *Hash* - Ex. {horizontal: :right, vertical: :top}
-
-**bold** - *Boolean*
-
-
 # Credits
 Created by Weston Ganger - @westonganger
 

data/lib/spreadsheet_architect.rb

@@ -44,17 +44,20 @@ module SpreadsheetArchitect
 
       headers = (options[:headers] == false ? false : headers)
 
+      header_style = {background_color: "AAAAAA", color: "FFFFFF", align: :center, bold: false, font_name: 'Arial', font_size: 10, italic: false, underline: false}
+      
       if options[:header_style]
-        header_style = options[:header_style]
+        header_style.merge!(options[:header_style])
       elsif options[:header_style] == false
         header_style = false
       elsif options[:row_style]
         header_style = options[:row_style]
-      else
-        header_style = {bg_color: "AAAAAA", fg_color: "FFFFFF", alignment: { horizontal: :center }, bold: true}
       end
 
-      row_style = options[:row_style]
+      row_style = {background_color: "FFFFFF", color: "000000", align: :left, bold: false, font_name: 'Arial', font_size: 10, italic: false, underline: false}
+      if options[:row_style]
+        row_style.merge!(options[:row_style])
+      end
 
       sheet_name = options[:sheet_name] || self.name
       
@@ -106,12 +109,17 @@ module SpreadsheetArchitect
 
       spreadsheet.office_style :header_style, family: :cell do
         if options[:header_style]
-          if options[:header_style][:bold]
+          unless opts[:row_style] && opts[:row_style][:bold] == false #uses opts, temporary
             property :text, 'font-weight': :bold
-            property :text, 'align': :center
           end
-          if options[:header_style][:fg_color] && opts[:header_style] && opts[:header_style][:fg_color] #temporary
-            property :text, 'color': "##{options[:header_style][:fg_color]}"
+          if options[:header_style][:align]
+            property :text, 'align': options[:header_style][:align]
+          end
+          if options[:header_style][:size]
+            property :text, 'font-size': options[:header_style][:size]
+          end
+          if options[:header_style][:color] && opts[:header_style] && opts[:header_style][:color] #temporary
+            property :text, 'color': "##{options[:header_style][:color]}"
           end
         end
       end
@@ -120,8 +128,14 @@ module SpreadsheetArchitect
           if options[:row_style][:bold]
             property :text, 'font-weight': :bold
           end
-          if options[:row_style][:fg_color]
-            property :text, 'color': "##{options[:header_style][:fg_color]}"
+          if options[:row_style][:align]
+            property :text, 'align': options[:row_style][:align]
+          end
+          if options[:row_style][:size]
+            property :text, 'font-size': options[:row_style][:size]
+          end
+          if opts[:row_style] && opts[:row_style][:color] #uses opts, temporary
+            property :text, 'color': "##{options[:row_style][:color]}"
           end
         end
       end
@@ -131,14 +145,14 @@ module SpreadsheetArchitect
         if options[:headers]
           row do
             options[:headers].each do |header|
-              cell header, style: (:header_style if options[:header_style])
+              cell header, style: :header_style
             end
           end
         end
         options[:data].each do |x|
           row do 
             this_class.sa_get_row_data(options[:columns], x).each do |y|
-              cell y, style: (:row_style if options[:row_style])
+              cell y, style: :row_style
             end
           end
         end
@@ -149,18 +163,42 @@ module SpreadsheetArchitect
 
     def to_xlsx(opts={})
       options = sa_get_options(opts)
+    
+      header_style = {}
+      header_style[:fg_color] = options[:header_style].delete(:color)
+      header_style[:bg_color] = options[:header_style].delete(:background_color)
+      if header_style[:align]
+        header_style[:alignment] = {}
+        header_style[:alignment][:horizontal] = options[:header_style][:align]
+      end
+      header_style[:b] = options[:header_style].delete(:bold)
+      header_style[:sz] = options[:header_style].delete(:font_size)
+      header_style[:i] = options[:header_style].delete(:italic)
+      header_style[:u] = options[:header_style].delete(:underline)
+      
+      row_style = {}
+      row_style[:fg_color] = options[:row_style].delete(:color)
+      row_style[:bg_color] = options[:row_style].delete(:background_color)
+      if row_style[:align]
+        row_style[:alignment] = {}
+        row_style[:alignment][:horizontal] = options[:row_style][:align]
+      end
+      row_style[:b] = options[:row_style].delete(:bold)
+      row_style[:sz] = options[:row_style].delete(:font_size)
+      row_style[:i] = options[:row_style].delete(:italic)
+      row_style[:u] = options[:row_style].delete(:underline)
       
-      package = opts[:package] || Axlsx::Package.new
+      package = Axlsx::Package.new
 
       return package if options[:data].empty?
 
       package.workbook.add_worksheet(name: options[:sheet_name]) do |sheet|
         if options[:headers]
-          sheet.add_row options[:headers], style: (package.workbook.styles.add_style(options[:header_style]) if options[:header_style])
+          sheet.add_row options[:headers], style: package.workbook.styles.add_style(header_style)
         end
         
         options[:data].each do |x|
-          sheet.add_row sa_get_row_data(options[:columns], x), style: (package.workbook.styles.add_style(options[:row_style]) if options[:row_style]), types: options[:types]
+          sheet.add_row sa_get_row_data(options[:columns], x), style: package.workbook.styles.add_style(row_style), types: options[:types]
         end
       end
 

data/lib/spreadsheet_architect/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetArchitect
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_architect
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx