fresh_connection 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df47e1e84e43368ebd3a26c1bdcf6166c5954e43
-  data.tar.gz: 4d754536e5d1d7484db5f5ae9a798ce78e51fc9a
+  metadata.gz: 4f0099a9699f28409d5dd92f40152a0147fcde55
+  data.tar.gz: c440711fcbd474eb05e88b5fbc13e79643a349ba
 SHA512:
-  metadata.gz: 7e62ede00dc5d508f86d2a099addd2aaf01ca4c9f6478acc637fda7e087fa472b5b8e5923f72c2c0015f783bb3ee7caeae3578682ee53b3e3eb41b321003c991
-  data.tar.gz: 79d55f2458a6b047b18939d0fcebc73394167e4f2669527cf97b6a023165dd1855f110ca259db4be6086d8c7ba70e2d07ddcddb33999a19a49239503cb5a2cc1
+  metadata.gz: 8089e336ad1b03c4ba96f5ab75c9ea1c8eb98cd203de7e955288bbab5c2a2f6e90f55cf1bb569bfdab2d29b71e3eb307c5a9c0ccd09bb67dff0c48f377a68e67
+  data.tar.gz: 834527ba27d5664a42eb4679e0d3c95ea02af26c70b139563f3cd926da097b6a6af518853edea386fd02f22eec571cdc0023997f6fe4de223059441b596d3685

data/Appraisals

@@ -17,7 +17,7 @@ appraise "rails42" do
 end
 
 appraise "rails50" do
-  gem 'activerecord', '5.0.0.beta3'
-  gem 'activesupport', '5.0.0.beta3'
+  gem 'activerecord', '5.0.0.rc1'
+  gem 'activesupport', '5.0.0.rc1'
   gem 'mysql2', '>= 0.3.18', '< 0.5'
 end

data/gemfiles/rails50.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.0.0.beta3"
-gem "activesupport", "5.0.0.beta3"
+gem "activerecord", "5.0.0.rc1"
+gem "activesupport", "5.0.0.rc1"
 gem "mysql2", ">= 0.3.18", "< 0.5"
 
 gemspec :path => "../"

data/lib/fresh_connection/extend/ar_relation.rb

@@ -39,12 +39,21 @@ module FreshConnection
       end
 
       def read_master!
-        @read_from_master = true
+        self.read_master_value = true
         self
       end
 
+      def read_master_value
+        @values[:read_master]
+      end
+
+      def read_master_value=(value)
+        raise ImmutableRelation if @loaded
+        @values[:read_master] = value
+      end
+
       def enable_slave_access
-        connection.open_transactions == 0 && !defined?(@read_from_master)
+        connection.open_transactions == 0 && !read_master_value
       end
 
       private

data/lib/fresh_connection/extend/ar_relation_merger.rb

@@ -0,0 +1,12 @@
+module FreshConnection
+  module Extend
+    module ArRelationMerger
+      private
+
+      def merge_single_values
+        relation.read_master_value = values[:read_master] unless relation.read_master_value
+        super
+      end
+    end
+  end
+end

data/lib/fresh_connection/extend.rb

@@ -1,11 +1,13 @@
 require 'active_record'
 require 'fresh_connection/extend/ar_base'
 require 'fresh_connection/extend/ar_relation'
+require 'fresh_connection/extend/ar_relation_merger'
 require 'fresh_connection/extend/ar_abstract_adapter'
 
 module ActiveRecord
   Base.extend FreshConnection::Extend::ArBase
   Relation.send :prepend, FreshConnection::Extend::ArRelation
+  Relation::Merger.send :prepend, FreshConnection::Extend::ArRelationMerger
 
   if defined?(StatementCache)
     require 'fresh_connection/extend/ar_statement_cache'

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,6 +206,7 @@ files:
 - lib/fresh_connection/extend/ar_abstract_adapter.rb
 - lib/fresh_connection/extend/ar_base.rb
 - lib/fresh_connection/extend/ar_relation.rb
+- lib/fresh_connection/extend/ar_relation_merger.rb
 - lib/fresh_connection/extend/ar_statement_cache.rb
 - lib/fresh_connection/rack/connection_management.rb
 - lib/fresh_connection/railtie.rb