spreadsheet_architect 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be2d251d985ed779019709a19cd14047e8f26c18
-  data.tar.gz: 5076391ee7d477af958ef6f9dd1cbc438695c57a
+  metadata.gz: 155a653969b09467dd11207dee1a4b4a208b316b
+  data.tar.gz: d7c94501ad36264f26e9285d21ebef0546e89067
 SHA512:
-  metadata.gz: 87ea6396eb5bed677c7fce4bec9da8588620ecd247ea4bbb9fbf964908809803f27e7959527917a8a404b981f60c31d025b76ea92c16856e0f06f36e84f21790
-  data.tar.gz: 3c5022fd0922a7c2fc2eeec0fbdce445b75ef9a8439b561d412b6c1564b9091de5f89f4d4db414e4243cbe83efb961c2baa881a93474a765884a55c09483306b
+  metadata.gz: c801aa14de7c5f8c10b7c20aaecb59cb50fbf956ef7a59cccd8e04c3d9cc69ad1773254b296e90c96c786a1c8e387eb49586106a681416a9e7fa7b1941c7978f
+  data.tar.gz: 0732d0406412a5aec37a37c2558a3bce488fa66c5118d08893bdac9d5dac242d9142a7bb8f5112f16e071115702f05c818f96fedbaaa1deb37026477420daf38

data/README.md

@@ -107,7 +107,7 @@ end
 
 **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 - Default: `{background_color: "FFFFFF", color: "FFFFFF", align: :left, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false}`
+**row_style** - Hash - Default: `{background_color: nil, color: "FFFFFF", align: :left, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false}`
 
 ### to_ods
 **sheet_name** - *String*

data/lib/spreadsheet_architect.rb

@@ -12,7 +12,7 @@ module SpreadsheetArchitect
 
   module ClassMethods
     def sa_str_humanize(str, capitalize = true)
-      str = str.sub(/\A_+/, '').sub(/_id\z/, '').gsub(/[_\.]/,' ').sub(' rescue nil','')
+      str = str.sub(/\A_+/, '').gsub(/[_\.]/,' ').sub(' rescue nil','')
       if capitalize
         str = str.gsub(/(\A|\ )\w/){|x| x.upcase}
       end
@@ -21,8 +21,9 @@ module SpreadsheetArchitect
 
     def sa_get_options(options={})
       if self.ancestors.include?(ActiveRecord::Base) && !self.respond_to?(:spreadsheet_columns) && !options[:spreadsheet_columns]
-        headers = self.column_names.map{|x| x.humanize}
-        columns = self.column_names.map{|x| x.to_s}
+        the_column_names = (self.column_names - ["id","created_at","updated_at","deleted_at"])
+        headers = the_column_names.map{|x| sa_str_humanize(x)}
+        columns = the_column_names.map{|x| x.to_s}
       elsif options[:spreadsheet_columns] || self.respond_to?(:spreadsheet_columns)
         headers = []
         columns = []
@@ -50,11 +51,9 @@ module SpreadsheetArchitect
         header_style.merge!(options[:header_style])
       elsif options[:header_style] == false
         header_style = false
-      elsif options[:row_style]
-        header_style = options[:row_style]
       end
 
-      row_style = {background_color: "FFFFFF", color: "000000", align: :left, bold: false, font_name: 'Arial', font_size: 10, italic: false, underline: false}
+      row_style = {background_color: nil, 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
@@ -85,7 +84,7 @@ module SpreadsheetArchitect
             col = col.instance_eval(x)
           end
         end
-        row_data.push col
+        row_data.push col.to_s
       end
       return row_data
     end
@@ -109,7 +108,7 @@ module SpreadsheetArchitect
 
       spreadsheet.office_style :header_style, family: :cell do
         if options[:header_style]
-          unless opts[:row_style] && opts[:row_style][:bold] == false #uses opts, temporary
+          unless opts[:header_style] && opts[:header_style][:bold] == false #uses opts, temporary
             property :text, 'font-weight': :bold
           end
           if options[:header_style][:align]
@@ -169,13 +168,14 @@ module SpreadsheetArchitect
       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]
+        header_style[:alignment][:horizontal] = options[:header_style].delete(: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)
-      
+      header_style.delete_if{|x| x.nil?}
+
       row_style = {}
       row_style[:fg_color] = options[:row_style].delete(:color)
       row_style[:bg_color] = options[:row_style].delete(:background_color)
@@ -187,6 +187,7 @@ module SpreadsheetArchitect
       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)
+      row_style.delete_if{|x| x.nil?}
       
       package = Axlsx::Package.new
 

data/lib/spreadsheet_architect/action_controller_renderers.rb

@@ -1,13 +1,23 @@
 if defined? ActionController
   ActionController::Renderers.add :xlsx do |data, options|
+    if data.is_a?(ActiveRecord::Relation)
+      options[:filename] = data.model.name.pluralize
+      data = data.to_xlsx
+    end
     send_data data, type: :xlsx, disposition: :attachment, filename: "#{options[:filename] ? options[:filename].sub('.xlsx','') : 'data'}.xlsx"
   end
   ActionController::Renderers.add :ods do |data, options|
+    if data.is_a?(ActiveRecord::Relation)
+      options[:filename] = data.model.name.pluralize
+      data = data.to_ods
+    end
     send_data data, type: :ods, disposition: :attachment, filename: "#{options[:filename] ? options[:filename].sub('.ods','') : 'data'}.ods"
   end
   ActionController::Renderers.add :csv do |data, options|
+    if data.is_a?(ActiveRecord::Relation)
+      options[:filename] = data.model.name.pluralize
+      data = data.to_csv
+    end
     send_data data, type: :csv, disposition: :attachment, filename: "#{options[:filename] ? options[:filename].sub('.csv','') : 'data'}.csv"
   end
-
-
 end

data/lib/spreadsheet_architect/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_architect
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Weston Ganger