arproxy 0.2.1 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e3acb78f4d8addde48779c3e54050d877ebfa5b
-  data.tar.gz: 6a40e472537c70d7fe6afff1b621edfe64966ed9
+SHA256:
+  metadata.gz: 97417dad77bf18a6a058b5a7bf30cfd2118e70a2db8da4eb9574f5d6694b1119
+  data.tar.gz: 76361afc976b7fd086c702fb7dd0629b3d0ad85776667b1438d323db64173139
 SHA512:
-  metadata.gz: 2f391580b3d1f7f45e3837b34f5f6b9a9b55b5dd8e08c10a4e6c4c90a0da48aeaddc475484c0ea846fe3ede2204a3c0f8c05d2334fa60f1c0bb3d284113003c0
-  data.tar.gz: 286f3c89478e6d72cd7ef9c7dc4b5491c1d69d503c84493dadce7fa80441344975da6678349b4495d6929d846459c45d6213616d1653940e43b4868bfbd57cdd
+  metadata.gz: 0515356f2ddafdb1f77bbb6dfb49769fbc4d08d1381bf2657f32210d3dd9841f3e29d5ca157f6e24e23392d219f0123dc703c0e1c34e083ee06ed58d3f09ec32
+  data.tar.gz: 95ce473dc91f7d5a38009eb105b35b3f8760f31f8fbb85b9fe45c66151864c98120585f6476363dc395f3a1d66a3d3433e4d2355c420b36dff4e392464c9c51d

data/lib/arproxy/base.rb

@@ -2,8 +2,8 @@ module Arproxy
   class Base
     attr_accessor :proxy_chain, :next_proxy
 
-    def execute(sql, name=nil)
-      next_proxy.execute sql, name
+    def execute(sql, name=nil, **kwargs)
+      next_proxy.execute sql, name, **kwargs
     end
   end
 end

data/lib/arproxy/chain_tail.rb

@@ -4,8 +4,8 @@ module Arproxy
       self.proxy_chain = proxy_chain
     end
 
-    def execute(sql, name=nil)
-      self.proxy_chain.connection.execute_without_arproxy sql, name
+    def execute(sql, name=nil, **kwargs)
+      self.proxy_chain.connection.execute_without_arproxy sql, name, **kwargs
     end
   end
 end

data/lib/arproxy/config.rb

@@ -1,3 +1,6 @@
+require "active_record"
+require "active_record/base"
+
 module Arproxy
   class Config
     attr_accessor :adapter, :logger
@@ -5,6 +8,9 @@ module Arproxy
 
     def initialize
       @proxies = []
+      if defined?(Rails)
+        @adapter = Rails.application.config_for(:database)["adapter"]
+      end
     end
 
     def use(proxy_class, *options)
@@ -21,7 +27,6 @@ module Arproxy
       raise Arproxy::Error, "config.adapter must be set" unless @adapter
       case @adapter
       when String, Symbol
-        camelized_adapter_name = @adapter.to_s.split("_").map(&:capitalize).join
         eval "::ActiveRecord::ConnectionAdapters::#{camelized_adapter_name}Adapter"
       when Class
         @adapter
@@ -29,5 +34,22 @@ module Arproxy
         raise Arproxy::Error, "unexpected config.adapter: #{@adapter}"
       end
     end
+
+    private
+
+    def camelized_adapter_name
+      adapter_name = @adapter.to_s.split("_").map(&:capitalize).join
+
+      case adapter_name
+      when 'Sqlite3'
+        'SQLite3'
+      when 'Sqlserver'
+        'SQLServer'
+      when 'Postgresql'
+        'PostgreSQL'
+      else
+        adapter_name
+      end
+    end
   end
 end

data/lib/arproxy/proxy_chain.rb

@@ -29,9 +29,9 @@ module Arproxy
 
     def enable!
       @config.adapter_class.class_eval do
-        def execute_with_arproxy(sql, name=nil)
+        def execute_with_arproxy(sql, name=nil, **kwargs)
           ::Arproxy.proxy_chain.connection = self
-          ::Arproxy.proxy_chain.head.execute sql, name
+          ::Arproxy.proxy_chain.head.execute sql, name, **kwargs
         end
         alias_method :execute_without_arproxy, :execute
         alias_method :execute, :execute_with_arproxy

data/lib/arproxy/version.rb

@@ -1,3 +1,3 @@
 module Arproxy
-  VERSION = '0.2.1'
+  VERSION = '0.2.9'
 end

data/lib/arproxy.rb

@@ -1,5 +1,4 @@
 require "logger"
-require "active_record"
 require "arproxy/base"
 require "arproxy/config"
 require "arproxy/proxy_chain"
@@ -7,6 +6,7 @@ require "arproxy/error"
 require "arproxy/plugin"
 
 module Arproxy
+  @config = @enabled = nil
 
   module_function
   def clear_configuration
@@ -28,9 +28,6 @@ module Arproxy
       raise Arproxy::Error, "Arproxy should be configured"
     end
 
-    # for lazy loading
-    ::ActiveRecord::Base
-
     @proxy_chain = ProxyChain.new @config
     @proxy_chain.enable!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arproxy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.9
 platform: ruby
 authors:
 - Issei Naruta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ homepage: https://github.com/cookpad/arproxy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Proxy between ActiveRecord and DB adapter
 test_files: []