fresh_connection 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c16201d2d78df2ff383e4bc7244c9668be149da
-  data.tar.gz: 2503258f35652b002ead86bf15df8d514d98ccd7
+  metadata.gz: f896f7889dfe9faf024a5905f135bee636f35fe0
+  data.tar.gz: bf059b853f63b8beb128708c5c6f3363ca2393ca
 SHA512:
-  metadata.gz: 98eb7cfc764ddb1ef1f01d8b811e041c8c2cd48f34a2e6accb7ac3c9c94960fd3561c5e28653a1688cd4c336cb093aff069f69c42f6fc5f7f929557f69c899fd
-  data.tar.gz: 20fc03256242b7d105aa9194b33ee11d74d6d6260b2952c218d8d733e690cf16ee53ce1c5b565011ecdb6a9f16ccc6fbb2f4c33a8a950febc5f7f744638c697b
+  metadata.gz: 9e7f30d3bcbf4e26c6ba5eb4222f3e59ee27237f2d32b7a04948f5bdbb325f9c72c43f74af43916c515fc56fa57d7b93d355b03e15771fc9a24ae301bf08e109
+  data.tar.gz: bfc44fd46e95eb800008fb30917b3195f978b0ea6ebdfbe24b9b65fd13f09335c298254c0661797339bbe7894f62cfd8224fc019099ea51af36bd0ff57adcb4d

data/lib/fresh_connection/extend/ar_relation.rb

@@ -16,6 +16,10 @@ module FreshConnection
         @klass.manage_access(slave_access) { super }
       end
 
+      def pluck(*args)
+        @klass.manage_access(enable_slave_access) { super }
+      end
+
       private
 
       def exec_queries_with_fresh_connection

data/lib/fresh_connection/extend/mysql2_adapter.rb

@@ -4,15 +4,16 @@ module FreshConnection
       def self.included(base)
         base.__send__(:attr_writer, :model_class)
         base.alias_method_chain :configure_connection, :fresh_connection
+        base.alias_method_chain :execute, :fresh_connection
       end
 
-      def select_all(arel, name = nil, binds = [])
-        if FreshConnection::AccessControl.slave_access?
+      def execute_with_fresh_connection(sql, name = nil)
+        if @model_class && FreshConnection::AccessControl.slave_access?
           change_connection do
-            super(arel, "[#{@model_class.slave_group}] #{name}", binds)
+            execute_without_fresh_connection(sql, "[#{@model_class.slave_group}] #{name}")
           end
         else
-          super
+          execute_without_fresh_connection(sql, name)
         end
       end
 

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end
 

data/spec/unit/fresh_connection_spec.rb

@@ -38,6 +38,10 @@ describe FreshConnection do
       name = User.joins(:address).where("addresses.user_id = 1").first.name
       expect(name).to be_include("slave1")
     end
+
+    it "pluck is access to slave1" do
+      expect(User.pluck(:name).first).to be_include("slave")
+    end
   end
 
   context "access to master" do
@@ -51,9 +55,9 @@ describe FreshConnection do
           Tel.first.user.name,
           @user.address.prefecture,
           @user.tels.first.number,
-          User.joins(:address).where("addresses.user_id = 1").first.name
+          User.joins(:address).where("addresses.user_id = 1").first.name,
+          User.pluck(:name).first
         ]
-        
         expect(data).to be_all{|n| n.include?("master")}
 
       end
@@ -68,9 +72,10 @@ describe FreshConnection do
         @user.tels.readonly(false).first.number,
         User.includes(:tels).readonly(false).first.tels.first.number,
         User.includes(:address).readonly(false).first.address.prefecture,
-        User.joins(:address).where("addresses.user_id = 1").readonly(false).first.name
+        User.joins(:address).where("addresses.user_id = 1").readonly(false).first.name,
+        User.readonly(false).pluck(:name).first
       ]
-      
+
       expect(data).to be_all{|n| n.include?("master")}
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports to connect with Mysql slave servers via Load Balancers.