slavery 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 193d19b53ea789af5b97def5fa5ff2a81a857851
-  data.tar.gz: 2455c70b2f8cca63d2c19f0894560add559d9531
+  metadata.gz: bb453d9f6d7b01c9edb5580517cda63135951dec
+  data.tar.gz: 26bdf5fad5cb4c3abf80589c5a4264e123b60b9f
 SHA512:
-  metadata.gz: aa80b75e90e591c59976fb9a115f6ec9a5462d7e8de2f5029cacc8b349f64dd9168fbb305709fbb521b1dac6c9f2ab7fcac8e61b041b45d4fb71ef6ea55dc215
-  data.tar.gz: 810f70d687978c7d82ffd7fade2562d722894869c7310b0ebf2391c9c8d9114e6fa0effb5608dae64200c6407afae81107b41d97439644ed536491f3773c7060
+  metadata.gz: 47905eaef67f0ea6533968a7e303f281f05e3a346e0c1d2012d5ec43a9fc8a4818750bc8a6ea81f31640d34e5b3b3d3ad9b8014c1aafee799762c729b9cc8f69
+  data.tar.gz: 920950c4e4996624b39078c0cb4cc9da0ffeeede17a17e68569fc199822ccf266f167fae02cc65a23be409235e4848796306185716fc9c502ebba6c0f9c4ff01

data/README.md

@@ -6,7 +6,7 @@ Probably you just start off with one single database. As your app grows, you wou
 
 * Conservative - Safe by default. Installing Slavery won't change your app's current behavior.
 * Future proof - No dirty hacks, simply works as a proxy for `ActiveRecord::Base.connection`.
-* Simple - Less than 100 LOC, you can read the entire source and completely stay in control.
+* Simple - Only 100+ LOC, you can read the entire source and completely stay in control.
 
 Slavery works with ActiveRecord 3 or later.
 
@@ -128,3 +128,17 @@ ActiveRecord::Base.configurations = {
 }
 ActiveRecord::Base.establish_connection(:development)
 ```
+
+## Custom slave key in database.yml
+
+This is useful for deploying on EngineYard where the configuration key in database.yml is simple "slave". Put the following line in `config/initializers/slavery.rb`.
+
+```ruby
+Slavery.spec_key = "slave" #instead of production_slave
+```
+
+Alternatively you can pass it a lambda for dynamically setting this.
+
+```ruby
+Slavery.spec_key = lambda{ "#{Slavery.env}_slave" }
+```

data/lib/slavery.rb

@@ -16,9 +16,17 @@ module Slavery
 
   class Error < StandardError; end
 
-  mattr_accessor :disabled
+  mattr_accessor :disabled, :env, :spec_key
 
   class << self
+    def spec_key
+      case @@spec_key
+      when String   then @@spec_key
+      when Proc     then @@spec_key = @@spec_key.call
+      when NilClass then @@spec_key = "#{Slavery.env}_slave"
+      end
+    end
+
     def on_slave(&block)
       run true, &block
     end
@@ -36,12 +44,7 @@ module Slavery
     end
 
     def env
-      self.env = defined?(Rails) ? Rails.env.to_s : 'development' unless @env
-      @env
-    end
-
-    def env=(string)
-      @env = ActiveSupport::StringInquirer.new(string)
+      @@env ||= defined?(Rails) ? Rails.env.to_s : 'development'
     end
   end
 
@@ -89,9 +92,9 @@ module Slavery
           "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!")
+        spec = [Slavery.spec_key, Slavery.env].find do |spec_key|
+          ActiveRecord::Base.configurations[spec_key]
+        end or raise Error.new("#{Slavery.spec_key} or #{Slavery.env} must exist!")
 
         establish_connection spec
       }

data/lib/slavery/version.rb

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

data/spec/slavery_spec.rb

@@ -53,6 +53,21 @@ describe Slavery do
     Slavery.on_slave { User.slaveryable?.should == false }
   end
 
+  it 'sets the Slavery database spec name by configuration' do
+    Slavery.spec_key = "custom_slave"
+    Slavery.spec_key.should eq 'custom_slave'
+
+    Slavery.spec_key = lambda{
+      "kewl_slave"
+    }
+    Slavery.spec_key.should eq "kewl_slave"    
+
+    Slavery.spec_key = lambda{
+      "#{Slavery.env}_slave"
+    }
+    Slavery.spec_key.should eq "test_slave"
+  end
+
   it 'works with scopes' do
     User.count.should == 2
     User.on_slave.count.should == 1
@@ -78,14 +93,14 @@ describe Slavery do
     end
 
     it 'connects to master if slave configuration not specified' do
-      ActiveRecord::Base.configurations['test_slave'] = nil
+      ActiveRecord::Base.configurations[Slavery.spec_key] = nil
 
       Slavery.on_slave { User.count }.should == 2
     end
 
     it 'raises error when no configuration found' do
       ActiveRecord::Base.configurations['test'] = nil
-      ActiveRecord::Base.configurations['test_slave'] = nil
+      ActiveRecord::Base.configurations[Slavery.spec_key] = nil
 
       expect { Slavery.on_slave { User.count } }.to raise_error(Slavery::Error)
     end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: slavery
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple, conservative slave reads for ActiveRecord
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,17 +81,17 @@ require_paths:
 - lib
 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: 2.0.3
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Simple, conservative slave reads for ActiveRecord