arql 0.3.30 → 0.4.0

data/lib/arql/ext/kernel.rb

@@ -5,67 +5,11 @@ module Kernel
   include ::Arql::Concerns::GlobalDataDefinition
 
   def q(sql)
-    ActiveRecord::Base.connection.exec_query(sql)
-  end
-
-  def print_tables(format = :md)
-    require 'terminal-table'
-
-    tables = ActiveRecord::Base.connection.tables.map do |table_name|
-      {
-        table: table_name,
-        table_comment: ActiveRecord::Base.connection.table_comment(table_name) || '',
-        columns: ::ActiveRecord::Base.connection.columns(table_name)
-      }
-    end
-
-    outputs = tables.map do |table|
-      table_name = table[:table]
-      table_comment = table[:table_comment]
-      case format
-      when :md
-        "# #{table_name} #{table_comment}\n\n" +
-          Terminal::Table.new { |t|
-          t.headings = ['PK', 'Name', 'SQL Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
-          t.rows = table[:columns].map { |column|
-            pk = if [::ActiveRecord::Base.connection.primary_key(table_name)].flatten.include?(column)
-                   'Y'
-                 else
-                   ''
-                 end
-            [pk, "`#{column.name}`", column.sql_type, column.sql_type_metadata.limit || '', column.sql_type_metadata.precision || '',
-             column.sql_type_metadata.scale || '', column.default || '', column.null, column.comment || '']
-          }
-          t.style = {
-            border_top: false,
-            border_bottom: false,
-            border_i: '|'
-          }
-        }.to_s.lines.map { |l| '  ' + l }.join
-      when :org
-        "* #{table_name} #{table_comment}\n\n" +
-          Terminal::Table.new { |t|
-          t.headings = ['PK', 'Name', 'SQL Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
-          t.rows = table[:columns].map { |column|
-            pk = if [::ActiveRecord::Base.connection.primary_key(table_name)].flatten.include?(column)
-                   'Y'
-                 else
-                   ''
-                 end
-            [pk, "=#{column.name}=", column.sql_type, column.sql_type_metadata.limit || '', column.sql_type_metadata.precision || '',
-             column.sql_type_metadata.scale || '', column.default || '', column.null, column.comment || '']
-          }
-          t.style = {
-            border_top: false,
-            border_bottom: false,
-          }
-        }.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
-      when :sql
-        "-- Table: #{table_name}\n\n" + ActiveRecord::Base.connection.exec_query("show create table `#{table_name}`").rows.last.last + ';'
-      end
+    if Arql::App.instance.environments.size > 1
+      $stderr.puts "Multiple environments are defined. Please use Namespace::q() instread, where Namespace is the namespace module of one of the environments."
+      return
     end
-
-    outputs.each { |out| puts out; puts }
+    Arql::App.instance.definitions.first.connection.exec_query(sql)
   end
 
   def generate_csv(filename, **options, &block)
@@ -113,4 +57,69 @@ module Kernel
     JSON.parse(IO.read(File.expand_path(filename)))
   end
 
-end
+  def within_namespace(namespace_pattern, &blk)
+    if namespace_pattern.is_a?(Module)
+      namespace_pattern.module_eval(&blk)
+      return
+    end
+    definition = Arql::App.instance.definitions.find do |_, defi|
+      case namespace_pattern
+      when Symbol
+        defi.namespace.to_s == namespace_pattern.to_s
+      when String
+        defi.namespace.to_s == namespace_pattern
+      when Regexp
+        defi.namespace.to_s =~ namespace_pattern
+      end
+    end
+    if definition
+      definition.last.namespace_module.module_eval(&blk)
+      return
+    end
+
+    $stderr.puts "Namespace #{namespace_pattern.inspect} not found"
+  end
+
+  def within_env(env_name_pattern, &blk)
+    definition = Arql::App.instance.definitions.find do |env_name, defi|
+      case env_name_pattern
+      when Symbol
+        env_name == env_name_pattern.to_s
+      when String
+        env_name == env_name_pattern
+      when Regexp
+        env_name =~ env_name_pattern
+      end
+    end
+    if definition
+      definition.last.namespace_module.module_eval(&blk)
+      return
+    end
+
+    $stderr.puts "Environment #{env_name_pattern.inspect} not found"
+  end
+
+  def models
+    Arql::App.instance.definitions.flat_map do |_, definition|
+      definition.namespace_module.models
+    end
+  end
+
+  def table_names
+    Arql::App.instance.definitions.flat_map do |_, definition|
+      definition.namespace_module.tables
+    end
+  end
+
+  def model_names
+    Arql::App.instance.definitions.flat_map do |_, definition|
+      definition.namespace_module.model_names
+    end
+  end
+
+  def env_config(env_regexp)
+    Arql::App.instance.definitions.find do |env_name, _|
+      env_name =~ env_regexp
+    end.last.options
+  end
+end

data/lib/arql/ext/object.rb

@@ -19,4 +19,18 @@ class Object
   def a
     [self]
   end
+
+  class << self
+    def const_missing(name)
+      return super unless const_defined?(:Arql)
+      return super unless Arql.const_defined?(:App)
+      return super unless Arql::App.instance&.definitions&.present?
+
+      Arql::App.instance.definitions.lazy.filter do |_, definition|
+        definition.namespace_module.const_defined?(name)
+      end.map do |_, definition|
+          definition.namespace_module.const_get(name)
+      end.first || super
+    end
+  end
 end

data/lib/arql/ext/ransack/search.rb

@@ -0,0 +1,29 @@
+Ransack::Search.class_eval do
+  def t(*attrs, **options)
+    result.t(*attrs, **options)
+  end
+
+  def vd(*attrs, **options)
+    result.vd(*attrs, **options)
+  end
+
+  def v
+    result.v
+  end
+
+  def a
+    result.a
+  end
+
+  def write_csv(filename, *fields, **options)
+    result.write_csv(filename, *fields, **options)
+  end
+
+  def write_excel(filename, *fields, **options)
+    result.write_excel(filename, *fields, **options)
+  end
+
+  def dump(filename, batch_size=500)
+    result.dump(filename, batch_size)
+  end
+end

data/lib/arql/mysqldump.rb

@@ -2,7 +2,6 @@ module Arql
   class Mysqldump
 
     def initialize(options = nil)
-      options ||= App.connect_options
       @options = options
       if options[:socket]
         port_or_sock = "-S #{options[:socket]}"

data/lib/arql/ssh_proxy.rb

@@ -3,33 +3,36 @@ require 'arql/ssh_proxy_patch'
 
 module Arql
   class SSHProxy
-    class << self
+    attr_accessor :config, :ssh_gateway, :local_ssh_proxy_port
 
-      attr_accessor :config, :ssh_gateway, :local_ssh_proxy_port
+    def initialize(config)
+      print "Establishing SSH connection to #{config[:host]}:#{config[:port]}"
+      @config = config
+      @ssh_gateway = Net::SSH::Gateway.new(config[:host], config[:user], config.slice(:port, :password).symbolize_keys.merge(keepalive: true, keepalive_interval: 30, loop_wait: 1))
+      @local_ssh_proxy_port = @ssh_gateway.open(config[:forward_host], config[:forward_port], config[:local_port])
+      print "\u001b[2K"
+      puts "\rSSH connection to #{config[:host]}:#{config[:port]} established"
+    end
 
-      def connect(config)
-        print "Establishing SSH connection to #{config[:host]}:#{config[:port]}"
-        @config = config
-        @ssh_gateway = Net::SSH::Gateway.new(config[:host], config[:user], config.slice(:port, :password).symbolize_keys.merge(keepalive: true, keepalive_interval: 30, loop_wait: 1))
-        @local_ssh_proxy_port = @ssh_gateway.open(config[:forward_host], config[:forward_port], config[:local_port])
-        print "\u001b[2K"
-        puts "\rSSH connection to #{config[:host]}:#{config[:port]} established"
-        @local_ssh_proxy_port
-      end
+    def reconnect
+      reconnect! unless @ssh_gateway.active?
+    end
 
-      def reconnect
-        reconnect! unless @ssh_gateway.active?
-      end
+    def reconnect!
+      @ssh_gateway.shutdown!
+      @ssh_gateway = Net::SSH::Gateway.new(@config[:host], @config[:user], @config.slice(:port, :password).symbolize_keys)
+      @ssh_gateway.open(config[:forward_host], config[:forward_port], @local_ssh_proxy_port)
+    end
 
-      def reconnect!
-        @ssh_gateway.shutdown!
-        @ssh_gateway = Net::SSH::Gateway.new(@config[:host], @config[:user], @config.slice(:port, :password).symbolize_keys)
-        @ssh_gateway.open(config[:forward_host], config[:forward_port], @local_ssh_proxy_port)
-      end
+    def active?
+      @ssh_gateway.active?
+    end
 
-      def active?
-        @ssh_gateway.active?
-      end
+    def database_host_port
+      {
+        host: '127.0.0.1',
+        port: @local_ssh_proxy_port
+      }
     end
   end
 end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.3.30"
+  VERSION = "0.4.0"
 end

data/lib/arql.rb

@@ -3,21 +3,25 @@ require 'roo'
 require 'caxlsx'
 require 'csv'
 require 'net/ssh/gateway'
-require "arql/version"
+require 'arql/version'
 require 'arql/id'
 require 'arql/multi_io'
 require 'arql/ext'
-require "arql/repl"
-require "arql/ssh_proxy"
-require "arql/app"
-require "arql/cli"
-require "arql/mysqldump"
-require "arql/vd"
+require 'arql/repl'
+require 'arql/ssh_proxy'
+require 'arql/app'
+require 'arql/cli'
+require 'arql/mysqldump'
+require 'arql/vd'
 require 'active_support/all'
 require 'active_record'
 require 'kaminari/activerecord'
 require 'composite_primary_keys'
 require 'ransack'
 
+require 'arql/ext/active_record/relation'
+require 'arql/ext/active_record/result'
+require 'arql/ext/ransack/search'
+
 module Arql
 end