ntq_excelsior 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84b27eb6270d0a9527ca77e3c3b9d93328ef2151b14703c796bc07565a16767a
-  data.tar.gz: ef00357a9c9a2e1c1bc54d6b3ecbe2cc935ce8ba93452acba4d6ecd6a9ed1d94
+  metadata.gz: d1f1c651087df6ca7f9dea48884d8976b210294cb95a2577a3048f57ac8488ee
+  data.tar.gz: ce39afeae3e37049578a191dea797ce8c7cb06be31c3e60fb726cb823a93140f
 SHA512:
-  metadata.gz: 830dd162264d62ac828b52d6dd428f251936b2659fb92e5b34ed3e6809bc84e5b2165c804b637685c1e2a82afcbda86685c9afc663149ce000c103ad0954157f
-  data.tar.gz: 0baa0a8bc9807bc405d55598d498d731239a1a39823c044784a9ea7c352258ce3b9216d3ded2a329c521a908b0a1ac9f0c7d72bbaa56c09f1ae788e00aca75f5
+  metadata.gz: 62c3a791e7fce170b95c2fcd07fa4c9410b57c7aa10570925169cdfa2f38ee603c102a59fafeb49db077ddba9b9644bd6380662105936f12f033c04794d55f33
+  data.tar.gz: c22d31f130c0d0c3ae5f9a52f346255cb0926ad5c56f93880ba12dc8e622260c12a8e35de0eca1bb2d4a58c50bb4fd3d1d2037c53d377fbf3e618b6ed804db24

data/README.md

@@ -49,8 +49,7 @@ class UserExporter < NtqExcelsior::Exporter
       },
       {
         title: 'Birthdate',
-        resolve: 'birthdate',
-        type: :date
+        resolve: 'birthdate'
       }
       {
         title: 'Address (nested)',
@@ -59,6 +58,11 @@ class UserExporter < NtqExcelsior::Exporter
       {
         title: 'City (nested)',
         resolve: ['address', 'city']
+      },
+      {
+        title: 'Age',
+        resolve: 'age',
+        type: :number
       }
     ]
   })

data/lib/ntq_excelsior/exporter.rb

@@ -5,6 +5,12 @@ module NtqExcelsior
     attr_accessor :data
 
     DEFAULT_STYLES = {
+      date_format: {
+        format_code: 'dd-mm-yyyy'
+      },
+      time_format: {
+        format_code: 'dd-mm-yyyy hh:mm:ss'
+      },
       bold: {
         b: true
       },
@@ -73,12 +79,13 @@ module NtqExcelsior
       count
     end
 
-    def get_styles(row_styles)
-      return {} unless row_styles && row_styles.length > 0
+    def get_styles(row_styles, cell_styles = [])
+      row_styles ||= []
+      return {} if row_styles.length == 0 && cell_styles.length == 0
 
       styles_hash = {}
       stylesheet = styles || {}
-      row_styles.each do |style_key|
+      (row_styles + cell_styles).each do |style_key|
         styles_hash = styles_hash.merge(stylesheet[style_key] || DEFAULT_STYLES[style_key] || {})
       end
       styles_hash
@@ -115,14 +122,26 @@ module NtqExcelsior
     end
 
     def format_value(resolver, record)
-      return resolver.call(record) if resolver.is_a?(Proc)
-      
-      accessors = resolver
-      accessors = accessors.split(".") if accessors.is_a?(String)
-      value = dig_value(record, accessors)
-      value = value.strftime("%Y-%m-%d") if value.is_a?(Date)
-      value = value.strftime("%Y-%m-%d %H:%M:%S") if value.is_a?(Time) | value.is_a?(DateTime)
-      value
+      styles = []
+      type = nil
+      if resolver.is_a?(Proc)
+        value = resolver.call(record) 
+      else
+        accessors = resolver
+        accessors = accessors.split(".") if accessors.is_a?(String)
+        value = dig_value(record, accessors)
+      end
+      if value.is_a?(Date)
+        value = value.strftime("%Y-%m-%d")
+        styles << :date_format
+        type = :date
+      end
+      if value.is_a?(Time) | value.is_a?(DateTime)
+        value = value.strftime("%Y-%m-%d %H:%M:%S")
+        styles << :time_format
+        type = :time
+      end
+      { value: value, styles: styles, type: type }
     end
 
     def resolve_record_row(schema, record, index)
@@ -130,10 +149,10 @@ module NtqExcelsior
       col_index = 1
       schema.each do |column|
         width = column[:width] || 1
-        row[:values] << format_value(column[:resolve], record)
-        row[:types] << column[:type] || :string
-        row[:styles] << get_styles(column[:styles])
-        
+        formatted_value = format_value(column[:resolve], record)
+        row[:values] << formatted_value[:value]
+        row[:types] << (column[:type] || formatted_value[:type])
+        row[:styles] << get_styles(column[:styles], formatted_value[:styles])
         if width > 1
           colspan = width - 1
           row[:values].push(*Array.new(colspan, nil))
@@ -143,7 +162,6 @@ module NtqExcelsior
 
         col_index += 1
       end
-
       row
     end
 

data/lib/ntq_excelsior/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NtqExcelsior
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ntq_excelsior
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kevin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx