arql 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85fcbdbbbb1fb63922b682ab5e666510d22305e59606379db57dca8d04eebf26
-  data.tar.gz: 3176979b46fd4021f149aa6c04ea44b5ddb76a522b065d89d7cb6c82ce37ed7f
+  metadata.gz: e38b5865065ed505f7b673f61ad896ff1705334311f559d23124b9c73eae4832
+  data.tar.gz: bd5fc96a17c9ebd68d158da1a867e7f6f40c398caaa647bc3c2512cefa4aa311
 SHA512:
-  metadata.gz: 575529d3c8aaa704aba90b1626310263e2900a13619637da651e3a4611f514c81bac68032d63955b082952539d7e4dcec77adbd902739584ef3924b83f1945c0
-  data.tar.gz: 479fbf975df4afb3d60068ad7bde49cb3167da461369cd0476b2867674b98e82ac44f8e512e15885724f69a238c80f2314d765a648680a76bb1791a6f7ff9659
+  metadata.gz: adce379a72d895d75ccfa1b2f29da270efb64237b3bcaec2a016d163631dcc09e674e2cb88920a44d53eb80551742b6a68d5385dbd8c7e2b43ddaa8bdc69bd04
+  data.tar.gz: 6d5a756fa71239e7b7cbc734d7ca1227388d17581491c153a146ae7f6828859dc4bc6ae4edbd674fb981161a0e7c803a0e5cf54f06ca48a483858188a551fc0e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.1.12)
+    arql (0.1.13)
       activerecord (~> 6.0.3)
       activesupport (~> 6.0.3)
       mysql2 (~> 0.5.3)

data/lib/arql/ext/array.rb

@@ -14,13 +14,26 @@ class Array
   end
 
   def v
-    raise 'Empty array' unless present?
-    raise 'All elements must be instances of the same ActiveRecord model class' unless map(&:class).uniq.size == 1 && first.is_a?(ActiveRecord::Base)
+    return self unless present?
     t = []
-    t << first.attribute_names
-    t << nil
-    each do |e|
-      t << e.attributes.values_at(*first.attribute_names).map(&:as_json)
+    if map(&:class).uniq.size == 1
+      if first.is_a?(ActiveRecord::Base)
+        t << first.attribute_names
+        t << nil
+        each do |e|
+          t << e.attributes.values_at(*first.attribute_names).map(&:as_json)
+        end
+      elsif first.is_a?(Array)
+        t = map { |a| a.map(&:as_json) }
+      elsif first.is_a?(Hash) || first.is_a?(ActiveSupport::HashWithIndifferentAccess)
+        t << first.keys
+        t << nil
+        each do |e|
+          t << e.values_at(*first.keys).map(&:as_json)
+        end
+      else
+        return self
+      end
     end
     t
   end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Liu Xiang