arql 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e8fc504dce79a217260e4141983ed9688ea6b26bbb559293a91989f954a14ce
-  data.tar.gz: '0826d7a38e803b7298afa8dce9f48e17246af86f6994f534e2168575f8081c86'
+  metadata.gz: 44604f0630f7b6308b9c53bf90b46bd9138b52fdec169baf46bf4e790adfc82b
+  data.tar.gz: 7efecc0c754d4f16eb31a19756de3d95a06d8d93440e480726d6df574827af13
 SHA512:
-  metadata.gz: ff3be0324cd12c584969fc66d6a6859c9e41c2cae6f3c721fb2cce663cd53eee986f584ad3f00bf6c0ce38c29ad9a0c5623ff244262b3165119a11fdc1e8842d
-  data.tar.gz: ff54d6fa435f403ecdbe53ff0acf8db12c4fc1fa79ef2809badeab7dcef79fbdd28d008458af871025ff90e00a0629a205cc6ef6bd95a2d853e2eceadbd27837
+  metadata.gz: d795bedb12d2bf39bbb2b5e394373b545e35a542e00110708915fa57b5ca2248f5ed64ee975283d0a3a23e3e4ed201a560fc3ba78dac4085650d6eef486c7fdf
+  data.tar.gz: 07c6aacfcd46fe3361ebbf977c553c32aad792cb7cd40ebdb9803f0cb76b32ace4bb4326808dd4db2c61be2f6e3e98ec1ee85753ced7e73ee85f8d1f6ffaf10d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.2.1)
+    arql (0.2.7)
       activerecord (~> 6.0.3)
       activesupport (~> 6.0.3)
       caxlsx (~> 3.0.2)
@@ -19,12 +19,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activerecord (6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -44,7 +44,7 @@ GEM
     method_source (1.0.0)
     mimemagic (0.3.5)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     mysql2 (0.5.3)
     net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)

data/lib/arql/commands/models.rb

@@ -5,25 +5,29 @@ module Arql::Commands
     class << self
       def models
         t = []
-        t << ['Table Name', 'Model Class', 'Abbr']
+        t << ['Table Name', 'Model Class', 'Abbr', 'Comment']
         t << nil
         Arql::Definition.models.each do |definition|
-          t << [definition[:table], definition[:model].name, definition[:abbr] || '']
+          t << [definition[:table], definition[:model].name, definition[:abbr] || '', definition[:comment] || '']
         end
         t
       end
 
-      def models_table
+      def models_table(regexp)
         Terminal::Table.new do |t|
-          models.each { |row| t << (row || :separator) }
+          models.each_with_index { |row, idx| t << (row || :separator) if row.nil? ||
+            regexp.nil? ||
+            idx.zero? ||
+            row.any? { |e| e =~ regexp }
+          }
         end
       end
     end
   end
 
-  Pry.commands.block_command 'm' do
+  Pry.commands.block_command 'm' do |regexp|
     puts
-    puts Models::models_table
+    puts Models::models_table(regexp.try { |e| eval(e) })
   end
 
   Pry.commands.alias_command 'l', 'm'

data/lib/arql/definition.rb

@@ -83,11 +83,12 @@ module Arql
         @@models = []
         ActiveRecord::Base.connection.tap do |conn|
           conn.tables.each do |table_name|
+            table_comment = conn.table_comment(table_name)
             conn.primary_key(table_name).tap do |pkey|
               table_name.camelize.tap do |const_name|
                 const_name = 'Modul' if const_name == 'Module'
                 const_name = 'Clazz' if const_name == 'Class'
-                Class.new(ActiveRecord::Base) do
+                Class.new(::ArqlModel) do
                   include Arql::Extension
                   self.primary_key = pkey
                   self.table_name = table_name
@@ -106,16 +107,22 @@ module Arql
                   end
                 end.tap do |clazz|
                   Object.const_set(const_name, clazz).tap do |const|
-                    const_name.gsub(/[a-z]*/, '').tap do |abbr|
-                      unless Object.const_defined?(abbr)
-                        Object.const_set abbr, const
-                        abbr_const = abbr
+                    const_name.gsub(/[a-z]*/, '').tap do |bare_abbr|
+                      abbr_const = nil
+                      9.times do |idx|
+                        abbr = idx.zero? ? bare_abbr : "#{bare_abbr}#{idx+1}"
+                        unless Object.const_defined?(abbr)
+                          Object.const_set abbr, const
+                          abbr_const = abbr
+                          break
+                        end
                       end
 
                       @@models << {
                         model: const,
                         abbr: abbr_const,
-                        table: table_name
+                        table: table_name,
+                        comment: table_comment
                       }
                     end
                   end
@@ -133,12 +140,14 @@ module Arql
       @@options = options
       @@models = []
       ActiveRecord::Base.connection.tap do |conn|
+        Object.const_set('ArqlModel', Class.new(ActiveRecord::Base) { self.abstract_class = true })
         conn.tables.each do |table_name|
+          table_comment = conn.table_comment(table_name)
           conn.primary_key(table_name).tap do |pkey|
             table_name.camelize.tap do |const_name|
               const_name = 'Modul' if const_name == 'Module'
               const_name = 'Clazz' if const_name == 'Class'
-              Class.new(ActiveRecord::Base) do
+              Class.new(::ArqlModel) do
                 include Arql::Extension
                 self.primary_key = pkey
                 self.table_name = table_name
@@ -157,16 +166,22 @@ module Arql
                 end
               end.tap do |clazz|
                 Object.const_set(const_name, clazz).tap do |const|
-                  const_name.gsub(/[a-z]*/, '').tap do |abbr|
-                    unless Object.const_defined?(abbr)
-                      Object.const_set abbr, const
-                      abbr_const = abbr
+                  const_name.gsub(/[a-z]*/, '').tap do |bare_abbr|
+                    abbr_const = nil
+                    9.times do |idx|
+                      abbr = idx.zero? ? bare_abbr : "#{bare_abbr}#{idx+1}"
+                      unless Object.const_defined?(abbr)
+                        Object.const_set abbr, const
+                        abbr_const = abbr
+                        break
+                      end
                     end
 
                     @@models << {
                       model: const,
                       abbr: abbr_const,
-                      table: table_name
+                      table: table_name,
+                      comment: table_comment
                     }
                   end
                 end
@@ -178,8 +193,8 @@ module Arql
     end
 
     ::ActiveRecord::Relation.class_eval do
-      def t(*attrs)
-        records.t(*attrs)
+      def t(*attrs, **options)
+        records.t(*attrs, **options)
       end
 
       def v

data/lib/arql/ext/array.rb

@@ -13,8 +13,18 @@ class Array
     end.join("\n")
   end
 
-  def t(*attrs)
-    if attrs.present? && present? && first.is_a?(ActiveRecord::Base)
+  def t(*attrs, **options)
+    if (attrs.present? || options.present? && options[:except]) && present? && first.is_a?(ActiveRecord::Base)
+      column_names = first.attribute_names.map(&:to_sym)
+      attrs = attrs.flat_map { |e| e.is_a?(Regexp) ? column_names.grep(e) : e }.uniq
+      if options.present? && options[:except]
+        attrs = column_names if attrs.empty?
+        if options[:except].is_a?(Regexp)
+          attrs.reject! { |e| e =~ options[:except] }
+        else
+          attrs -= [options[:except]].flatten
+        end
+      end
       puts Terminal::Table.new { |t|
         t << attrs
         t << :separator

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.2.2"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2