arql 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfa69341937ac1de34d54c8d3506759fd4979d59cc4d52333726cd8ba04fb346
-  data.tar.gz: 4e65c0ea33d4c45c52e166839fdd777280d62d8b0c7127f8cb75760c0cfd230d
+  metadata.gz: 27b435e716bd7f2f1a9a806508fd4542887ed3a21ba02355ec0c1a5476cd3c0e
+  data.tar.gz: 59b8a4267407fcafe2df3714e785fd971cde979cc533802b33b3709ea2bc893d
 SHA512:
-  metadata.gz: 3c1ac9cbcf12be0ca4c48040a7f7e007b72f09932ef26ec4a4b40ac168a10ce04771a8587bfc25800b21166975204a986c6c2265269dfe2953bc90cf16608c7f
-  data.tar.gz: efe8de33f0365fcf871c0a160ddabeb4064e216a63fee7b9918af715d60dfd099e1881a124f8277d95e8ccb5c79df43eadfd660fa75f09f8f41c37806ce2e2f2
+  metadata.gz: 5493f7b368308e4e041c10f6562744bdb6ea47841959430c94e937b032f5d5fb44fbfc0d4217a9bc71b913fccdf70b4e23bd39f826bf47ec322a54223e2c34ab
+  data.tar.gz: b73fd3af4bcfbefe0502f5e7d44ad1dfcea63d22e906199550d3a432a0858769445d3d3d5e155e854e244e761616fe15e390e054306b24206aaf72abe13e2760

data/.vscode/launch.json

@@ -6,12 +6,15 @@
     "configurations": [
         {
             "type": "rdbg",
-            "name": "Debug current file with rdbg",
+            "name": "Debug Arql",
             "request": "launch",
             "script": "exe/arql",
             "command": "bundle exec",
             "useTerminal": true,
-            "args": ["-e", "lcldevb,demo247"],
+            "args": [
+                "-e",
+                "${input:env}"
+            ],
             "askParameters": false
         },
         {
@@ -19,5 +22,18 @@
             "name": "Attach with rdbg",
             "request": "attach"
         }
+    ],
+    "inputs": [
+        {
+            "id": "env",
+            "type": "command",
+            "command": "extension.commandvariable.pickStringRemember",
+            "args": {
+                "fileName": "${userHome}/.arql.d/init.yml",
+                "pattern": {
+                    "regexp": "^([\\w\\.]+):.*"
+                }
+            }
+        }
     ]
 }

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.4.1)
+    arql (0.4.3)
       activerecord (>= 6.1.5, < 7.1.0)
       activesupport (>= 6.1.5, < 7.1.0)
       caxlsx (~> 3.3.0)

data/lib/arql/definition.rb

@@ -17,6 +17,20 @@ module Arql
         }
       end.t
     end
+
+    define_singleton_method(:like) do |**args|
+      send(:ransack, "#{args.keys.first}_cont" => args.values.first).result
+    end
+
+    def self.method_missing(method_name, *args, &block)
+      if method_name.to_s =~ /^(.+)_like$/
+        attr_name = $1.to_sym
+        return super unless respond_to?(attr_name)
+        send(:like, $1 => args.first)
+      else
+        super
+      end
+    end
   end
 
   class Definition
@@ -157,7 +171,7 @@ module Arql
     def get_connection_options
       connect_conf = @options.slice(:adapter, :host, :username, :password,
                                 :database, :encoding, :pool, :port, :socket)
-      connect_conf.merge(@ssh_proxy.database_host_port) if @ssh_proxy
+      connect_conf.merge!(@ssh_proxy.database_host_port) if @ssh_proxy
       connect_conf
     end
 

data/lib/arql/ext/active_record/base.rb

@@ -0,0 +1,27 @@
+module Ransack
+  module Adapters
+    module ActiveRecord
+      module Base
+        def ransack(params = {}, options = {})
+          old_base_connection = ::ActiveRecord::Base.method(:connection)
+          connection_obj = connection
+          ::ActiveRecord::Base.define_singleton_method(:connection) { connection_obj }
+          Search.new(self, params, options)
+        ensure
+          ::ActiveRecord::Base.define_singleton_method(:connection, old_base_connection)
+        end
+      end
+    end
+  end
+
+  class Search
+    def result(opts = {})
+      old_base_connection = ::ActiveRecord::Base.method(:connection)
+      connection_obj = @context.klass.connection
+      ::ActiveRecord::Base.define_singleton_method(:connection) { connection_obj }
+      @context.evaluate(self, opts)
+    ensure
+      ::ActiveRecord::Base.define_singleton_method(:connection, old_base_connection)
+    end
+  end
+end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

data/lib/arql.rb

@@ -19,6 +19,7 @@ require 'kaminari/activerecord'
 require 'composite_primary_keys'
 require 'ransack'
 
+require 'arql/ext/active_record/base'
 require 'arql/ext/active_record/relation'
 require 'arql/ext/active_record/result'
 require 'arql/ext/ransack/search'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -340,6 +340,7 @@ files:
 - lib/arql/concerns/table_data_definition.rb
 - lib/arql/definition.rb
 - lib/arql/ext.rb
+- lib/arql/ext/active_record/base.rb
 - lib/arql/ext/active_record/connection_adapters/abstract_mysql_adapter.rb
 - lib/arql/ext/active_record/connection_adapters/postgresql/schema_statements.rb
 - lib/arql/ext/active_record/relation.rb