switchman 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa12f1f8d50e63ab2f92295171ca4601797ab6e
-  data.tar.gz: 197446ec2d6556375877c5d5384df2993e4e5b1e
+  metadata.gz: a94b2792f84cce23eb6a12e27c9dedcc0725f81f
+  data.tar.gz: 0ba93bf24a105041150a48ac7f364183c528cc7b
 SHA512:
-  metadata.gz: 4d61b287b7858d8746b78f785c8dd3b5ec60cbd4a5b9e6ed182eb624b716c37216e8e5ea42aa493287c72d038f78b35d61f77b478999067cb38ce2d7437501d9
-  data.tar.gz: bcf78eaca8b3b69e7d12fafd8f4f11de18860d1edb317e9be8b7e0d3bf3ab071f72c4b6f6d7e9d6d32d85eeb70dc304dc24e64c6854e2dba8d4697fb911cc1b8
+  metadata.gz: 685010c8f3444e089bb6f3dab279f27002a3c58bdb51981fe6afac4055d1f3eb78a8653721c030072a5ebf28cfb2c61dd88ee290b1058bf8df938f8c6d1e2e8c
+  data.tar.gz: 207b0fe9091da5765054e498a4c3433866be039c92b20c564cbcbc69a7fcd72c6a7e4ae4eedf71b10f33a1dc6470137ba26598b208ecf8bbe20efb417def9f56

data/lib/switchman/active_record/attribute_methods.rb

@@ -79,7 +79,13 @@ module Switchman
         def define_method_original_attribute(attr_name)
           if sharded_column?(attr_name)
             reflection = reflection_for_integer_attribute(attr_name)
-            generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            if attr_name == "id" && ::Rails.version >= '5.1.2'
+              return if self.method_defined?(:original_id)
+              owner = self
+            else
+              owner = generated_attribute_methods
+            end
+            owner.module_eval <<-RUBY, __FILE__, __LINE__ + 1
               # rename the original method to original_
               alias_method 'original_#{attr_name}', '#{attr_name}'
               # and replace with one that transposes the id
@@ -117,7 +123,7 @@ module Switchman
         klass.extend(ClassMethods)
         klass.attribute_method_prefix "global_", "local_", "original_"
       end
-      
+
       # ensure that we're using the sharded attribute method
       # and not the silly one in AR::AttributeMethods::PrimaryKey
       def id

data/lib/switchman/active_record/finder_methods.rb

@@ -31,6 +31,12 @@ module Switchman
         end
       end
 
+      def find_some_ordered(ids)
+        current_shard = Shard.current(klass.shard_category)
+        ids = ids.map{|id| Shard.relative_id_for(id, current_shard, current_shard)}
+        super(ids)
+      end
+
       def find_or_instantiator_by_attributes(match, attributes, *args)
         primary_shard.activate { super }
       end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.10.1"
+  VERSION = "1.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -177,6 +177,7 @@ files:
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
 - db/migrate/20161206323434_add_back_default_string_limits_switchman.rb
+- db/shard_1708.sqlite3
 - lib/switchman.rb
 - lib/switchman/action_controller/caching.rb
 - lib/switchman/active_record/abstract_adapter.rb
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic