arql 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6af50a307ab63970a4f0f92e789beae23cd38b613ae0dc74f864b3b06257952f
-  data.tar.gz: cf61cda1b04000830cbbd0c012ea9d5bb16aed2cf01ba2eb8b53a3b581e9f80c
+  metadata.gz: 59eda4176935ad6c21bff248beac1078df7c44239f17c5febd60cd3af5617b34
+  data.tar.gz: f6362e715937b0792285ded2d9d10dc00a1e4e9cb224ec7e6ac01ea67d08f268
 SHA512:
-  metadata.gz: 710b210b12ea9be344e515fbd6fbeb07b6387024b8f13616782effb1070efb0ea2b144bcd7a095d25fdf07d43542473e8a0e77d8224e94f29a8aa7662156dd45
-  data.tar.gz: e37353c09931d7c998430d1e4e891a49fbe3e5837c571f400e578fdfa974b43aecf7f76eb3a7810e0db25406c541e509554e5e70555b14b6a694b31875550100
+  metadata.gz: 50c7e6ac7e3014bc25a7b345ac126b61b79a194907d728140deef9a62ef2adc64947dc84cfad5870894005c3b1a48b7b1c96daee2708fac423ed71a207dbba96
+  data.tar.gz: 825621c088e16302953709aa518e5d19f5064212852b65cb230f685e10b47972400eeb2e77b921fa57fb16a8eb9af743e684a60d7d7bc7cfb0e8a61551608131

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.2.11)
+    arql (0.2.12)
       activerecord (~> 6.0.3)
       activesupport (~> 6.0.3)
       caxlsx (~> 3.0.2)
@@ -88,4 +88,4 @@ DEPENDENCIES
   rake (~> 12.0)
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/lib/arql/ext/array.rb

@@ -83,11 +83,17 @@ class Array
         end
         csv << fields
       end
+      if size > 0 && first.is_a?(Hash)
+        if fields.empty?
+          fields = first.keys
+        end
+        csv << fields
+      end
       each do |row|
         if row.is_a?(Array)
           csv << row.map(&:to_s)
         else
-          csv << row.slice(fields).values.map(&:to_s)
+          csv << row.slice(*fields).values.map(&:to_s)
         end
       end
     end
@@ -105,11 +111,17 @@ class Array
           end
           sheet.add_row(fields, types: [:string] * fields.size)
         end
+        if size > 0 && first.is_a?(Hash)
+          if fields.empty?
+            fields = first.keys
+          end
+          sheet.add_row(fields, types: [:string] * fields.size)
+        end
         each do |row|
           if row.is_a?(Array)
             sheet.add_row(row.map(&:to_s), types: [:string] * row.size)
           else
-            sheet.add_row(row.slice(fields).values.map(&:to_s), types: [:string] * fields.size)
+            sheet.add_row(row.slice(*fields).values.map(&:to_s), types: [:string] * fields.size)
           end
         end
       end

data/lib/arql/ext/hash.rb

@@ -3,19 +3,35 @@ class Hash
     generate_excel(filename) do |workbook|
       each do |sheet_name, sheet_data|
         workbook.add_worksheet(name: sheet_name) do |sheet|
-          if sheet_data.is_a?(Hash) && sheet_data[:fields].present?
-              fields = sheet_data[:fields].map(&:to_s)
-            else
-              fields = sheet_data[:data].first.attributes.keys
-            end
+          if sheet_data.is_a?(Hash)
+            fields = sheet_data[:fields].map(&:to_s)
             sheet.add_row(fields, types: [:string] * fields.size)
-            sheet_data = sheet_data[:data]
+            sheet_data[:data].each do |row|
+              sheet.add_row(row.slice(*fields).values.map(&:to_s), types: [:string] * fields.size)
+            end
           end
-          sheet_data.each do |row|
-            if row.is_a?(Array)
-              sheet.add_row(row.map(&:to_s), types: [:string] * row.size)
-            else
-              sheet.add_row(row.slice(fields).values.map(&:to_s), types: [:string] * fields.size)
+
+          if sheet_data.is_a?(Array)
+            if sheet_data.size > 0 && sheet_data.first.is_a?(ActiveModel::Base)
+              fields = sheet_data.first.attributes.keys
+              sheet.add_row(fields, types: [:string] * fields.size)
+              sheet_data.each do |row|
+                sheet.add_row(row.slice(*fields).values.map(&:to_s), types: [:string] * fields.size)
+              end
+            end
+
+            if sheet_data.size > 0 && sheet_data.first.is_a?(Hash)
+              fields = sheet_data.first.keys
+              sheet.add_row(fields, types: [:string] * fields.size)
+              sheet_data.each do |row|
+                sheet.add_row(row.slice(*fields).values.map(&:to_s), types: [:string] * fields.size)
+              end
+            end
+
+            if sheet_data.size > 0 && sheet_data.first.is_a?(Array)
+              sheet_data.each do |row|
+                sheet.add_row(row.map(&:to_s), types: [:string] * fields.size)
+              end
             end
           end
         end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Rails ActiveRecord + Pry is the best SQL query editor