arql 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17878b43fdb37376072a9ce87b9455cf42303a2a2eeacb0a382ee8b761e837cf
-  data.tar.gz: 12054ff4ed638edef1b8fa8a37c014bd6933f499add79367032c7eb4b4087a9b
+  metadata.gz: 65a539e6b5575a1849475cf4a339d28f742b2c92b35ea4dfc98b26de2f2ea634
+  data.tar.gz: f3d0481117428f3e71123c27c22d268ea9f2d90723ff18881b93dbe50d73495b
 SHA512:
-  metadata.gz: b66b11751c5d0dda49dd3e3b46643a954a9e2d33e7c94bab718703393cf35a1e8fb71b22d20c8a51e857eabf45ed481f5472cab18dc0a4959d20fdc418a4a4bf
-  data.tar.gz: fb72779d24b99ed46b22e105f43f4abe9ad973a780e66c0d11f2325b89923004db5811dbc90a74c7d8b786ed7c575938675cdc865f8e8d95c4a41d5f654ab383
+  metadata.gz: fb59a7d19f2349f3c5994b4d48115711773e91008aa3cc9d6c0a30d20d225b3bceb3b72832ca1a281c815d6e1f698ce48675028a4533b405c39f539c616e5efd
+  data.tar.gz: c2659cec45e82dd7bb5a20efa3dd2635e965164a69f50c3bab8e9bd7b2f8747be51a5b150557b8821d50993694eecc2c1472ec2b778fc88a42f157f6138adc5b

data/Gemfile.lock

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

data/lib/arql/commands/models.rb

@@ -4,24 +4,37 @@ module Arql::Commands
   module Models
     class << self
       def models
-        Terminal::Table.new do |t|
-          t << ['Table Name', 'Model Class', 'Abbr']
-          t << :separator
-          Arql::Definition.models.each do |definition|
-            t << [definition[:table], definition[:model].name, definition[:abbr] || '']
-          end
+        t = []
+        t << ['Table Name', 'Model Class', 'Abbr']
+        t << nil
+        Arql::Definition.models.each do |definition|
+          t << [definition[:table], definition[:model].name, definition[:abbr] || '']
         end
+        t
       end
 
+      def models_table
+        Terminal::Table.new do |t|
+          models.each { |row| t << (row || :separator) }
+        end
+      end
     end
+  end
 
-    Pry.commands.block_command 'models' do
-      puts
-      puts Models::models
-    end
+  Pry.commands.block_command 'm' do
+    puts
+    puts Models::models_table
+  end
+
+  Pry.commands.alias_command 'l', 'm'
+end
+
+module Kernel
+  def models
+    Arql::Commands::Models::models
+  end
 
-    Pry.commands.alias_command 'm', 'models'
-    Pry.commands.alias_command 'l', 'models'
-    Pry.commands.alias_command 'tables', 'models'
+  def tables
+    models
   end
 end

data/lib/arql/commands/table.rb

@@ -4,6 +4,7 @@ module Arql::Commands
   module Table
     class << self
       def get_table_name(name)
+        name = name.to_s
         return name if name =~ /^[a-z]/
         if Object.const_defined?(name)
           klass = Object.const_get(name)
@@ -12,33 +13,43 @@ module Arql::Commands
         name
       end
 
-      def table_info(table_name)
+      def table_info_table(table_name)
         Terminal::Table.new do |t|
-          t << ['PK', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
-          t << :separator
-          connection = ::ActiveRecord::Base.connection
-          connection.columns(table_name).each do |column|
-            pk = if column.name == connection.primary_key(table_name)
-                    'Y'
-                  else
-                    ''
-                  end
-            t << [pk, column.name, column.sql_type,
-                  column.sql_type_metadata.type, column.sql_type_metadata.limit || '',
-                  column.sql_type_metadata.precision || '', column.sql_type_metadata.scale || '', column.default || '',
-                  column.null, column.comment || '']
-          end
+          table_info(table_name).each { |row| t << (row || :separator) }
         end
       end
+
+      def table_info(table_name)
+        t = []
+        t << ['PK', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
+        t << nil
+        connection = ::ActiveRecord::Base.connection
+        connection.columns(table_name).each do |column|
+          pk = if column.name == connection.primary_key(table_name)
+                 'Y'
+               else
+                 ''
+               end
+          t << [pk, column.name, column.sql_type,
+                column.sql_type_metadata.type, column.sql_type_metadata.limit || '',
+                column.sql_type_metadata.precision || '', column.sql_type_metadata.scale || '', column.default || '',
+                column.null, column.comment || '']
+        end
+        t
+      end
     end
 
-    Pry.commands.block_command 'table' do |name|
+    Pry.commands.block_command 't' do |name|
       table_name = Table::get_table_name(name)
       puts
       puts "Table: #{table_name}"
-      puts Table::table_info(table_name)
+      puts Table::table_info_table(table_name)
     end
+  end
+end
 
-    Pry.commands.alias_command 't', 'table'
+module Kernel
+  def table(name)
+    Table::table_info(Table::get_table_name(name))
   end
 end

data/lib/arql/definition.rb

@@ -3,13 +3,19 @@ module Arql
     extend ActiveSupport::Concern
 
     def t
-      Terminal::Table.new { |t|
-        t << ['Attribute Name', 'Attribute Value', 'SQL Type', 'Comment']
-        t << :separator
-        self.class.connection.columns(self.class.table_name).each do |column|
-          t << [column.name, read_attribute(column.name), column.sql_type, column.comment || '']
-        end
-      }.to_s
+      puts Terminal::Table.new { |t|
+        v.each { |row| t << (row || :separator) }
+      }
+    end
+
+    def v
+      t = []
+      t << ['Attribute Name', 'Attribute Value', 'SQL Type', 'Comment']
+      t << nil
+      self.class.connection.columns(self.class.table_name).each do |column|
+        t << [column.name, read_attribute(column.name), column.sql_type, column.comment || '']
+      end
+      t
     end
 
     def to_insert_sql
@@ -23,7 +29,13 @@ module Arql
     class_methods do
       def t
         table_name = Commands::Table::get_table_name(name)
-        "\nTable: #{table_name}\n" + Commands::Table::table_info(table_name).to_s
+        puts "\nTable: #{table_name}"
+        puts Commands::Table::table_info_table(table_name)
+      end
+
+      def v
+        table_name = Commands::Table::get_table_name(name)
+        Commands::Table::table_info(table_name)
       end
       def to_insert_sql(records, batch_size=1)
         to_sql(records, :skip, batch_size)

data/lib/arql/ext/array.rb

@@ -12,4 +12,16 @@ class Array
       klass.to_upsert_sql(records, batch_size)
     end.join("\n")
   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)
+    t = []
+    t << first.attribute_names
+    t << nil
+    each do |e|
+      t << e.attributes.values_at(*first.attribute_names)
+    end
+    t
+  end
 end

data/lib/arql/ext/object.rb

@@ -7,4 +7,12 @@ class Object
   def jj
     JSON.pretty_generate(JSON.parse(to_json))
   end
+
+  def jp
+    puts j
+  end
+
+  def jjp
+    puts jj
+  end
 end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

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