fresh_connection 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3236c1e50671a5ba2387ef7d09abd2fe182f6018
-  data.tar.gz: 16e4b85ad933af49e471969d65547855b9b2a09c
+  metadata.gz: 755153c16ffcf02081f831ae593d7b15a23ea0d2
+  data.tar.gz: 45145aa7be5d694975dfbc46330bd921d158d246
 SHA512:
-  metadata.gz: ffc51c4d326026040e127db6e4c56d7f67ef40c58b5d4cc9f39b60dc9c60713cab0553b7671b9ccf35dc0c996984e1fadc81bca6c9b2a2e348829c29cc7235db
-  data.tar.gz: e12983fa297222b1aeb6ec63841820383c6d9f714e0f4b62135354a7b96298ffdea9feec6ca6f8ceb9df80b99edbc09c0314e5dce955668acb959673eb39a84d
+  metadata.gz: 8ed0b205aa9966468e9a39033b1726539d7bfc01acd66835f697f37739acc25369475b40163b5330e61cccf0abe26af388a8f32a6e072796a4f41739a163e993
+  data.tar.gz: 89c830adfcc482727dea49d243e694d9d6e29ba4071eb6576c20dcafe7d0f76a19d8f6f45d2a021c7e616e36fa256e3ad6f449df3d8713c525fff7b963e7af20

data/.gitignore

@@ -3,6 +3,5 @@
 .ruby-version
 Gemfile.lock
 gemfiles/*.lock
-bundle
 log/*
 .*.sw[a-z]

data/.travis.yml

@@ -5,7 +5,6 @@ before_script:
   - mysql -e 'create database fresh_connection_test_slave;'
   - "bundle exec ruby spec/prepare.rb"
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2

data/README.md

@@ -37,7 +37,6 @@ If you want to access to the master server, use read_master.
 ```ruby
 Article.where(:id => 1).read_master
 ```
-
 It is possible to use readonly(false) instead of read_master, but it will be depricated at future version.
 
 In transaction, All queries go to the master server.
@@ -146,11 +145,11 @@ AdminUser and Benefit access to ```admin_slave``` slave group.
       master_db_only!
     end
 
-If a model that always access to the master server is exist, You write ```master_db_only!```  in the model.  
+If a model that always access to the master server is exist, You write ```master_db_only!```  in the model.
 The model that master_db_only model's child is always access to master db.
 
 ### Slave Connection Manager
-Default slave connection manager is FreshConnection::ConnectionManager.  
+Default slave connection manager is FreshConnection::ConnectionManager.
 If you would like to change slave connection manager, assign yourself slave connection manager.
 
 #### config/initializers/fresh_connection.rb
@@ -185,15 +184,15 @@ Yourself Slave Connection Manager should be inherited FreshConnection::AbstractC
 
 ## Test
 
-I'm glad that you would do test!  
-To run the test suite, you need mysql installed.  
+I'm glad that you would do test!
+To run the test suite, you need mysql installed.
 How to setup your test environment.
 
 First of all, you setting the config of the test mysql server in ```spec/database.yml```
 
 ```bash
-bundle install --path bundle
-GEM_HOME=bundle/ruby/(your ruby version) gem install bundler --pre
+bundle install --path .bundle
+GEM_HOME=.bundle/ruby/(your ruby version) gem install bundler --pre
 bundle exec appraisal install
 ```
 

data/lib/fresh_connection/connection_factory.rb

@@ -0,0 +1,31 @@
+module FreshConnection
+  class ConnectionFactory
+    def initialize(group, modify_spec = {})
+      @group = group.to_sym
+      @modify_spec = modify_spec
+    end
+
+    def new_connection
+      ActiveRecord::Base.__send__(adapter_method, spec)
+    end
+
+    private
+
+    def adapter_method
+      @adapter_method ||= ar_spec.adapter_method
+    end
+
+    def spec
+      @spec ||= build_spec
+    end
+
+    def build_spec
+      config = ar_spec.config
+      config.merge(config[@group] || {}).merge(@modify_spec)
+    end
+
+    def ar_spec
+      ActiveRecord::Base.connection_pool.spec
+    end
+  end
+end

data/lib/fresh_connection/connection_manager.rb

@@ -1,10 +1,11 @@
 require 'fresh_connection/abstract_connection_manager'
+require 'fresh_connection/connection_factory'
 
 module FreshConnection
   class ConnectionManager < AbstractConnectionManager
     def slave_connection
       synchronize do
-        slave_connections[current_thread_id] ||= new_connection
+        slave_connections[current_thread_id] ||= connection_factory.new_connection
       end
     end
 
@@ -28,17 +29,8 @@ module FreshConnection
       @slave_connections ||= {}
     end
 
-    def new_connection
-      ActiveRecord::Base.send("mysql2_connection", spec)
-    end
-
-    def spec
-      @spec ||= get_spec
-    end
-
-    def get_spec
-      ret = ActiveRecord::Base.configurations[FreshConnection.env]
-      ret.merge(ret[@slave_group] || {})
+    def connection_factory
+      @connection_factory ||= ConnectionFactory.new(@slave_group)
     end
   end
 end

data/lib/fresh_connection/extend/ar_base.rb

@@ -1,3 +1,7 @@
+require 'active_support/core_ext/class/attribute'
+require 'fresh_connection/slave_connection_handler'
+require 'fresh_connection/access_control'
+
 module FreshConnection
   module Extend
     module ArBase

data/lib/fresh_connection/extend/ar_relation.rb

@@ -1,18 +1,22 @@
+require 'active_support/deprecation'
+
 module FreshConnection
   module Extend
     module ArRelation
-      def self.included(base)
-        base.alias_method_chain :exec_queries, :fresh_connection
-
+      def self.prepended(base)
         if FreshConnection.rails_4?
-          base.__send__(:include, ForRails4)
+          base.__send__(:prepend, ForRails4)
         elsif FreshConnection.rails_3?
-          base.__send__(:include, ForRails3)
+          base.__send__(:prepend, ForRails3)
         end
       end
 
 
       def calculate(operation, column_name, options = {})
+        if options[:readonly] == false
+          ActiveSupport::Deprecation.warn(":readonly key has been deprecated.", caller)
+        end
+
         slave_access = enable_slave_access && options[:readonly] != false
         @klass.manage_access(slave_access) { super }
       end
@@ -21,13 +25,22 @@ module FreshConnection
         connection.open_transactions == 0 && @read_from_master.nil?
       end
 
+      def readonly(value = true)
+        if value == false
+          ActiveSupport::Deprecation.warn("readonly(false) has been deprecated. Use read_master instead", caller)
+          read_master
+        else
+          super
+        end
+      end
+
       private
 
-      def exec_queries_with_fresh_connection
+      def exec_queries
         return @records if loaded?
 
         @klass.manage_access(enable_slave_access) do
-          exec_queries_without_fresh_connection
+          super
         end
       end
 
@@ -36,10 +49,6 @@ module FreshConnection
           @klass.manage_access(enable_slave_access) { super }
         end
 
-        def readonly(value = true)
-          value == false ? read_master : super
-        end
-
         def read_master
           spawn.read_master!
         end
@@ -69,10 +78,6 @@ module FreshConnection
           end
         end
 
-        def readonly(value = true)
-          value == false ? read_master : super
-        end
-
         def read_master
           relation = clone
           relation.instance_variable_set("@read_from_master", true)

data/lib/fresh_connection/extend/ar_statement_cache.rb

@@ -1,13 +1,9 @@
 module FreshConnection
   module Extend
     module ArStatementCache
-      def self.included(base)
-        base.alias_method_chain :execute, :fresh_connection
-      end
-
-      def execute_with_fresh_connection(params, klass, connection)
+      def execute(params, klass, connection)
         klass.manage_access(klass.all.enable_slave_access) do
-          execute_without_fresh_connection(params, klass, connection)
+          super
         end
       end
     end

data/lib/fresh_connection/extend/connection_handler.rb

@@ -1,12 +1,8 @@
 module FreshConnection
   module Extend
     module ConnectionHandler
-      def self.included(base)
-        base.alias_method_chain :retrieve_connection, :fresh_connection
-      end
-
-      def retrieve_connection_with_fresh_connection(klass)
-        c = retrieve_connection_without_fresh_connection(klass)
+      def retrieve_connection(klass)
+        c = super
         c.model_class = klass
         c
       end

data/lib/fresh_connection/extend/mysql2_adapter.rb

@@ -1,10 +1,12 @@
+require 'fresh_connection/access_control'
+
 module FreshConnection
   module Extend
     module Mysql2Adapter
       RETRY_LIMIT = 3
       private_constant :RETRY_LIMIT
 
-      def self.included(base)
+      def self.prepended(base)
         base.__send__(:attr_writer, :model_class)
       end
 

data/lib/fresh_connection/extend.rb

@@ -8,20 +8,19 @@ ActiveSupport.on_load(:active_record) do
   require 'active_record/connection_adapters/mysql2_adapter'
 
   ActiveRecord::Base.extend FreshConnection::Extend::ArBase
-
-  ActiveRecord::Relation.__send__(:include, FreshConnection::Extend::ArRelation)
+  ActiveRecord::Relation.__send__(:prepend, FreshConnection::Extend::ArRelation)
 
   ActiveRecord::ConnectionAdapters::ConnectionHandler.__send__(
-    :include, FreshConnection::Extend::ConnectionHandler
+    :prepend, FreshConnection::Extend::ConnectionHandler
   )
 
   ActiveRecord::ConnectionAdapters::Mysql2Adapter.__send__(
-    :include, FreshConnection::Extend::Mysql2Adapter
+    :prepend, FreshConnection::Extend::Mysql2Adapter
   )
 
   if defined?(ActiveRecord::StatementCache)
     require 'fresh_connection/extend/ar_statement_cache'
-    ActiveRecord::StatementCache.__send__(:include, FreshConnection::Extend::ArStatementCache)
+    ActiveRecord::StatementCache.__send__(:prepend, FreshConnection::Extend::ArStatementCache)
   end
 
   ActiveRecord::Base.establish_fresh_connection

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end
 

data/lib/fresh_connection.rb

@@ -1,22 +1,21 @@
-require 'active_record'
-require 'fresh_connection/access_control'
+require 'active_support/deprecation'
 require 'fresh_connection/connection_manager'
-require 'fresh_connection/slave_connection_handler'
 
 module FreshConnection
-  extend ActiveSupport::Autoload
-
-  autoload :ConnectionManager
-  autoload :SlaveConnectionHandler
-
   class << self
-    attr_writer :connection_manager, :env
+    attr_writer :connection_manager
 
     def connection_manager
       @connection_manager || ConnectionManager
     end
 
+    def env=(e)
+      ActiveSupport::Deprecation.warn("FreshConnection.env= has been deprecated.", caller)
+      @env = e
+    end
+
     def env
+      ActiveSupport::Deprecation.warn("FreshConnection.env has been deprecated.", caller)
       @env || defined?(Rails) && Rails.env
     end
 

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ ENV["RAILS_ENV"]="test"
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'fresh_connection'
 
-FreshConnection.env = "test"
 require File.join(File.dirname(__FILE__), "prepare.rb")
 
 Dir[File.join(File.dirname(__FILE__), "/support/**/*.rb")].each {|f| require f}

data/spec/unit/fresh_connection_spec.rb

@@ -90,21 +90,23 @@ describe FreshConnection do
     end
 
     it "specify readonly(false)" do
-      data = [
-        Address.readonly(false).first.prefecture,
-        Address.includes(:user).readonly(false).first.user.name,
-        Tel.readonly(false).first.number,
-        Tel.includes(:user).readonly(false).first.user.name,
-        @user.tels.readonly(false).first.number,
-        User.where(id: 1).includes(:tels).readonly(false).first.tels.first.number,
-        User.where(id: 1).includes(:address).readonly(false).first.address.prefecture,
-        User.where(id: 1).joins(:address).where("addresses.user_id = 1").readonly(false).first.name,
-        User.where(id: 1).readonly(false).pluck(:name).first
-      ]
+      ActiveSupport::Deprecation.silence do
+        data = [
+          Address.readonly(false).first.prefecture,
+          Address.includes(:user).readonly(false).first.user.name,
+          Tel.readonly(false).first.number,
+          Tel.includes(:user).readonly(false).first.user.name,
+          @user.tels.readonly(false).first.number,
+          User.where(id: 1).includes(:tels).readonly(false).first.tels.first.number,
+          User.where(id: 1).includes(:address).readonly(false).first.address.prefecture,
+          User.where(id: 1).joins(:address).where("addresses.user_id = 1").readonly(false).first.name,
+          User.where(id: 1).readonly(false).pluck(:name).first
+        ]
 
-      expect(data).to be_all{|n| n.include?("master")}
-      expect(User.where(name: "Other").readonly(false).count).to eq(1)
-      expect(User.where(name: "Other").count(:readonly => false)).to eq(1)
+        expect(data).to be_all{|n| n.include?("master")}
+        expect(User.where(name: "Other").readonly(false).count).to eq(1)
+        expect(User.where(name: "Other").count(:readonly => false)).to eq(1)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,6 +142,7 @@ files:
 - lib/fresh_connection.rb
 - lib/fresh_connection/abstract_connection_manager.rb
 - lib/fresh_connection/access_control.rb
+- lib/fresh_connection/connection_factory.rb
 - lib/fresh_connection/connection_manager.rb
 - lib/fresh_connection/extend.rb
 - lib/fresh_connection/extend/ar_base.rb