rails-exporter 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f092eb3c1d10ec00dd96383ccb60a4d9daa47b9
-  data.tar.gz: dfd8868ef3f439789b6ba01a061428771b9ea70c
+  metadata.gz: 41c61f002ac8a7a320d997dbd776883f559fb663
+  data.tar.gz: 4d218e2bcb266c62e6d5bb65c0da8fa19c475eb0
 SHA512:
-  metadata.gz: 39a4e109001bb5958900932bb7549f73ba4d38b0158192dc5d136d5d7f8166bc0fa755d0d98f56ac81b74a0a36bcf268e3b4ef25c14511b07b4ca785d92faac4
-  data.tar.gz: 8fe71d7a706c058f0565575d5a3fdbfeff81af9cc4a84c5c2676225adcfd881dfdc34ada2d9f0336d5f02fd43a49db408e100c40d6a5fb2878ed7e18c83903f3
+  metadata.gz: 2633fe4f71f8080bead1dbdd3aecf34657202d47fa1e44d8e844d45fd75ba85da5b6272e7d6e9fe78bbfefaea7980ea22be92eca014133974b2c34b42eb0da4c
+  data.tar.gz: db69716d162786d25c50da66714e4b701ed315a5129f80192cf686a0904e7883e2fcd2f97cf2fc30d4fd5b9cac6022c8c321f7bac9405ece8747be70c4a800a1

data/lib/rails_exporter/base.rb

@@ -34,13 +34,11 @@ module RailsExporter
         end
 
         label = I18n.t(attribute, default: [attribute.to_s.humanize], scope: [:exporters, @exporter_name])
-        self.exporters[@exporter_name] << {column: attribute, label: label, type: normalize_type(type), block: block}
+        self.exporters[@exporter_name] << {column: attribute, label: label, type: normalize_type(type), block: (block_given? ? block : nil)}
       end
 
       def columns(exporter_name=:default)
-        self.exporters[exporter_name].map do |attribute|
-          attribute.slice(:column, :label, :type)
-        end
+        self.exporters[exporter_name]
       end
 
       private

data/lib/rails_exporter/exporter.rb

@@ -34,8 +34,7 @@ module RailsExporter
             xml.record do |r|
               i = 0
               get_columns(context).map do |attr|
-                attr = attr.keys.first if attr.is_a?(Hash)
-                xml.tag!(attr, get_values[i], {title: attr_name(attr)})
+                xml.tag!(attr[:column], get_values[i], {title: attr_name(attr)})
                 i+=1
               end
             end
@@ -56,8 +55,7 @@ module RailsExporter
         spreadsheet.row(0).default_format = Spreadsheet::Format.new :weight => :bold
         #HEADER
         get_columns(context).each_with_index do |attr, i|
-          attr = attr.keys.first if attr.is_a?(Hash)
-          spreadsheet.row(0).insert i, (self.human_attribute_name(attr) || attr)
+          spreadsheet.row(0).insert i, attr_name(attr)
         end
         #ROWS
         records.each_with_index do |record, i|
@@ -81,13 +79,12 @@ module RailsExporter
 
       def get_values(record, context)
         get_columns(context).map do |attribute|
-          if attribute[:block].is_a?(Proc)
+          unless attribute[:block].nil?
             value = attribute[:block].call(record)
-            value.to_s
           else
             value = (record.send(attribute[:column]) rescue '')
-            normalize_value(value, attribute[:type])
           end
+          normalize_value(value, attribute[:type])
         end
       end
 

data/lib/rails_exporter/version.rb

@@ -1,3 +1,3 @@
 module RailsExporter
-  VERSION = "0.0.3"
-end
+  VERSION = "0.0.6"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-exporter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Bruno Porto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet