arql 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243555de4d65c13fb1bff8927ac5cf07ce92e385d7b14bc24d5ecb6b56c91eea
-  data.tar.gz: 821402d1717fab422655ba4ed895d7fe0e901f4039c6837548f0e921294a8b66
+  metadata.gz: 92f3117b0baa9b0c54cc683a73251094697b5e2fb8ed7cb329f37b43ad0bbe2e
+  data.tar.gz: 2b839cf6ec293f162faa2f29c7d7421679185c4874f1a4c826d13d4be26350a8
 SHA512:
-  metadata.gz: aa17e8c66c687b5aa6fa6aa7d36c753c4841d08c33b2be525809adf2ee2d2fba683010126b2e0af3ccf3552ce215146355285795174db27a6ea98f8e9c405834
-  data.tar.gz: 961a643cf21cbf86522acd362616e6256ab9ab1a9d85b87beeb2be4f0b5e28743ac49cd0571b376912ff61e7ab0e05c9a77c6275db41acf056e26b37bd1bef8b
+  metadata.gz: c07790dbd1bbff85f9fee6f86346967ecac0e70c0334255eb7041b475a41b7d569a01f40d0d2f8757de34362dcaaff839e31a27d13865f1f40f533ce409388fc
+  data.tar.gz: a82ae15b63a25e22e7a50e6a1a1dc8173dc5881c5c032851fe69e8639dcfc860d734a557f74dfce38868dac2dd86b2f9e2c94b8e487fa17271967b0eb56d6367

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.2.1)
+    arql (0.2.6)
       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/app.rb

@@ -4,7 +4,7 @@ module Arql
   class App
 
     class << self
-      attr_accessor :log_io, :env, :prompt
+      attr_accessor :log_io, :env, :prompt, :instance
 
       def config
         @@effective_config
@@ -29,6 +29,7 @@ module Arql
       Connection.open(connect_options)
       @definition = Definition.new(effective_config)
       load_initializer!
+      App.instance = self
     end
 
     def connect_options

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
@@ -115,7 +116,8 @@ module Arql
                       @@models << {
                         model: const,
                         abbr: abbr_const,
-                        table: table_name
+                        table: table_name,
+                        comment: table_comment
                       }
                     end
                   end
@@ -124,6 +126,8 @@ module Arql
             end
           end
         end
+
+        App.instance&.load_initializer!
       end
     end
 
@@ -131,12 +135,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
@@ -164,7 +170,8 @@ module Arql
                     @@models << {
                       model: const,
                       abbr: abbr_const,
-                      table: table_name
+                      table: table_name,
+                      comment: table_comment
                     }
                   end
                 end
@@ -176,14 +183,18 @@ module Arql
     end
 
     ::ActiveRecord::Relation.class_eval do
-      def t
-        records.t
+      def t(*attrs, **options)
+        records.t(*attrs, **options)
       end
 
       def v
         records.v
       end
 
+      def a
+        to_a
+      end
+
       def write_csv(filename, *fields, **options)
         records.write_csv(filename, *fields, **options)
       end

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/ext/object.rb

@@ -15,4 +15,8 @@ class Object
   def jjp
     puts jj
   end
+
+  def a
+    [self]
+  end
 end

data/lib/arql/repl.rb

@@ -25,7 +25,7 @@ module Arql
     end
 
     def prompt
-      [proc do |obj, nest_level, _|
+      [proc do |obj, nest_level, pry_instance|
          if obj == main_object && nest_level == 0
            nest_level_prompt = ''
          else
@@ -35,7 +35,7 @@ module Arql
                                  "(#{obj}:#{nest_level})"
                                end
          end
-         "%s#{Rainbow('@').green}%s#{nest_level_prompt} %s " % [Rainbow('ARQL').red, Rainbow(App.prompt).yellow, Rainbow('❯').green]
+         "%s#{Rainbow('@').green}%s#{nest_level_prompt} [%d] %s " % [Rainbow('ARQL').red, Rainbow(App.prompt).yellow, pry_instance.input_ring.count, Rainbow('❯').green]
        end]
     end
   end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.2.1"
+  VERSION = "0.2.6"
 end

metadata

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