arql 0.3.20 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4213df09fecc5fbe0095f47e7df8ac016dd7021c4881c11599e56006c4189317
-  data.tar.gz: e66f7ec8f2418714404d19c569e76889ccdfc21cd1668e17a1be0e8fd9a9e569
+  metadata.gz: f4178a1d360f59152ce5fac37b745a98a77ac744090114b6c9d70e89ec4dfe57
+  data.tar.gz: 46520be1d1411eb164160d7e42d81012f5147272014556b6825e3cd122ed483c
 SHA512:
-  metadata.gz: dc3b1afae2f5a7036964272708134085ab9e10a6022827c7e5ca41b09d164527a6ad80430934136b2e63bb2cc13a9fa73525ef1ccb8b48623ce86b643b295a8f
-  data.tar.gz: d3608d06380e34889ea24be7d0b1142b690800cfba1049cfc35f83578652cc8637084dfcd6f7bc432cdf130e7d200a52020856570791fc2e7a4bce1f0a4f9f1e
+  metadata.gz: 377195d8ebfe1a1a1c5c0eac7d31533171bb95452eee33c2a74048b6d620e565d9ac804d821f1a9201ad803448717e20f50ad7e079065273e866e155535bae99
+  data.tar.gz: 3c2a29b255032fc6efc7dc109a557e3e9dc2d8145854fa1d514d9b14551278424b95b81fd6f02d59cfff33a6fa66ae21e1d6cde1a7f408f9ba784189b13d7626

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.3.20)
+    arql (0.3.22)
       activerecord (>= 6.1.5, < 7.1.0)
       activesupport (>= 6.1.5, < 7.1.0)
       caxlsx (~> 3.3.0)
@@ -11,7 +11,7 @@ PATH
       net-ssh-gateway (~> 2.0.0)
       pry (~> 0.14.1)
       pry-byebug (~> 3.10.1)
-      pry-doc (>= 1.3.0)
+      pry-doc (>= 1.4.0)
       rainbow (~> 3.0.0)
       ransack (>= 3.2.1)
       roo (~> 2.9.0)
@@ -42,6 +42,7 @@ GEM
     composite_primary_keys (14.0.4)
       activerecord (~> 7.0.2)
     concurrent-ruby (1.1.10)
+    gem-release (2.2.2)
     htmlentities (4.3.4)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
@@ -66,7 +67,7 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    pry-doc (1.3.0)
+    pry-doc (1.4.0)
       pry (~> 0.11)
       yard (~> 0.9.11)
     racc (1.6.2)
@@ -97,7 +98,8 @@ PLATFORMS
 
 DEPENDENCIES
   arql!
+  gem-release (~> 2.2.2)
   rake (~> 12.0)
 
 BUNDLED WITH
-   2.2.3
+   2.4.1

data/arql.gemspec

@@ -35,11 +35,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'net-ssh-gateway', '~> 2.0.0'
   spec.add_dependency 'pry', '~> 0.14.1'
   spec.add_dependency 'pry-byebug', '~> 3.10.1'
-  spec.add_dependency 'pry-doc', '>= 1.3.0'
+  spec.add_dependency 'pry-doc', '>= 1.4.0'
   spec.add_dependency 'rainbow', '~> 3.0.0'
   spec.add_dependency 'terminal-table', '~> 1.8.0'
   spec.add_dependency 'table_print', '~> 1.5.6'
   spec.add_dependency 'roo', '~> 2.9.0'
   spec.add_dependency 'caxlsx', '~> 3.3.0'
   spec.add_dependency 'ransack', '>= 3.2.1'
+  spec.add_development_dependency "gem-release", "~> 2.2.2"
 end

data/lib/arql/definition.rb

@@ -5,9 +5,9 @@ module Arql
   module Extension
     extend ActiveSupport::Concern
 
-    def t
+    def t(**options)
       puts Terminal::Table.new { |t|
-        v.each { |row| t << (row || :separator) }
+        v(**options).each { |row| t << (row || :separator) }
       }
     end
 
@@ -20,12 +20,17 @@ module Arql
       end
     end
 
-    def v
+    def v(**options)
       t = []
       t << ['Attribute Name', 'Attribute Value', 'SQL Type', 'Comment']
       t << nil
+      compact_mode = options[:compact] || false
       self.class.connection.columns(self.class.table_name).each do |column|
-        t << [column.name, read_attribute(column.name), column.sql_type, column.comment || '']
+        value = read_attribute(column.name)
+        if compact_mode && value.blank?
+          next
+        end
+        t << [column.name, value, column.sql_type, column.comment || '']
       end
       t
     end
@@ -114,7 +119,7 @@ module Arql
           tables.each do |table_name|
             table_comment = comments[table_name]
             primary_keys[table_name].tap do |pkey|
-              table_name.camelize.tap do |const_name|
+              table_name.send(@@classify_method).tap do |const_name|
                 const_name = 'Modul' if const_name == 'Module'
                 const_name = 'Clazz' if const_name == 'Class'
                 Class.new(::ArqlModel) do
@@ -172,6 +177,11 @@ module Arql
     def initialize(options)
       @@options = options
       @@models = []
+      @@classify_method = if @@options[:singularized_table_names]
+                            :camelize
+                          else
+                            :classify
+                          end
       ActiveRecord::Base.connection.tap do |conn|
         Object.const_set('ArqlModel', Class.new(ActiveRecord::Base) do
                            include ::Arql::Concerns::TableDataDefinition
@@ -203,7 +213,7 @@ module Arql
         tables.each do |table_name|
           table_comment = comments[table_name]
           primary_keys[table_name].tap do |pkey|
-            table_name.camelize.tap do |const_name|
+            table_name.send(@@classify_method).tap do |const_name|
               const_name = 'Modul' if const_name == 'Module'
               const_name = 'Clazz' if const_name == 'Class'
               Class.new(::ArqlModel) do

data/lib/arql/ext/array.rb

@@ -27,6 +27,9 @@ class Array
           attrs -= [options[:except]].flatten
         end
       end
+      # if options[:compact]
+      #   attrs = attrs.select { |e| any { |r| r.attributes[e.to_s]&.present? } }
+      # end
       puts Terminal::Table.new { |t|
         t << attrs
         t << :separator
@@ -36,7 +39,7 @@ class Array
       }
     else
       table = Terminal::Table.new { |t|
-        v.each { |row| t << (row || :separator)}
+        v(**options).each { |row| t << (row || :separator)}
       }.to_s
 
       terminal_width = `tput cols`.to_i
@@ -77,23 +80,31 @@ class Array
     nil
   end
 
-  def v
+  def v(**options)
     return self unless present?
     t = []
     if map(&:class).uniq.size == 1
       if first.is_a?(ActiveRecord::Base)
-        t << first.attribute_names
+        attribute_names = first.attribute_names
+        if options[:compact]
+          attribute_names = attribute_names.select { |e| any? { |r| r.attributes[e]&.present? } }
+        end
+        t << attribute_names
         t << nil
         each do |e|
-          t << e.attributes.values_at(*first.attribute_names).map(&:as_json)
+          t << e.attributes.values_at(*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
+        keys = first.keys
+        if options[:compact]
+          keys = keys.select { |e| any? { |r| r[e]&.present? } }
+        end
+        t << keys
         t << nil
         each do |e|
-          t << e.values_at(*first.keys).map(&:as_json)
+          t << e.values_at(*keys).map(&:as_json)
         end
       else
         return self

data/lib/arql/ext/hash.rb

@@ -12,7 +12,7 @@ class Hash
           end
 
           if sheet_data.is_a?(Array)
-            if sheet_data.size > 0 && sheet_data.first.is_a?(ActiveModel::Base)
+            if sheet_data.size > 0 && sheet_data.first.is_a?(ActiveRecord::Base)
               fields = sheet_data.first.attributes.keys
               sheet.add_row(fields, types: [:string] * fields.size)
               sheet_data.each do |row|

data/lib/arql/ext.rb

@@ -1,5 +1,6 @@
 require 'arql/ext/object'
 require 'arql/ext/array'
+require 'arql/ext/hash'
 require 'arql/ext/time'
 require 'arql/ext/string'
 require 'arql/ext/kernel'

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.3.20"
+  VERSION = "0.3.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.22
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -154,14 +154,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 description: Use ActiveRecord and Pry as your favorite SQL query editor.
 email:
 - liuxiang921@gmail.com