arql 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44dc8e634d413b6c736c6335ce19feeb4f9b927bd5f61f8697e9102e16ce79e4
-  data.tar.gz: 1202b099108a83827a851e594c3511e078f6af61d3b901106e193c0a7a42c6ec
+  metadata.gz: 032762276fe5d2c764f71eae665d16e2e4786368c7f154e7bd19be5188a49027
+  data.tar.gz: 73b8ceedbcd0abdc5c87c186374c8cfe0db50e0c22d1e645d2c10396ec8c4aa3
 SHA512:
-  metadata.gz: 48233713c1b9364591a0d7d782181a9484976242fd7361927e2d8d30f5f0104e4a860a1c66bb7575da6d6e46f7294324e1c8d633fa1285e37bcf1470fe716e0b
-  data.tar.gz: 7877f7dd188f9f4c3b99d049a0b4b64f0e1b71e5c5daece18fabf107d26df3a69f8bf8170549430f48e300582b8660c2a23ba4e59aa69b6561d762670e3d3c4b
+  metadata.gz: cc70e4f11ff7bcfc4f0654d8a3e59ac2ae666e55237dff7d62e408c3c6bba200b22f3e064ea17dc513a94bbd4eacefa8f369d4d79c24d9a9ada857efa00c58af
+  data.tar.gz: 34491bfc5588a4bae89f26f889c5863e700f79b926902bb769c3e122082342706252fc41bcf461244bfc82e8f5a5e7dbf1eb4bd3c43d726f1d9fb9f5164170b0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.2.0)
+    arql (0.2.5)
       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/definition.rb

@@ -87,7 +87,7 @@ module Arql
               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
@@ -124,6 +124,8 @@ module Arql
             end
           end
         end
+
+        App.instance&.load_initializer!
       end
     end
 
@@ -131,12 +133,13 @@ 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|
           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
@@ -176,14 +179,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/kernel.rb

@@ -99,7 +99,10 @@ module Kernel
   def parse_excel(filename)
     xlsx = Roo::Excelx.new(File.expand_path(filename))
     xlsx.sheets.each_with_object({}) do |sheet_name, result|
-      result[sheet_name] = xlsx.sheet(sheet_name).to_a
+      begin
+        result[sheet_name] = xlsx.sheet(sheet_name).to_a
+      rescue
+      end
     end
   end
 end

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.0"
+  VERSION = "0.2.5"
 end

metadata

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