active_record_shards 3.4.3 → 3.5.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 560297ec2853470b0022c84d8dd57c15a40589cf
-  data.tar.gz: fd7b67c7d15b63d24d1c7f8d2cbebcaeaf5c7816
+  metadata.gz: 2f5934528264e0c87553401c8e2c2f46c54e7da9
+  data.tar.gz: 5ab7c3b24998adf54238edaea4cb8bb088c103b3
 SHA512:
-  metadata.gz: 498854a4c1bcf28b74b9af9317c69d925bcc4aa1a3d00bec5ade25978e7203ed952c0a46ee402918160bb317a2c22ae5e40e1c1c3b47b6ac58823d8bc7892324
-  data.tar.gz: 43e2d7bd3a71a22941405370b6544b112e0cc0ea750912599a74c37338e802425dd81a654133330211171db88de3b79e0be71bf64ca8112c800dafdb1c69d7bb
+  metadata.gz: 8198cd8aedfc3dbebdc413fbc8c5c6eb9ade10539853700c8cd1666e574c8dcdcc777d306d9d9615aef74e331082bbdbed15a713931a80a57f324190e43a4bfa
+  data.tar.gz: 13d1be9a552f677a2ac9be01b82b372b1817868f1edeb07ffe3111b9388ab19d35563a25597fd46844385a112230d2ad2c4bedf44a661396ffae5f3d464f84ca

data/lib/active_record_shards/connection_switcher.rb

@@ -2,6 +2,8 @@ require 'active_record_shards/shard_support'
 
 module ActiveRecordShards
   module ConnectionSwitcher
+    SHARD_NAMES_CONFIG_KEY = 'shard_names'.freeze
+
     def self.extended(klass)
       klass.singleton_class.alias_method_chain :columns, :default_shard
       klass.singleton_class.alias_method_chain :table_exists?, :default_shard
@@ -144,7 +146,7 @@ module ActiveRecordShards
       unless config = configurations[shard_env]
         raise "Did not find #{shard_env} in configurations, did you forget to add it to your database.yml ? (configurations: #{configurations.inspect})"
       end
-      config['shard_names'] || []
+      config[SHARD_NAMES_CONFIG_KEY] || []
     end
 
     private

data/lib/active_record_shards/shard_selection.rb

@@ -12,7 +12,7 @@ module ActiveRecordShards
         if @shard == NO_SHARD
           nil
         else
-          (@shard || self.class.default_shard).to_s
+          @shard || self.class.default_shard
         end
       end
     end
@@ -32,12 +32,10 @@ module ActiveRecordShards
     def shard_name(klass = nil, try_slave = true)
       the_shard = shard(klass)
 
-      # Tradeoff: An Array is a slower Hash key, but joining its elements into
-      # one string would generate 3 new String objects needing GC later.
-      key = [ActiveRecordShards.rails_env, the_shard, try_slave, @on_slave]
-
-      @shard_names      ||= {}
-      @shard_names[key] ||= begin
+      @shard_names ||= {}
+      @shard_names[the_shard] ||= {}
+      @shard_names[the_shard][try_slave] ||= {}
+      @shard_names[the_shard][try_slave][@on_slave] ||= begin
         s = ActiveRecordShards.rails_env.dup
         s << "_shard_#{the_shard}" if the_shard
         s << "_slave"              if @on_slave && try_slave

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.5.0.pre.alpha
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -189,12 +189,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.