arproxy 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f18154f8ee6ecf1521f1af75e0a47e821795c232
-  data.tar.gz: e7b868bb35c46c3b1f76f7b0a63c9e9b0086fbee
+SHA256:
+  metadata.gz: 60641c3f1965a76a0c1db42a2421c452a1bb24e86b7294d1ebf97f8121e90e1b
+  data.tar.gz: 2db239c2a83a87b7a6c82f6ca393627b8321ef046c1c812a73345d010de979cd
 SHA512:
-  metadata.gz: 261e78587718c45b0d94f6c79a062c6196737a1d00250c95d2f1d8f7cf767b2d48b0e64c166c6830b53d96b7c30b1f0b2e1bd64ed5485285143f1ecdada83d73
-  data.tar.gz: 9e5fc6af40d3501453a395b9f343a11913865026771234d5504f99b937cf542f2d03d51da85c09a8a876f737482e80f67d245d2ad54cb56162eefd97f8120859
+  metadata.gz: 1a14ee492493067731519de3aa0afa254382e0f2dac5b2a270463b79e58bcc9111638d8f0610e60b153caaa54113f3b4ed1c11e7c79fa122d800c441ef43e97e
+  data.tar.gz: 5ff692aacaa53010fbe17ac1f9f435c2ec9bec275554438b48de1c4feba41e9b4c70f7be857512757d648c3c93a2f4ef1d9875c887cde375398585a59b10a254

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!
 

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,20 @@ 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'
+      else
+        adapter_name
+      end
+    end
   end
 end

data/lib/arproxy/version.rb

@@ -1,3 +1,3 @@
 module Arproxy
-  VERSION = '0.2.2'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arproxy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,30 +28,30 @@ dependencies:
   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
@@ -113,8 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Proxy between ActiveRecord and DB adapter