spreadsheet_architect 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df0aa255d5445fd262b8f2244cf4ea0e4ab7558c
-  data.tar.gz: 3c18faecb6e3453fa2f2fda45653ce500dcdc2d2
+  metadata.gz: 332a260a2197fc58114223a6c5be628144e45042
+  data.tar.gz: 26a2abd7e96fc28512215f5e17be5dd5f52db9c2
 SHA512:
-  metadata.gz: 9687a9b89f283b77b643ce786fa3ebeb831fe995a4caa091b254a1c78776dfd796ec8b91d9889ff94b0f584c055994784d776c732948867f146ee259f3617c15
-  data.tar.gz: 6c97b06aed2bb6ffb0de766bbce50f8bef0f5bf01b3dce862380be1f7ee24c5f50500aab198157df10a9f612697698bd3ed04d4910c05910e693859cdd0ed41e
+  metadata.gz: ecbf18abbf5a5e307040615570590588a45bc9e82d90a069df701c5daa485a6b2fd4bb4010e61437bc7d164d83a72631960d5562fd34ab449ef15b6df8cf0f63
+  data.tar.gz: 9dd2c71d8ac044c704f028b778f0368991129e33db3ac93c6004f91a2cf7d376e3e68baf4b2f2e0cad7ecdc3613e6aa8078c864d98259ae9aa0233b61ecf0814

data/CHANGELOG.md

@@ -1,14 +1,22 @@
 CHANGELOG
 ---------
 
-- **July.14.2017**: 2.0.2
+- **2.1.0** - June 20, 2018
+  - PR #15 - Improved the method symbolize_keys. This method did not work properly for nested objects.
+  - PR #15 - Added the ability to pass `:text_wrap` option within the `:alignment` style
+  - Make axlsx styles higher precendence over Spreadsheet Architect style aliases
+  - Use `prepend` monkey patches in Ruby 2+ to avoid annoying overwrite warnings when using old `define_method` monkey patches
+  - Due to [RODF bug](https://github.com/thiagoarrais/rodf/issues/19) convert all Date and Time cells to String in ODS spreadsheets
+  - Improve test suite
+  - Dont test against Ruby versions that Rails no longer supports. Gem code should remain compatible with Ruby 1.9.3.
+- **2.0.2** - July 14 2017
   - Fix bug with range styles rows option not counting headers
   - Fix bug with range styles rows :all option
-- **February.16.2017**: 2.0.1
+- **2.0.1** - February 16 2017
   - Fix bug where `SpreadsheetArchitect.default_options` and `SPREADSHEET_OPTIONS` were being overwritten
   - Fix bug where col_styles ignored previous styles on header when using `include_header` option
   - Errors now try to provide which value is the cause
-- **January.28.2017**: 2.0.0
+- **2.0.0** - January 28 2017
   - Add to xlsx: `merges`, `column_styles`, `range_styles`, `borders`, `column_widths` multi-row headers, date/time default format_code
   - Add `column_types` option for xlsx and ods
   - Add ability to make multi-sheet spreadsheets in XLSX & ODS
@@ -16,52 +24,52 @@ CHANGELOG
   - Add Examples
   - Add Axlsx Style Reference
   - Refractor into smaller files
-- **December.6.2016**: 1.4.8
+- **1.4.8** - December 6 2016
   - Lock `rodf` gem to v0.3.7 for last v1 version of this gem
-- **November.7.2016**: 1.4.7
+- **1.4.7** - November 7 2016
   - Fix method arguments for `to_rodf_spreadsheet` method
-- **May.16.2016**: 1.4.6
+- **1.4.6** - May 16 2016
   - Fix hash syntax for support of ruby v2.1 and below
-- **May.4.2016**: 1.4.5
+- **1.4.5** - May 4 2016
   - Bug fixes
-- **May.3.2016**: 1.4.4
+- **1.4.4** - May 3 2016
   - Add Ability to add format_code to all numbers body rows
-- **May.3.2016**: 1.4.3
+- **1.4.3** - May 3 2016
   - Bug fixes
-- **May.3.2016**: 1.4.2
+- **1.4.2** - May 3 2016
   - Add to_axlsx_package, to_rodf_spreadsheet methods for the item to be further manipulated. Ex. axlsx_styler
-- **May.2.2016**: 1.4.1
+- **1.4.1** - May 2 2016
   - Add rails generator for project defaults initializer
-- **April.29.2016**: 1.4.0
+- **1.4.0** - April 29 2016
   - Add to_xlsx, to_ods, & to_csv to SpreadsheetArchitect model for direct calling by passing in cell data
-- **April.21.2016**: 1.3.0
+- **1.3.0** - April 21 2016
   - Add ability to create class/model and project option defaults
-- **March.25.2016**: 1.2.5
+- **1.2.5** - March 25 2016
   - Fix each_with_index bug
-- **March.24.2016**: 1.2.4
+- **1.2.4** - March 24 2016
   - Fix cell type logic for symbol methods
-- **March.20.2016**: 1.2.3
+- **1.2.3** - March 20 2016
   - Fix cell type logic
-- **March.19.2016**: 1.2.2
+- **1.2.2** - March 19 2016
   - Make cell type numeric if value is numeric
-- **March.13.2016**: 1.2.1
+- **1.2.1** - March 13 2016
   - Better error reporting
   - Fix for Plain ruby models
-- **March.10.2016**: 1.2.0
+- **1.2.0** - March 10 2016
   - Fix Bug: first row data repeated for all records on custom values
-- **March.3.2016**: 1.1.0 - Breaking Changes
-  - Move spreadsheet_columns method from the class to the instance
+- **1.1.0** - March 3 2016
+  - Breaking Change - Move spreadsheet_columns method from the class to the instance
   - Fix Bug: remove default underline on cells
-- **March.1.2016**: 1.0.4
+- **1.0.4** - March 1 2016
   - Extract helper methods to seperate module
   - Improve readme
-- **March.1.2016**: 1.0.3
+- **1.0.3** - March 1 2016
   - Fix/Improve renderers
   - Fix header default background color
   - Fix default columns
-- **February.26.2016**: 1.0.2
+- **1.0.2** - February 26 2016
   - Enhance Style options
-- **February.26.2016**: 1.0.1
+- **1.0.1** - February 26 2016
   - Fix bug in renderers
-- **February.26.2016**: 1.0.0
+- **1.0.0** - February 26 2016
   - Gem Initial Release

data/README.md

@@ -92,7 +92,7 @@ class PostsController < ActionController::Base
     respond_with @posts
   end
 
-  # Using respond_with with custom options
+  # OR Using respond_with with custom options
   def index
     @posts = Post.order(published_at: :asc)
 
@@ -103,7 +103,7 @@ class PostsController < ActionController::Base
     end
   end
 
-  # Using responders
+  # OR Using responders
   def index
     @posts = Post.order(published_at: :asc)
 
@@ -115,7 +115,7 @@ class PostsController < ActionController::Base
     end
   end
 
-  # Using responders with custom options
+  # OR Using responders with custom options
   def index
     @posts = Post.order(published_at: :asc)
 
@@ -133,25 +133,25 @@ end
 ```ruby
 # Ex. with ActiveRecord relation
 File.open('path/to/file.xlsx', 'w+b') do |f|
-  f.write{ Post.order(published_at: :asc).to_xlsx }
+  f.write Post.order(published_at: :asc).to_xlsx
 end
 File.open('path/to/file.ods', 'w+b') do |f|
-  f.write{ Post.order(published_at: :asc).to_ods }
+  f.write Post.order(published_at: :asc).to_ods
 end
 File.open('path/to/file.csv', 'w+b') do |f|
-  f.write{ Post.order(published_at: :asc).to_csv }
+  f.write Post.order(published_at: :asc).to_csv
 end
 
 # Ex. with plain ruby class
 File.open('path/to/file.xlsx', 'w+b') do |f|
-  f.write{ Post.to_xlsx(instances: posts_array) }
+  f.write Post.to_xlsx(instances: posts_array)
 end
 
 # Ex. One time Usage
 File.open('path/to/file.xlsx', 'w+b') do |f|
   headers = ['Col 1','Col 2','Col 3']
   data = [[1,2,3], [4,5,6], [7,8,9]]
-  f.write{ SpreadsheetArchitect::to_xlsx(data: data, headers: headers) }
+  f.write SpreadsheetArchitect::to_xlsx(data: data, headers: headers)
 end
 ```
 <br>
@@ -213,7 +213,7 @@ end
 |**range_styles**<br>*Array*||[See this example for usage](https://github.com/westonganger/spreadsheet_architect/blob/master/examples/complex_xlsx_styling.rb)|
 |**merges**<br>*Array*||Merge cells. [See this example for usage](https://github.com/westonganger/spreadsheet_architect/blob/master/examples/complex_xlsx_styling.rb)|
 |**borders**<br>*Array*||[See this example for usage](https://github.com/westonganger/spreadsheet_architect/blob/master/examples/complex_xlsx_styling.rb)|
-|**column_types**<br>*Array*||Valid types for XLSX are :string, :integer, :float, :date, :time, :boolean, nil = auto determine|
+|**column_types**<br>*Array*||Valid types for XLSX are :string, :integer, :float, :boolean, nil = auto determine.|
 |**column_widths**<br>*Array*||Sometimes you may want explicit column widths. Use nil if you want a column to autofit again.|
   
 <br> 
@@ -227,7 +227,7 @@ end
 |**sheet_name**<br>*String*|`Sheet1`||
 |**header_style**<br>*Hash*|`{background_color: "AAAAAA", color: "FFFFFF", align: :center, font_size: 10, bold: true}`|Note: Currently ODS only supports these options|
 |**row_style**<br>*Hash*|`{background_color: nil, color: "000000", align: :left, font_size: 10, bold: false}`|Styles for non-header rows. Currently ODS only supports these options|
-|**column_types**<br>*Array*||Valid types for ODS are :string, :float, :date, :percent, :currency, nil = auto determine|
+|**column_types**<br>*Array*||Valid types for ODS are :string, :float, :date, :time, :percent, :currency, nil = auto determine. Due to [RODF issue #19](https://github.com/thiagoarrais/rodf/issues/19), :date/:time will be converted to :string |
   
 <br>
 
@@ -272,7 +272,7 @@ end
 SpreadsheetArchitect.default_options = {
   headers: true,
   header_style: {background_color: 'AAAAAA', color: 'FFFFFF', align: :center, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false},
-  row_style: {background_color: nil, color: 'FFFFFF', align: :left, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false},
+  row_style: {background_color: nil, color: '000000', align: :left, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false},
   sheet_name: 'My Project Export',
   column_styles: [],
   range_styles: [],
@@ -283,7 +283,7 @@ SpreadsheetArchitect.default_options = {
 ```
 
 # Complex XLSX Example with Styling
-See this example: (https://github.com/westonganger/spreadsheet_architect/blob/master/examples/complex_xlsx_styling.rb)
+See this example: https://github.com/westonganger/spreadsheet_architect/blob/master/examples/complex_xlsx_styling.rb
 
 
 # Multi Sheet XLSX or ODS spreadsheets
@@ -296,11 +296,11 @@ spreadsheet = SpreadsheetArchitect.to_rodf_spreadsheet({data: data, headers: hea
 SpreadsheetArchitect.to_rodf_spreadsheet({data: data, headers: headers}, spreadsheet) # to combine two sheets to one file
 ```
 
-See this example: (https://github.com/westonganger/spreadsheet_architect/blob/master/examples/multi_sheet_spreadsheets.rb)
+See this example: https://github.com/westonganger/spreadsheet_architect/blob/master/examples/multi_sheet_spreadsheets.rb
 
 
 # Axlsx Style Reference
-I have compiled a list of all available style options for `axlsx` here: (https://github.com/westonganger/spreadsheet_architect/blob/master/docs/axlsx_style_reference.md)
+I have compiled a list of all available style options for axlsx here: https://github.com/westonganger/spreadsheet_architect/blob/master/docs/axlsx_style_reference.md
 
 
 # Credits
@@ -308,4 +308,4 @@ Created by [@westonganger](https://github.com/westonganger)
 
 For any consulting or contract work please contact me via my company website: [Solid Foundation Web Development](https://solidfoundationwebdev.com)
 
-[![Solid Foundation Web Development Logo](https://solidfoundationwebdev.com/logo.png)](https://solidfoundationwebdev.com)
+[![Solid Foundation Web Development Logo](https://solidfoundationwebdev.com/logo-sm.png)](https://solidfoundationwebdev.com)

data/Rakefile

@@ -3,10 +3,12 @@ require 'bundler/gem_tasks'
 
 task :test do 
   require 'rake/testtask'
-  Rake::TestTask.new do |t|
+
+  Rake::TestTask.new(:test) do |t|
+    t.libs << 'lib'
     t.libs << 'test'
-    t.test_files = FileList['test/**/*_test.rb']
-    t.verbose = true
+    t.pattern = 'test/**/*_test.rb'
+    t.verbose = false
   end
 end
 

data/lib/spreadsheet_architect/class_methods/ods.rb

@@ -47,8 +47,22 @@ module SpreadsheetArchitect
 
         options[:data].each_with_index do |row_data, index|
           row do 
-            row_data.each_with_index do |y,i|
-              cell y, style: :row_style, type: (options[:types][i] if options[:types])
+            row_data.each_with_index do |val, i|
+              if options[:types]
+                type = options[:types][i]
+              end
+
+              if type
+                if [:date, :time].include?(type)
+                  type = :string
+                  val = val.to_s
+                end
+              elsif val.respond_to?(:strftime)
+                type = :string
+                val = val.to_s 
+              end
+
+              cell val, style: :row_style, type: (options[:types][i] if options[:types])
             end
           end
         end

data/lib/spreadsheet_architect/monkey_patches/axlsx_column_width.rb

@@ -1,4 +1,33 @@
-if defined? Axlsx
+if RUBY_VERSION.to_f >= 2
+
+  module SpreadsheetArchitect
+    module AxlsxColumnWidthPatch
+      def initialize(*args)
+        @width = nil
+        super
+      end
+
+      def width=(v)
+        if v.nil?
+          @custom_width = false
+          @width = nil
+        elsif @width.nil? || @width < v+5
+          @custom_width = true
+          @best_fit = true
+          @width = v + 5
+        end
+      end
+    end
+  end
+
+  module Axlsx
+    class Col
+      prepend ::SpreadsheetArchitect::AxlsxColumnWidthPatch
+    end
+  end
+
+else
+
   module Axlsx
     class Col
       original_initialize = instance_method(:initialize)
@@ -13,11 +42,12 @@ if defined? Axlsx
           @custom_width = false
           @width = nil
         elsif @width.nil? || @width < v+5
-          @custom_width = @best_fit = v != nil
+          @custom_width = true
+          @best_fit = true
           @width = v + 5
         end
       end
-
     end
   end
+
 end

data/lib/spreadsheet_architect/utils/xlsx.rb

@@ -28,27 +28,48 @@ module SpreadsheetArchitect
         styles = {} unless styles.is_a?(Hash)
         styles = self.symbolize_keys(styles)
 
-        if styles[:color].respond_to?(:sub) && !styles[:color].empty?
-          styles[:fg_color] = styles.delete(:color).sub('#','')
+        if styles[:fg_color].nil?
+          if styles[:color].respond_to?(:sub) && !styles[:color].empty?
+            styles[:fg_color] = styles.delete(:color).sub('#','')
+          end
         end
 
-        if styles[:background_color].respond_to?(:sub) && !styles[:background_color].empty?
-          styles[:bg_color] = styles.delete(:background_color).sub('#','')
+        if styles[:bg_color].nil?
+          if styles[:background_color].respond_to?(:sub) && !styles[:background_color].empty?
+            styles[:bg_color] = styles.delete(:background_color).sub('#','')
+          end
         end
-
-        if styles[:align]
+        
+        if styles[:alignment].nil? && styles[:align]
           if styles[:align].is_a?(Hash)
-            styles[:alignment] = {horizontal: styles[:align][:horizontal], vertical: styles[:align][:vertical]}
-            styles.delete(:align)
+            styles[:alignment] = {
+              horizontal: styles[:align][:horizontal], 
+              vertical: styles[:align][:vertical], 
+              wrap_text: styles[:align][:wrap_text]
+            }
           else
             styles[:alignment] = {horizontal: styles.delete(:align)}
           end
+
+          styles.delete(:align)
+        end
+
+        if styles[:b].nil?
+          styles[:b] = styles.delete(:bold)
         end
-        styles[:b] = styles.delete(:bold) || styles[:b]
-        styles[:sz] = styles.delete(:font_size) || styles[:sz]
-        styles[:i] = styles.delete(:italic) || styles[:i]
-        styles[:u] = styles.delete(:underline) || styles[:u]
 
+        if styles[:sz].nil?
+          styles[:sz] = styles.delete(:font_size)
+        end
+
+        if styles[:i].nil?
+          styles[:i] = styles.delete(:italic)
+        end
+
+        if styles[:u].nil?
+          styles[:u] = styles.delete(:underline)
+        end
+        
         styles.delete_if{|k,v| v.nil?}
       end
 
@@ -106,19 +127,16 @@ module SpreadsheetArchitect
 
       private
 
-      # only converts the first 2 levels
       def self.symbolize_keys(hash={})
         new_hash = {}
-        hash.each do |k,v|
+        hash.each do |k, v|
           if v.is_a?(Hash)
-            v.each do |k2,v2|
-              new_hash[k2.to_sym] = v2
-            end
+            new_hash[k.to_sym] = self.symbolize_keys(v)
           else
             new_hash[k.to_sym] = v
           end
         end
-        return new_hash
+        new_hash
       end
 
     end

data/lib/spreadsheet_architect/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetArchitect
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/test/custom_assertions.rb

@@ -0,0 +1,21 @@
+def assert_changed(expression, &block)
+  if expression.respond_to?(:call)
+    e = expression
+  else
+    e = lambda{ eval(expression, block.binding) }
+  end
+  old = e.call
+  block.call
+  assert_not_equal old, e.call
+end
+
+def assert_not_changed(expression, &block)
+  if expression.respond_to?(:call)
+    e = expression
+  else
+    e = lambda{ eval(expression, block.binding) }
+  end
+  old = e.call
+  block.call
+  assert_equal old, e.call
+end

data/test/{rails_app → dummy_app}/Rakefile

@@ -1,6 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require_relative 'config/application'
+require File.expand_path('../config/application', __FILE__)
 
-Rails.application.load_tasks
+Dummy::Application.load_tasks

data/test/dummy_app/app/assets/stylesheets/application.css

@@ -0,0 +1,3 @@
+/*
+ *= require_self
+*/

data/test/{rails_app → dummy_app}/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery with: :exception
+  protect_from_forgery
 end