xlsxtream_rails 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a54b0cad604244bd9547c4b096192ac193b7e326dc4b013eab909b78edea6c2
-  data.tar.gz: e565f309ddb38b134d307c1558dad4a2b0696787688af64853923de4bbbde1d9
+  metadata.gz: 744d930605ccd3e7d39a90dc38887739001a5725f20ca7a43ef046a52b030945
+  data.tar.gz: de0b14ad7f35d31961ce91bc5522dfe380c66b95f0f12857c431bf0580838f56
 SHA512:
-  metadata.gz: cac8f0033dd5a7d1b2af96243e011d573da24885a2013ce819d66d806da6b28b88c18d30f6c9cd9bd96d61402df45bdd6081efe57a9ea2b2badcbec67728e66d
-  data.tar.gz: 1dfa9fffbdc4092d0ae4641d5311eaa27940fcad75af1b28645f75109622ea4543243ec3ef70fb45172c065359158326647d88b80995098243431f61590e1a7d
+  metadata.gz: 9f3761bd105dc7f803c1b929e1f402483143eafe4e6c030e4653cc091d395f48a8ed3aa27cae5594c1797eca64ceee2ba5e42425149a30a6c6dd9f5f684a5228
+  data.tar.gz: 61a863cbc7e32cf755e92e9ee5d9dfc9fb2fb1ddd56e852dc4d722ea56ce47b9427b5bb077a1dcac94ab30cb4e69b51de8d39f90550f7d9525ed2c5ed47b96ab

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

@@ -2,7 +2,11 @@ module XlsxtreamRails
   module ClassMethods
     # TODO
     def to_xlsx
-      column_names.map { |x| x.to_sym }
+      (column_names - except_xlsx_columns).map { |x| x.to_sym }
+    end
+
+    def except_xlsx_columns
+      []
     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.5.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsxtream_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - doabit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails