arproxy 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 191862b3b6b33176695a8d12e0111c25f966dfd7
+  data.tar.gz: 8862e8f9fd12c7d3d25d40572f4377a798a0a8e7
+SHA512:
+  metadata.gz: 40fbee48d349461d7306ec13905eb262d1f52d48cb8cdad2cd15dd29e3be0cf6525c3e3848d176109dddd1b138a80c7c0edb40f2a69a1d9b55d2369a392af40b
+  data.tar.gz: 590181c81ca59b274aa493dafa309e78e8cac06838d329cce93029820d338aa1a2f0fc8756985119660804af34852e13a6ac2563fd0505dbe747e907c8f69f35

data/lib/arproxy.rb

@@ -1,21 +1,24 @@
 require "logger"
 require "active_record"
+require "arproxy/base"
+require "arproxy/config"
+require "arproxy/proxy_chain"
+require "arproxy/error"
 
 module Arproxy
-  autoload :Config, "arproxy/config"
-  autoload :ProxyChain, "arproxy/proxy_chain"
-  autoload :Error, "arproxy/error"
-  autoload :Base, "arproxy/base"
 
   module_function
+  def clear_configuration
+    @config = Config.new
+  end
+
   def configure
-    config = Config.new
-    yield config
-    @config = config
+    clear_configuration unless @config
+    yield @config
   end
 
   def enable!
-    if @enabled
+    if enable?
       Arproxy.logger.warn "Arproxy has been already enabled"
       return
     end
@@ -25,33 +28,39 @@ module Arproxy
     end
 
     # for lazy loading
-    ActiveRecord::Base
+    ::ActiveRecord::Base
 
     @proxy_chain = ProxyChain.new @config
+    @proxy_chain.enable!
 
-    @config.adapter_class.class_eval do
-      def execute_with_arproxy(sql, name=nil)
-        ::Arproxy.proxy_chain.connection = self
-        ::Arproxy.proxy_chain.head.execute sql, name
-      end
-      alias_method :execute_without_arproxy, :execute
-      alias_method :execute, :execute_with_arproxy
-      ::Arproxy.logger.debug("Arproxy: Enabled")
-    end
     @enabled = true
   end
 
   def disable!
-    if @config
-      @config.adapter_class.class_eval do
-        alias_method :execute, :execute_without_arproxy
-        ::Arproxy.logger.debug("Arproxy: Disabled")
-      end
+    unless enable?
+      Arproxy.logger.warn "Arproxy is not enabled yet"
+      return
+    end
+
+    if @proxy_chain
+      @proxy_chain.disable!
+      @proxy_chain = nil
     end
-    @proxy_chain = nil
     @enabled = false
   end
 
+  def enable?
+    !!@enabled
+  end
+
+  def reenable!
+    if enable?
+      @proxy_chain.reenable!
+    else
+      enable!
+    end
+  end
+
   def logger
     @logger ||= begin
                   @config && @config.logger ||
@@ -64,4 +73,3 @@ module Arproxy
     @proxy_chain
   end
 end
-

data/lib/arproxy/config.rb

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

data/lib/arproxy/proxy_chain.rb

@@ -7,20 +7,44 @@ module Arproxy
 
     def initialize(config)
       @config = config
-      setup_proxy_chain(@config)
+      setup
     end
 
-    def setup_proxy_chain(config)
+    def setup
       @tail = ChainTail.new self
-      @head = config.proxies.reverse.inject(@tail) do |next_proxy, proxy_config|
+      @head = @config.proxies.reverse.inject(@tail) do |next_proxy, proxy_config|
         cls, options = proxy_config
-        proxy = cls.new *options
+        proxy = cls.new(*options)
         proxy.proxy_chain = self
         proxy.next_proxy = next_proxy
         proxy
       end
     end
-    private :setup_proxy_chain
+    private :setup
 
+    def reenable!
+      disable!
+      setup
+      enable!
+    end
+
+    def enable!
+      @config.adapter_class.class_eval do
+        def execute_with_arproxy(sql, name=nil)
+          ::Arproxy.proxy_chain.connection = self
+          ::Arproxy.proxy_chain.head.execute sql, name
+        end
+        alias_method :execute_without_arproxy, :execute
+        alias_method :execute, :execute_with_arproxy
+        ::Arproxy.logger.debug("Arproxy: Enabled")
+      end
+    end
+
+    def disable!
+      @config.adapter_class.class_eval do
+        alias_method :execute, :execute_without_arproxy
+        ::Arproxy.logger.debug("Arproxy: Disabled")
+      end
+    end
   end
 end

data/lib/arproxy/version.rb

@@ -0,0 +1,3 @@
+module Arproxy
+  VERSION = '0.1.3'
+end

metadata

@@ -1,84 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: arproxy
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-27 00:00:00.000000000 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"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Arproxy is a proxy between ActiveRecord and database adapter
 email: naruta@cookpad.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/arproxy/base.rb
 - lib/arproxy/chain_tail.rb
 - lib/arproxy/config.rb
 - lib/arproxy/error.rb
 - lib/arproxy/proxy_chain.rb
+- lib/arproxy/version.rb
 - lib/arproxy.rb
 homepage: https://github.com/cookpad/arproxy
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Proxy between ActiveRecord and DB adapter
 test_files: []
-