arproxy 0.1.1 → 0.1.2

data/lib/arproxy/config.rb

@@ -14,8 +14,15 @@ module Arproxy
 
     def adapter_class
       raise Arproxy::Error, "config.adapter must be set" unless @adapter
-      camelized_adapter_name = @adapter.split("_").map(&:capitalize).join
-      eval "::ActiveRecord::ConnectionAdapters::#{camelized_adapter_name}Adapter"
+      case @adapter
+      when String
+        camelized_adapter_name = @adapter.split("_").map(&:capitalize).join
+        eval "::ActiveRecord::ConnectionAdapters::#{camelized_adapter_name}Adapter"
+      when Class
+        @adapter
+      else
+        raise Arproxy::Error, "unexpected config.adapter: #{@adapter}"
+      end
     end
   end
 end

data/lib/arproxy.rb

@@ -1,4 +1,5 @@
 require "logger"
+require "active_record"
 
 module Arproxy
   autoload :Config, "arproxy/config"
@@ -14,6 +15,18 @@ module Arproxy
   end
 
   def enable!
+    if @enabled
+      Arproxy.logger.warn "Arproxy has been already enabled"
+      return
+    end
+
+    unless @config
+      raise Arproxy::Error, "Arproxy should be configured"
+    end
+
+    # for lazy loading
+    ActiveRecord::Base
+
     @proxy_chain = ProxyChain.new @config
 
     @config.adapter_class.class_eval do
@@ -25,15 +38,18 @@ module Arproxy
       alias_method :execute, :execute_with_arproxy
       ::Arproxy.logger.debug("Arproxy: Enabled")
     end
+    @enabled = true
   end
 
   def disable!
-    @config.adapter_class.class_eval do
-      alias_method :execute, :execute_without_arproxy
-      ::Arproxy.logger.debug("Arproxy: Disabled")
+    if @config
+      @config.adapter_class.class_eval do
+        alias_method :execute, :execute_without_arproxy
+        ::Arproxy.logger.debug("Arproxy: Disabled")
+      end
     end
     @proxy_chain = nil
-    @config = nil
+    @enabled = false
   end
 
   def logger

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arproxy
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Issei Naruta
@@ -15,9 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-29 00:00:00 Z
-dependencies: []
-
+date: 2012-07-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id001
 description: Arproxy is a proxy between ActiveRecord and database adapter
 email: naruta@cookpad.com
 executables: []