spreadsheet_architect 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f42b3c3c331719c8914df16900f0cda7a976fb16
-  data.tar.gz: 75602032e0744ffd5d95660b211e2d3cde828696
+  metadata.gz: 4e6911d8fb0ff208566956b06e86539b556f4645
+  data.tar.gz: ba207bef1497f6ddc468ad48dda064f14fbc80f1
 SHA512:
-  metadata.gz: 1ce5f2ad942a49b12aab8485dba755d86091b0529d36ad7c118f777244181d26f45a20ca01085aa8af3b1b8183cb3d530efcd7ae2a7fcc74446ec1c05aa10223
-  data.tar.gz: f44c437e1ce567701a7d01f3f1db2f98f6ce834deb49954d7481d2e754cc60b7b90e5cd086d1053f01ef1fa514f88b9b55173eaff0f07dbe9bdeb5c4b972c1ce
+  metadata.gz: b39d5bc1b8289309f89c78782b395d18131a7c582d126d5964f9c80d3b4d36265dac085a198b7bce3a19690ad8e06bb9bbabd8420360cc7c0d24435563ec0373
+  data.tar.gz: 8cd7b96a7471c55114c5d6e8f616e1d3cb94d16b2e1659f89feab82ce36f6eb2121d6a7b2b57e0b6a923d1e38537f3fae773d03732490a2e4417b67d2098c6a8

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 CHANGELOG
 ---------
 
+- **March.3.2016**: 1.2.2
+  - Make cell type numeric if value is numeric
+- **March.3.2016**: 1.2.1
+  - Better error reporting
+  - Fix for Plain ruby models
+- **March.3.2016**: 1.2.0
+  - 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
   - Fix Bug: remove default underline on cells

data/README.md

@@ -16,9 +16,6 @@ Post.order(name: :asc).where(published: true).to_ods
 Post.order(name: :asc).where(published: true).to_csv
 ```
 
-## Note: Major bug fix in 1.2.0
-v.1.1.0 had a major bug in it where it would use only the first records data for non-symbol methods. Please update to 1.2.0 from 1.1.0 as soon as possible.
-
 ## Note: Breaking Changes in 1.1.0
 The `spreadsheet_columns` method has been moved from the class to the instance. So now you can use string interpolation in your values. Please re-read the Model section below to see the changes. The side effect of this is if you are using the spreadsheet_columns option directly on the .to_* methods.
 
@@ -42,6 +39,7 @@ class Post < ActiveRecord::Base #activerecord not required
 
   #optional for activerecord classes, defaults to the models column_names
   def spreadsheet_columns
+
     #[[Label, Method/Statement to Call on each Instance]....]
     [
       ['Title', :title],
@@ -55,7 +53,7 @@ class Post < ActiveRecord::Base #activerecord not required
     [:title, content, (author.name rescue nil), :published]
 
     # OR a Combination of Both
-    [:title, :content, ['Author',(author.name rescue nil)], :published, ]
+    [:title, :content, ['Author',(author.name rescue nil)], :published]
   end
 end
 ```

data/lib/spreadsheet_architect.rb

@@ -28,7 +28,18 @@ module SpreadsheetArchitect
       if capitalize
         str = str.gsub(/(\A|\ )\w/){|x| x.upcase}
       end
-      str
+      return str
+    end
+
+    def self.get_type(value, type=nil)
+      #return type.to_sym if !type.blank?
+      return :string if value.blank?
+      if value.is_a?(Numeric)
+        type = :float
+      else
+        type = :string
+      end
+      return type
     end
 
     def self.get_options(options={}, klass)
@@ -43,20 +54,26 @@ module SpreadsheetArchitect
       end
 
       if !has_custom_columns && defined?(ActiveRecord) && klass.ancestors.include?(ActiveRecord::Base)
-        the_column_names = (klass.column_names - ["id","created_at","updated_at","deleted_at"])
+        ignored_columns = ["id","created_at","updated_at","deleted_at"] 
+        the_column_names = (klass.column_names - ignored_columns)
         headers = the_column_names.map{|x| str_humanize(x)}
         columns = the_column_names.map{|x| x.to_sym}
+        types = klass.columns.keep_if{|x| !ignored_columns.include?(x.name)}.collect(&:type)
+        types.map!{|type| self.get_type(nil, type)}
       elsif has_custom_columns
         headers = []
         columns = []
+        types = []
         array = options[:spreadsheet_columns] || options[:data].first.spreadsheet_columns
         array.each do |x|
           if x.is_a?(Array)
             headers.push x[0].to_s
             columns.push x[1]
+            types.push self.get_type(x[1], x[2])
           else
             headers.push str_humanize(x.to_s)
             columns.push x
+            types.push self.get_type(x, nil)
           end
         end
       else
@@ -97,8 +114,6 @@ module SpreadsheetArchitect
 
       sheet_name = options[:sheet_name] || klass.name
 
-      types = (options[:types] || []).flatten
-
       return {headers: headers, header_style: header_style, row_style: row_style, types: types, sheet_name: sheet_name, data: data}
     end
   end
@@ -164,8 +179,8 @@ module SpreadsheetArchitect
         end
         options[:data].each do |row_data|
           row do 
-            row_data.each do |y|
-              cell y, style: :row_style
+            row_data.each_with_index do |y,i|
+              cell y, style: :row_style, type: options[:types][i]
             end
           end
         end

data/lib/spreadsheet_architect/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetArchitect
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_architect
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx
@@ -127,6 +127,7 @@ files:
 - lib/spreadsheet_architect/version.rb
 - test/database.yml
 - test/helper.rb
+- test/spreadsheet_architect.sqlite3.db
 - test/tc_spreadsheet_architect.rb
 homepage: https://github.com/westonganger/spreadsheet_architect
 licenses: []
@@ -147,11 +148,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Spreadsheet Generator for ActiveRecord Models and Ruby Classes/Modules
 test_files:
-- test/helper.rb
 - test/database.yml
+- test/helper.rb
+- test/spreadsheet_architect.sqlite3.db
 - test/tc_spreadsheet_architect.rb