arql 0.1.33 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7404f5bdf1c9e60f767884ae022d5176a120dad6cd18b2c9597ed76a88a2c89c
-  data.tar.gz: 7dbfe7c5c06c22a0279a1a3005a637a68974973d9bf1962a3d2fad92bd3be912
+  metadata.gz: bcf50149ad9ded8d667ea9afc40dea78d432525c8c62fe4f33d0d164e02acb81
+  data.tar.gz: a6fd83949c0c87f1d4891fae1a8fb0fa65e13a48f9e8ddb327b02f499bdbc73a
 SHA512:
-  metadata.gz: fd8ea1e246a0127800744706f132eefe5079e2f27d76e424896d40cf54a7f64827b0903f0cfeb3e329b57d862a158d11610660c7c93c61fb10d5859b9889ae6c
-  data.tar.gz: 9e9b1ff3104f01d5c4a2685eae6e50f5f1f5e1a14ed8af1991676a1beaeb9c8542cb793b3d1dbee7834e8b0824d8651749d730f4ea3ef5ac921292af60ab640e
+  metadata.gz: 9f73ccc2e3669a6f10fa7555737d09fadec7e0c0457c5b8819dae65055aa6a045153cce2137ccf9a9742f509d9f5c8567fd617e9f3dda7e2136935cf3686a2f3
+  data.tar.gz: ca3d6d547e8267066d72a6e67b09012b42b2e4defa36669c8b304707dc434cd6194a84a201c0fac8d3ed3f749ca017f2b4eaba6ce1f0a3813cfab34140827bc5

data/Gemfile.lock

@@ -1,15 +1,17 @@
 PATH
   remote: .
   specs:
-    arql (0.1.33)
+    arql (0.2.4)
       activerecord (~> 6.0.3)
       activesupport (~> 6.0.3)
+      caxlsx (~> 3.0.2)
       mysql2 (~> 0.5.3)
       net-ssh-gateway (~> 2.0.0)
       pry (~> 0.13.1)
       pry-byebug (~> 3.9.0)
       pry-doc (~> 1.1.0)
       rainbow (~> 3.0.0)
+      roo (~> 2.8.3)
       sqlite3 (~> 1.4)
       table_print (~> 1.5.6)
       terminal-table (~> 1.8.0)
@@ -17,28 +19,38 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    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)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     byebug (11.1.3)
+    caxlsx (3.0.2)
+      htmlentities (~> 4.3, >= 4.3.4)
+      mimemagic (~> 0.3)
+      nokogiri (~> 1.10, >= 1.10.4)
+      rubyzip (>= 1.3.0, < 3)
     coderay (1.1.3)
     concurrent-ruby (1.1.7)
+    htmlentities (4.3.4)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.1)
+    mimemagic (0.3.5)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
     mysql2 (0.5.3)
     net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -50,8 +62,12 @@ GEM
       yard (~> 0.9.11)
     rainbow (3.0.0)
     rake (12.3.3)
+    roo (2.8.3)
+      nokogiri (~> 1)
+      rubyzip (>= 1.3.0, < 3.0.0)
+    rubyzip (2.3.0)
     sqlite3 (1.4.2)
-    table_print (1.5.6)
+    table_print (1.5.7)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)

data/arql.gemspec

@@ -37,4 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rainbow', '~> 3.0.0'
   spec.add_dependency 'terminal-table', '~> 1.8.0'
   spec.add_dependency 'table_print', '~> 1.5.6'
+  spec.add_dependency 'roo', '~> 2.8.3'
+  spec.add_dependency 'caxlsx', '~> 3.0.2'
 end

data/lib/arql.rb

@@ -1,4 +1,7 @@
 require 'table_print'
+require 'roo'
+require 'caxlsx'
+require 'csv'
 require "arql/version"
 require 'arql/id'
 require 'arql/multi_io'

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

@@ -26,6 +26,14 @@ module Arql
       self.class.to_upsert_sql([self])
     end
 
+    def write_csv(filename, *fields, **options)
+      [self].write_csv(filename, *fields, **options)
+    end
+
+    def write_excel(filename, *fields, **options)
+      [self].write_excel(filename, *fields, **options)
+    end
+
     included do
     end
 
@@ -79,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
@@ -116,6 +124,8 @@ module Arql
             end
           end
         end
+
+        App.instance&.load_initializer!
       end
     end
 
@@ -123,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
@@ -168,13 +179,26 @@ 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
+
+      def write_excel(filename, *fields, **options)
+        records.write_excel(filename, *fields, **options)
+      end
+
     end
   end
 end

data/lib/arql/ext/array.rb

@@ -13,8 +13,16 @@ 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)
+      if options.present? && options[:except]
+        attrs = first.attribute_names.map(&:to_sym) 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
@@ -62,4 +70,47 @@ class Array
     end
     t
   end
+
+  def write_csv(filename, *fields, **options)
+    generate_csv(filename, **options) do |csv|
+      if size > 0 && first.is_a?(ActiveRecord::Base)
+        if fields.empty?
+          fields = first.attributes.keys
+        else
+          fields = fields.map(&:to_s)
+        end
+        csv << fields
+      end
+      each do |row|
+        if row.is_a?(Array)
+          csv << row.map(&:to_s)
+        else
+          csv << row.slice(fields).values.map(&:to_s)
+        end
+      end
+    end
+  end
+
+  def write_excel(filename, *fields, **options)
+    sheet_name = options[:sheet_name] || 'Sheet1'
+    generate_excel(filename) do |workbook|
+      workbook.add_worksheet(name: sheet_name) do |sheet|
+        if size > 0 && first.is_a?(ActiveRecord::Base)
+          if fields.empty?
+            fields = first.attributes.keys
+          else
+            fields = fields.map(&:to_s)
+          end
+          sheet.add_row(fields, types: [:string] * fields.size)
+        end
+        each do |row|
+          if row.is_a?(Array)
+            sheet.add_row(row.map(&:to_s), types: [:string] * row.size)
+          else
+            sheet.add_row(row.slice(fields).values.map(&:to_s), types: [:string] * fields.size)
+          end
+        end
+      end
+    end
+  end
 end

data/lib/arql/ext/hash.rb

@@ -0,0 +1,25 @@
+class Hash
+  def write_excel(filename)
+    generate_excel(filename) do |workbook|
+      each do |sheet_name, sheet_data|
+        workbook.add_worksheet(name: sheet_name) do |sheet|
+          if sheet_data.is_a?(Hash) && sheet_data[:fields].present?
+              fields = sheet_data[:fields].map(&:to_s)
+            else
+              fields = sheet_data[:data].first.attributes.keys
+            end
+            sheet.add_row(fields, types: [:string] * fields.size)
+            sheet_data = sheet_data[:data]
+          end
+          sheet_data.each do |row|
+            if row.is_a?(Array)
+              sheet.add_row(row.map(&:to_s), types: [:string] * row.size)
+            else
+              sheet.add_row(row.slice(fields).values.map(&:to_s), types: [:string] * fields.size)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/arql/ext/kernel.rb

@@ -1,4 +1,6 @@
 module Kernel
+  CSV_BOM = "\xef\xbb\xbf"
+
   def sql(sql)
     ActiveRecord::Base.connection.exec_query(sql)
   end
@@ -62,4 +64,45 @@ module Kernel
 
     outputs.each { |out| puts out; puts }
   end
+
+  def generate_csv(filename, **options, &block)
+    opts = {
+      col_sep: "\t",
+      row_sep: "\r\n"
+    }
+    opts.merge!(options.except(:encoding))
+    encoding = options[:encoding] || 'UTF-16LE'
+    File.open(File.expand_path(filename), "w:#{encoding}") do |file|
+      file.write(CSV_BOM)
+      file.write CSV.generate(**opts, &block)
+    end
+  end
+
+  def parse_csv(filename, **options)
+    encoding = options[:encoding] || 'UTF-16'
+    opts = {
+      headers: false,
+      col_sep: "\t",
+      row_sep: "\r\n"
+    }
+    opts.merge!(options.except(:encoding))
+    CSV.parse(IO.read(File.expand_path(filename), encoding: encoding, binmode: true).encode('UTF-8'), **opts).to_a
+  end
+
+  def generate_excel(filename)
+    Axlsx::Package.new do |package|
+      yield(package.workbook)
+      package.serialize(filename)
+    end
+  end
+
+  def parse_excel(filename)
+    xlsx = Roo::Excelx.new(File.expand_path(filename))
+    xlsx.sheets.each_with_object({}) do |sheet_name, result|
+      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.1.33"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.2.4
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -164,6 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.6
+- !ruby/object:Gem::Dependency
+  name: roo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+- !ruby/object:Gem::Dependency
+  name: caxlsx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 description: Use ActiveRecord and Pry as your favorite SQL query editor.
 email:
 - liuxiang921@gmail.com
@@ -199,6 +227,7 @@ files:
 - lib/arql/definition.rb
 - lib/arql/ext.rb
 - lib/arql/ext/array.rb
+- lib/arql/ext/hash.rb
 - lib/arql/ext/kernel.rb
 - lib/arql/ext/object.rb
 - lib/arql/ext/string.rb