active_record_shards 2.7.2 → 2.7.3

data/lib/active_record_shards/model.rb

@@ -34,15 +34,16 @@ module ActiveRecordShards
     module InstanceMethods
       def after_initialize_with_slave
         after_initialize_without_slave if respond_to?(:after_initialize_without_slave)
-        @shard_selection = self.class.current_shard_selection.options.clone
+        @from_slave = !!self.class.current_shard_selection.options[:slave]
+        @from_shard = self.class.current_shard_selection.options[:shard]
       end
 
       def from_slave?
-        @shard_selection[:slave]
+        @from_slave
       end
 
       def from_shard
-        @shard_selection[:shard]
+        @from_shard
       end
     end
 

data/test/connection_switching_test.rb

@@ -145,6 +145,12 @@ class ConnectionSwitchingTest < ActiveSupport::TestCase
       should "get colmns from the first shard" do
         assert Ticket.column_names.include?('foo')
       end
+
+      should "have correct from_shard" do
+        ActiveRecord::Base.on_all_shards do |shard|
+          assert_equal shard, Ticket.new.from_shard
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -68,7 +68,7 @@ files:
 - test/migrator_test.rb
 - test/models.rb
 - test/schema.rb
-homepage: http://github.com/staugaard/active_record_shards
+homepage: http://github.com/zendesk/active_record_shards
 licenses:
 - MIT
 post_install_message: 
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Simple database switching for ActiveRecord.