spreadsheet_architect 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a09ba577c1c7cb53b31efd115a3e0d57b046e5f
-  data.tar.gz: b0eb7bd864fb407b2525321eca235ef128871990
+  metadata.gz: 27a117a492113cfe43d238d3eb202961fe951a94
+  data.tar.gz: 3fb49d5a3970d4321e02e56489ffac22b920c14c
 SHA512:
-  metadata.gz: 6a06647631a88d4f8432c074b342d7805e82bd64465738a4df67933ce84fa78b63a1dd7d216cf034a81d2aa79be7beb856f666271b10def6fa1607d5156822e7
-  data.tar.gz: 05c93847437a5a6008eda393af431496fae0beaa29c1b1de3fab706b9ccb38c4c4b4be263a32892b6f81378a6710b165be81438402220cacd09af858de140574
+  metadata.gz: 6885c1ad45d21e5f1e615ff21717328252a9a1b52981d4a4b70512a20b258c2a74786f9039ff7e2124373186bc15c51d8377ee10e6b87f7f12ad89e29dce4e4d
+  data.tar.gz: 07a7b5642b11746a1aa4602375a90dd962f2321df741ba84c4ea1ba292494786e5345aa8e092ab58411ae8afca630eb89d906484b1990615d21772bff495f6b6

data/README.md

@@ -40,12 +40,15 @@ 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]....]
+    #[[Label, Method/Statement to Call on each Instance, Cell Type(optional)]....]
     [
       ['Title', :title],
       ['Content', content],
       ['Author', (author.name rescue nil)],
       ['Published?', (published ? 'Yes' : 'No')],
+      ['Published At', :published_at],
+      ['# of Views', :number_of_views],
+      ['Rating', :rating],
       ['Category/Tags', "#{category.name} - #{tags.collect(&:name).join(', ')}"]
     ]
 

data/lib/spreadsheet_architect.rb

@@ -31,10 +31,16 @@ module SpreadsheetArchitect
       return str
     end
 
-    def self.get_type(value, type=nil)
-      #return type if !type.blank?
-      if value.is_a?(Numeric) || [:integer, :float, :decimal].include?(type)
-        type = :float
+    def self.get_type(value, type=nil, last_run=false)
+      return type if !type.blank?
+      if value.is_a?(Numeric)
+        if [:float, :decimal].include?(type)
+          type = :float
+        else
+          type = :integer
+        end
+      elsif !last_run && value.is_a?(Symbol)
+        type = :symbol
       else
         type = :string
       end
@@ -64,11 +70,12 @@ module SpreadsheetArchitect
         columns = []
         types = []
         array = options[:spreadsheet_columns] || options[:data].first.spreadsheet_columns
-        array.each do |x|
+        array.each_with_index do |x,i|
           if x.is_a?(Array)
             headers.push x[0].to_s
             columns.push x[1]
-            types.push self.get_type(x[1], x[2])
+            #types.push self.get_type(x[1], x[2])
+            types.push self.get_type(x[1], nil)
           else
             headers.push str_humanize(x.to_s)
             columns.push x
@@ -95,6 +102,15 @@ module SpreadsheetArchitect
           data.push columns.map{|col| col.is_a?(Symbol) ? instance.instance_eval(col.to_s) : col}
         end
       end
+      
+      # Fixes missing types from symbol methods
+      if has_custom_columns || options[:spreadsheet_columns]
+        options[:data].first.each_with_index do |x,i|
+          if types[i] == :symbol
+            types[i] = self.get_type(x, nil, true)
+          end
+        end
+      end
 
       headers = (options[:headers] == false ? false : headers)
 

data/lib/spreadsheet_architect/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetArchitect
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_architect
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx