slavery 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf1496eaaf7ad5d9839bf821fc4fafd5b48d2f4c
-  data.tar.gz: 6b3f1389be627e4e46af04b15b31a6efbba80907
+  metadata.gz: 193d19b53ea789af5b97def5fa5ff2a81a857851
+  data.tar.gz: 2455c70b2f8cca63d2c19f0894560add559d9531
 SHA512:
-  metadata.gz: a5c25149caf8f300de53c07e7c2f3892ee1ff1d06972332357fae177a7a407aac2417467e0a60695f03e69552a38c5cd6aeea8670e2003220768770a01a7dd34
-  data.tar.gz: aa386b5a735bd33ff57338e20bcfb0928dc1d8e8aa9092e4452f0f87d8f10e05e522b1dc7f62a94f6345545c308ce18563f89364013bd906bd74a5fadb1f08e6
+  metadata.gz: aa80b75e90e591c59976fb9a115f6ec9a5462d7e8de2f5029cacc8b349f64dd9168fbb305709fbb521b1dac6c9f2ab7fcac8e61b041b45d4fb71ef6ea55dc215
+  data.tar.gz: 810f70d687978c7d82ffd7fade2562d722894869c7310b0ebf2391c9c8d9114e6fa0effb5608dae64200c6407afae81107b41d97439644ed536491f3773c7060

data/lib/slavery.rb

@@ -47,7 +47,9 @@ module Slavery
 
   module ClassMethods
     def on_slave
-      context = scoped
+      # Why where(nil)?
+      # http://stackoverflow.com/questions/18198963/with-rails-4-model-scoped-is-deprecated-but-model-all-cant-replace-it
+      context = where(nil)
       context.slavery_target = :slave
       context
     end
@@ -83,6 +85,10 @@ module Slavery
       @slave_connection_holder ||= Class.new(ActiveRecord::Base) {
         self.abstract_class = true
 
+        def self.name
+          "SlaveConnectionHolder"
+        end
+
         spec = ["#{Slavery.env}_slave", Slavery.env].find do |spec|
           ActiveRecord::Base.configurations[spec]
         end or raise Error.new("#{Slavery.env}_slave or #{Slavery.env} must exist!")

data/lib/slavery/relation.rb

@@ -1,7 +1,7 @@
 class ActiveRecord::Relation
   attr_accessor :slavery_target
 
-  # Supports queries like User.on_slave.all
+  # Supports queries like User.on_slave.to_a
   def exec_queries_with_slavery
     if slavery_target == :slave
       Slavery.on_slave { exec_queries_without_slavery }

data/lib/slavery/version.rb

@@ -1,3 +1,3 @@
 module Slavery
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/slavery_spec.rb

@@ -57,8 +57,10 @@ describe Slavery do
     User.count.should == 2
     User.on_slave.count.should == 1
 
-    User.scoped.to_a.size.should == 2
-    User.on_slave.scoped.to_a.size.should == 1
+    # Why where(nil)?
+    # http://stackoverflow.com/questions/18198963/with-rails-4-model-scoped-is-deprecated-but-model-all-cant-replace-it
+    User.where(nil).to_a.size.should == 2
+    User.on_slave.where(nil).to_a.size.should == 1
   end
 
   describe 'configuration' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slavery
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord