RubyGems - arql - Versions diffs - 0.4.4 → 0.4.6 - Mend

arql 0.4.4 → 0.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

checksums.yaml +4 -4
data/Gemfile.lock +3 -1
data/arql.gemspec +1 -0
data/lib/arql/app.rb +30 -0
data/lib/arql/chart.rb +57 -0
data/lib/arql/commands/models.rb +21 -52
data/lib/arql/concerns/model_extension.rb +24 -47
data/lib/arql/definition.rb +10 -2
data/lib/arql/ext/array.rb +12 -33
data/lib/arql/ext/string.rb +11 -0
data/lib/arql/table.rb +86 -0
data/lib/arql/version.rb +1 -1
data/lib/arql.rb +15 -0
metadata +18 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f47987d63ecc0665d5cce2b8b503ffeff2587f6235499138f6d6da22fc104c
-  data.tar.gz: aa143c6f15dd4e2df5f79a992547548938ba59fd8126f9bfdfeaa2dcb83f0cef
+  metadata.gz: 2d0018fc91ed033164ab2a18c2c3e5edcaaffaefe2ec9d3cc7fab0cc3323e53a
+  data.tar.gz: '07874855f77dd53005dc53c213e683fb9e6e0b05896a9f8874be0d6383fc474c'
 SHA512:
-  metadata.gz: '0863699e29b5c7ec31db4359657e7c3d3010f2ca5636484c9f93a2e1826f06e6daf846aad678a5a59d8b0414eb9470058788143cdafc8187e653c43916d29b5a'
-  data.tar.gz: fe913b85a782e139af4d1751d54fc9f33178eed8a202b593acb81f5db02c13af71e86e817f234285c6350970324000f42dc5422107fe8f2877bb8fedce235c22
+  metadata.gz: 732c1c901ed187c26930cf65dfb278257a65ab446635389ae6741553617d5873b2e733f6c70c52983ca536e95e6b914d4e43857af35c2dbcca9f052d2fd9416d
+  data.tar.gz: 063c3c0e6734073644dfd54b5735a9813262cfabbd0cad788ea3b56850a99daacdf653747f6e9613022837c19c5ed53ba08d3a6fd1f8d07af5c1f4bfb7d80bef

data/Gemfile.lock CHANGED Viewed

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    arql (0.4.4)
+    arql (0.4.6)
       activerecord (>= 6.1.5, < 7.1.0)
       activesupport (>= 6.1.5, < 7.1.0)
       caxlsx (~> 3.3.0)
+      chartkick (~> 5.0.7)
       composite_primary_keys (~> 14.0.4)
       kaminari-activerecord (~> 1.2.2)
       mysql2 (~> 0.5.4)
@@ -40,6 +41,7 @@ GEM
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
+    chartkick (5.0.7)
     coderay (1.1.3)
     composite_primary_keys (14.0.4)
       activerecord (~> 7.0.2)

data/arql.gemspec CHANGED Viewed

@@ -44,5 +44,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ransack', '~> 3.2.1'
   spec.add_dependency 'youplot', '~> 0.4.5'
   spec.add_dependency 'tty-tree', '~> 0.4.0'
+  spec.add_dependency 'chartkick', '~> 5.0.7'
   spec.add_development_dependency "gem-release", "~> 2.2.2"
 end

data/lib/arql/app.rb CHANGED Viewed

@@ -25,6 +25,36 @@ module Arql
       def config
         instance.config
       end
+      def create(options)
+        options = {
+          config_file: default_config_file,
+          initializer: default_initializer,
+          babel_compatable: false,
+          ssh: {}
+        }.merge(options)
+        options = OpenStruct.new(options)
+        app = App.new(options)
+        app.instance_exec do
+          show_sql if should_show_sql?
+          write_sql if should_write_sql?
+          append_sql if should_append_sql?
+        end
+        require 'arql/commands'
+        nil
+      end
+      def default_config_file
+        ['~/.arql.yml', '~/.arql.yaml', '~/.arql.d/init.yml', '~/.arql.d/init.yaml'].find { |f|
+          File.file?(File.expand_path(f))
+        }.try { |f| File.expand_path(f) }
+      end
+      def default_initializer
+        ['~/.arql.rb', '~/.arql.d/init.rb',].find { |f|
+          File.file?(File.expand_path(f))
+        }.try { |f| File.expand_path(f) }
+      end
     end
     def prompt

data/lib/arql/chart.rb ADDED Viewed

@@ -0,0 +1,57 @@
+require 'chartkick'
+module Arql
+  module Chart
+    include Chartkick::Helper
+    def line_chart(data_source, **options)
+      html_chart "LineChart", data_source, **options
+    end
+    def pie_chart(data_source, **options)
+      html_chart "PieChart", data_source, **options
+    end
+    def column_chart(data_source, **options)
+      html_chart "ColumnChart", data_source, **options
+    end
+    def bar_chart(data_source, **options)
+      html_chart "BarChart", data_source, **options
+    end
+    def area_chart(data_source, **options)
+      html_chart "AreaChart", data_source, **options
+    end
+    def scatter_chart(data_source, **options)
+      html_chart "ScatterChart", data_source, **options
+    end
+    def geo_chart(data_source, **options)
+      html_chart "GeoChart", data_source, **options
+    end
+    def timeline(data_source, **options)
+      html_chart "Timeline", data_source, **options
+    end
+    def html_chart(klass, data_source, **options)
+      chart = chartkick_chart(klass, data_source, **options)
+      html = <<~HTML
+        <html>
+          <head>
+            <script src="https://www.hackit.fun/js/Chart.bundle.js"></script>
+            <script src="https://www.hackit.fun/js/chartkick.js"></script>
+          </head>
+          <body style="color: red">
+            #{chart}
+          </body>
+        </html>
+      HTML
+      html = html.lines.reject {|line| line =~ /(data-turbo)|(Chartkick" in window)|(^\s*\}\s*else\s*\{\s*$)|(chartkick:load)|(^\s*\}\s*$)/}.join("\n")
+      IRuby.display(html, mime: 'text/html')
+    end
+  end
+end

data/lib/arql/commands/models.rb CHANGED Viewed

@@ -1,14 +1,17 @@
 require 'terminal-table'
+require 'arql/table'
 module Arql::Commands
   module Models
     class << self
       def filter_tables(env_name, definition, format, table_regexp=nil)
         result = ''
-        result << '-- ' if format == 'sql'
-        result << "Environment: #{env_name}\n"
-        result << "------------------------------\n\n"
-        if format == 'sql'
+        if format.to_s == 'sql'
+          result << '-- '
+          result << "Environment: #{env_name}\n"
+          result << "------------------------------\n\n"
+        end
+        if format.to_s == 'sql'
           definition.models.each do |model|
             if table_regexp? || ( model[:table] =~ table_regexp || model[:comment] =~ table_regexp )
               result << "-- Table: #{table_name}\n\n"
@@ -16,77 +19,43 @@ module Arql::Commands
             end
           end
         else
-          Terminal::Table.new do |t|
-            t.style = table_style_for_format(format)
-            t << ['Table Name', 'Model Class', 'Abbr', 'Comment']
-            t << :separator
+          tbl = Arql::Table.new("Environment: #{env_name}") { |t|
+            t.headers = ['Table Name', 'Model Class', 'Abbr', 'Comment']
             definition.models.each do |model|
               if table_regexp.nil? || ( model[:table] =~ table_regexp || model[:comment] =~ table_regexp )
-                t << [model[:table], model[:model].name, model[:abbr] || '', model[:comment] || '']
+                t.body << [model[:table], model[:model].name, model[:abbr] || '', model[:comment] || '']
               end
             end
-          end.try { |e|
-            case format
-            when 'md'
-              result << e.to_s.lines.map { |l| '  ' + l }.join
-            when 'org'
-              result << e.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
-            else
-              result << e.to_s
-            end
           }
+          if $iruby && format.to_s == 'terminal'
+            return tbl.to_iruby
+          else
+            result << tbl.to_terminal(format)
+          end
         end
         result
       end
       def filter_columns(env_name, definition, format, column_regexp=nil)
-        result = ''
-        result << '-- ' if format == 'sql'
-        result << "Environment: #{env_name}\n"
-        result << "------------------------------\n\n"
-        Terminal::Table.new do |t|
-          t.style = table_style_for_format(format)
-          t << ['Table', 'Model', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
-          t << :separator
+        tbl = Arql::Table.new("Environment: #{env_name}") { |t|
+          t.headers = ['Table', 'Model', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
           definition.models.each do |model_def|
             model_class = model_def[:model]
             matched_columns = model_class.columns.select { |column| column.name =~ column_regexp || column.comment =~ column_regexp }
             next if matched_columns.empty?
             matched_columns.each do |column|
-              t << [model_def[:table], model_class.name, column.name, column.sql_type,
+              t.body << [model_def[:table], model_class.name, 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, "#{model_def[:comment]} - #{column.comment}"]
             end
           end
-        end.try { |e|
-          case format
-          when 'md'
-            result << e.to_s.lines.map { |l| '  ' + l }.join
-          when 'org'
-            result << e.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
-          else
-            result << e.to_s
-          end
         }
-        result
-      end
-      def table_style_for_format(format)
-        case format
-        when 'md'
-          {
-            border_top: false,
-            border_bottom: false,
-            border_i: '|'
-          }
-        when 'org'
-          {
-            border_top: false,
-            border_bottom: false,
-          }
+        if $iruby && format.to_s == 'terminal'
+          return tbl.to_iruby
         else
-          {}
+          result << tbl.to_terminal(format)
         end
       end
     end

data/lib/arql/concerns/model_extension.rb CHANGED Viewed

@@ -17,19 +17,17 @@ module Arql
     end
     def t(compact: false, format: :terminal)
-      puts Terminal::Table.new { |t|
-        t.style = self.class.table_style_for_format(format)
-        v(compact: compact).each { |row| t << (row || :separator) }
-      }.try { |e|
-        case format
-        when :md
-          e.to_s.lines.map { |l| '  ' + l }.join
-        when :org
-          e.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
-        else
-          e.to_s
-        end
-      }
+      tbl = Arql::Table.new do |t|
+        values = v(compact: compact)
+        t.headers = values&.first || []
+        (values[2..] || []).each { |row| t.body << (row || []) } if values.size > 2
+      end
+      if $iruby && format.to_s == 'terminal'
+        return tbl.to_iruby
+      else
+        puts tbl.to_terminal(format)
+      end
     end
     def vd(compact: false)
@@ -68,7 +66,6 @@ module Arql
     end
     class_methods do
       def v
         t = [['PK', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']]
         t << nil
@@ -95,23 +92,21 @@ module Arql
         when :sql
           '-- '
         end
-        puts "\n#{heading_prefix}Table: #{table_name}\n\n"
-        if format == :sql
+        caption = "\n#{heading_prefix}Table: #{table_name}\n\n"
+        if format.to_s == 'sql'
           puts to_create_sql + ';'
         else
-          puts(Terminal::Table.new { |t|
-            t.style = self.table_style_for_format(format)
-            v.each { |row| t << (row || :separator) }
-          }.try { |e|
-            case format
-            when :md
-              e.to_s.lines.map { |l| '  ' + l }.join
-            when :org
-              e.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
-            else
-              e.to_s
-            end
-          })
+          tbl = Arql::Table.new(caption) do |t|
+            values = v()
+            t.headers = values&.first || []
+            (values[2..] || []).each { |row| t.body << (row || []) } if values.size > 2
+          end
+          if $iruby && format.to_s == 'terminal'
+            return tbl.to_iruby
+          else
+            puts tbl.to_terminal(format)
+          end
         end
       end
@@ -145,24 +140,6 @@ module Arql
       def dump(filename, no_create_table=false)
         Arql::Mysqldump.new(superclass.definition.options).dump_table(filename, table_name, no_create_table)
       end
-      def table_style_for_format(format)
-        case format.to_s
-        when 'md'
-          {
-            border_top: false,
-            border_bottom: false,
-            border_i: '|'
-          }
-        when 'org'
-          {
-            border_top: false,
-            border_bottom: false,
-          }
-        else
-          {}
-        end
-      end
     end
   end
 end

data/lib/arql/definition.rb CHANGED Viewed

@@ -76,6 +76,16 @@ module Arql
         model[:comment] = @comments[table_name]
         @models << model
       end
+      order_column = @options[:order_column]
+      if order_column
+        Thread.new do
+          @models.each do |model|
+            model_class = model[:model]
+            model_class.implicit_order_column = order_column if model_class.column_names.include?(order_column)
+          end
+        end
+      end
     end
     def model_names_mapping
@@ -144,8 +154,6 @@ module Arql
         end
         self.table_name = table_name
         self.inheritance_column = nil
-        order_column = options[:order_column]
-        self.implicit_order_column = order_column if order_column
         ActiveRecord.default_timezone = :local
         if options[:created_at].present?
           define_singleton_method :timestamp_attributes_for_create do

data/lib/arql/ext/array.rb CHANGED Viewed

@@ -32,46 +32,25 @@ class Array
       # if options[:compact]
       #   attrs = attrs.select { |e| any { |r| r.attributes[e.to_s]&.present? } }
       # end
-      puts Terminal::Table.new { |t|
+      tbl = Arql::Table.new { |t|
         t.style = table_style_for_format(format)
-        t << attrs
-        t << :separator
+        t.headers = attrs
         each do |e|
-          t << e.attributes.values_at(*attrs.map(&:to_s))
-        end
-      }.try { |e|
-        case format
-        when 'md'
-          e.to_s.lines.map { |l| '  ' + l }.join
-        when 'org'
-          e.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
-        else
-          e.to_s
+          t.body << e.attributes.values_at(*attrs.map(&:to_s))
         end
       }
     else
-      table = Terminal::Table.new { |t|
-        t.style = table_style_for_format(format)
-        v(**options).each { |row| t << (row || :separator)}
-      }.try { |e|
-        case format
-        when 'md'
-          e.to_s.lines.map { |l| '  ' + l }.join
-        when 'org'
-          e.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
-        else
-          e.to_s
-        end
+      values = v(**options)
+      tbl = Arql::Table.new { |t|
+        t.headers = values&.first || []
+        (values[2..] || []).each { |row| t.body << (row || []) } if values.size > 2
       }
+    end
-      terminal_width = `tput cols`.to_i
-      if table.lines.first.size > terminal_width
-        table = table.lines.map(&:chomp)
-        puts table[0..2].join("\n")
-        puts table[3..-1].join("\n#{'-' * terminal_width}\n")
-      else
-        puts table
-      end
+    if $iruby
+      tbl.to_iruby
+    else
+      puts tbl.to_terminal(format)
     end
   end

data/lib/arql/ext/string.rb CHANGED Viewed

@@ -11,6 +11,17 @@ class String
     expa
   end
+  def to_link
+    html = <<~EOF
+    <a href="#{expa}" target="_blank">#{expa}</a>
+    EOF
+    IRuby.display(html, mime: 'text/html')
+  end
+  def to_file
+    File.open(expa)
+  end
   def parse_excel
     if File.file?(File.expand_path(self))
       Kernel.parse_excel(File.expand_path(self))

data/lib/arql/table.rb ADDED Viewed

@@ -0,0 +1,86 @@
+require 'terminal-table'
+module Arql
+  class Table
+    attr_accessor :caption, :headers, :body
+    def initialize(caption=nil, headers=[], body=[])
+      @headers = headers
+      @body = body
+      @caption = caption
+      yield(self) if block_given?
+    end
+    def to_iruby
+      IRuby.display(to_html, mime: 'text/html')
+    end
+    def to_terminal(format='terminal')
+      tbl = Terminal::Table.new do |t|
+        t.style = terminal_style_for_format(format)
+        t << headers || []
+        t << :separator
+        (body || []).each { |row| t << row }
+      end
+      title = @caption.try do |c|
+        "#{c}\n---------------------------------------\n\n"
+      end || ''
+      table = case format.to_s
+      when 'md'
+        tbl.to_s.lines.map { |l| '  ' + l }.join
+      when 'org'
+        tbl.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
+      else
+        tbl.to_s
+      end
+      terminal_width = `tput cols`.to_i
+      table_lines = table.lines.map(&:chomp)
+      if table_lines.first.size > terminal_width
+        title + (table_lines[0..2] || []).join("\n") + "\n" + (table_lines[3..-1] || []).join("\n#{'-' * terminal_width}\n")
+      else
+        title + table
+      end
+    end
+    def terminal_style_for_format(format)
+      case format.to_s
+      when 'md'
+        {
+          border_top: false,
+          border_bottom: false,
+          border_i: '|'
+        }
+      when 'org'
+        {
+          border_top: false,
+          border_bottom: false,
+        }
+      else
+        {}
+      end
+    end
+    def to_html
+      html = "<table style='border-collapse: collapse; font-family: JetBrains Mono, Source Code Pro, Ubuntu Mono, Monaco, Menlo, Courier New'>"
+      html << "<caption style='text-align: left;'>#{@caption}</caption>" if @caption.present?
+      html << "<thead><tr>"
+      (@headers || []).each do |h|
+        html << "<th style='text-align: left; white-space: nowrap;'>#{h}</th>"
+      end
+      html << "</tr></thead>"
+      html << "<tbody>"
+      (@body || []).each do |row|
+        html << "<tr>"
+        row.each do |r|
+          html << "<td style='text-align: left; white-space: nowrap;'>#{r}</td>"
+        end
+        html << "</tr>"
+      end
+      html << "</tbody>"
+      html << "</table>"
+    end
+  end
+end

data/lib/arql/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.4.4"
+  VERSION = "0.4.6"
 end

data/lib/arql.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+ENV['RAILS_DISABLE_DEPRECATED_TO_S_CONVERSION'] = 'true'
 require 'table_print'
 require 'roo'
 require 'caxlsx'
@@ -24,5 +25,19 @@ require 'arql/ext/active_record/relation'
 require 'arql/ext/active_record/result'
 require 'arql/ext/ransack/search'
+$iruby = false
 module Arql
+  def self.create(options)
+    if ::Object.const_defined?(:IRuby) && ::IRuby.const_defined?(:OStream) && $stdout.is_a?(IRuby::OStream)
+      IRuby::Kernel.instance.switch_backend!(:pry)
+      $iruby = true
+    end
+    App.create(options)
+  end
 end
+if ::Object.const_defined?(:IRuby)
+  require 'arql/chart'
+  ::Kernel.include(Arql::Chart)
+end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -274,6 +274,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: chartkick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.7
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -326,6 +340,7 @@ files:
 - initializer-structure.org
 - lib/arql.rb
 - lib/arql/app.rb
+- lib/arql/chart.rb
 - lib/arql/cli.rb
 - lib/arql/commands.rb
 - lib/arql/commands/info.rb
@@ -358,6 +373,7 @@ files:
 - lib/arql/repl.rb
 - lib/arql/ssh_proxy.rb
 - lib/arql/ssh_proxy_patch.rb
+- lib/arql/table.rb
 - lib/arql/vd.rb
 - lib/arql/version.rb
 - oss-files-zh_CN.org