xlsxtream_rails 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5502fc92614bd2379b7af762136ac5d37621264a14a8c95dd0c1675c06f8f8c1
-  data.tar.gz: cf4eb50326cf589174c1dc941392a12f054d5142c48d2293b210100f37551403
+  metadata.gz: fb7b7fd3f2a753ee4d340d45f2ef418657be92a6608aed395974626351cf2b57
+  data.tar.gz: 7f7024c814a6009ebbc6a397bc6ad74cebe3631a670f7971e77df369df0bcb47
 SHA512:
-  metadata.gz: 1171bb419c8a365726ed516eb46f53ef6a658462ad1a810629ecec67fb69c040afcbe0c6d41adf785edf7da33161bb41cfd10008d163d5c79ed5ce783c89a81f
-  data.tar.gz: 70566d1a3ff138d3840a343e6e6a6218fd13636764784a87656149856d702f3aa34d48ad5a409221c2ec9da0297adcdc974f09ae5c88abe65601e86269526e58
+  metadata.gz: 9b91045886b6a4e51e3c384b0fd81e95a709180a6c14b12932c8911b4896bb5bf35208dbbc990a7c8b6a5a8ef13951cd6bc3702f03b47754cff0a25d676ed663
+  data.tar.gz: d314332d9e79b0af2158848dc7a31160272836c7f09af3e95cf08b8fb3645bd4ef9a29af3c7b4e28da97ba32c0d2e348b79ce3f3d7c4193ac48916ac803c9c5d

data/lib/xlsxtream_rails/action_controller.rb

@@ -12,7 +12,7 @@ ActionController::Renderers.add :xlsx do |data, options|
   options[:filename] ||= if defined?(ActiveRecord) && data.is_a?(ActiveRecord::Relation)
     "#{data.klass.model_name.human}_#{Time.now.to_i}"
   else
-    Time.now.to_i
+    Time.now.to_i.to_s
   end
 
   options[:filename] = options[:filename] ? options[:filename].strip.sub(/\.xlsx$/i, "") : "data"

data/lib/xlsxtream_rails/class_methods.rb

@@ -0,0 +1,8 @@
+module XlsxtreamRails
+  module ClassMethods
+    # TODO
+    def to_xlsx
+      column_names.map { |x| x.to_sym }
+    end
+  end
+end

data/lib/xlsxtream_rails/utils.rb

@@ -10,13 +10,13 @@ module XlsxtreamRails
           instance_cols = instance.xlsx_columns
           instance_cols.each_with_index do |x, i|
             if x.is_a?(Array)
-              headers.push(x[0].to_s) if needs_headers
+              headers.push(i18n_attr(instance, x[0])) if needs_headers
               row_data.push(x[1].is_a?(Symbol) ? instance.send(x[1]) : x[1])
               if needs_column_types
                 column_types[i] = x[2]
               end
             else
-              headers.push(str_titleize(x.to_s)) if needs_headers
+              headers.push(i18n_attr(instance, x)) if needs_headers
               row_data.push(x.is_a?(Symbol) ? instance.send(x) : x)
             end
           end
@@ -27,11 +27,9 @@ module XlsxtreamRails
       end
     end
 
-    def self.str_titleize(str)
-      str.sub(/\A_+/, "")
-        .gsub(/[_.]/, " ")
-        .sub(" rescue nil", "")
-        .gsub(/(\A|\ )\w/) { |x| x.upcase }
+    def self.i18n_attr(instance, attr)
+      attr = attr.is_a?(Symbol) ? attr : attr.to_sym
+      instance.class.human_attribute_name(attr)
     end
   end
 end

data/lib/xlsxtream_rails/version.rb

@@ -1,3 +1,3 @@
 module XlsxtreamRails
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/lib/xlsxtream_rails.rb

@@ -1,11 +1,15 @@
 require "xlsxtream"
+require "xlsxtream_rails/class_methods"
 require "xlsxtream_rails/utils"
 require "xlsxtream_rails/version"
 require "xlsxtream_rails/railtie"
 
 module XlsxtreamRails
+  def self.included(base)
+    base.send(:extend, ClassMethods)
+  end
+
   def xlsx_columns(opts = {})
-    column_names = self.class.column_names
-    column_names.map { |x| x.to_sym }
+    self.class.to_xlsx
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlsxtream_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - doabit
@@ -51,6 +51,7 @@ files:
 - lib/tasks/xlsxtream_rails_tasks.rake
 - lib/xlsxtream_rails.rb
 - lib/xlsxtream_rails/action_controller.rb
+- lib/xlsxtream_rails/class_methods.rb
 - lib/xlsxtream_rails/railtie.rb
 - lib/xlsxtream_rails/utils.rb
 - lib/xlsxtream_rails/version.rb