switchman 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb5bc75d858d97e55442dfdafcd1826d7040fe1bd4819bc3c2ee6053257a72ab
-  data.tar.gz: e73beaf3a5987f26e2402078f66c028831afc6924f21546d0ca1cb35f70e0831
+  metadata.gz: bd3fc41cd455d5855db84fd49d132dca58c824dbe50e49ea4ab7c4cd0ee24d00
+  data.tar.gz: df1df2b43f521a5b5e424165ac167d2de351c4800db6fe50b5d83a78e8e17e16
 SHA512:
-  metadata.gz: 273718d8bc773ded149ac5d81509a6d85c6858f17bc7c1a03f3dbdf15bbb96f101fea5842eddf87ba442aabf1f0bffe1a21421da4b9329548b0f40e51de26645
-  data.tar.gz: 9f81d1963fe213d334aed7377057fe29ecbdb637c6b2b8a33a49d52fcc0f726e1a8e87853a6e1030c8c2b0bbaff51e369d54cf8118f1c512ca0d62bf5684267c
+  metadata.gz: 5b721c57764dc47c2da10b027b63fdeed4795c349b2dec36b0d440e98ff0294355a4bbb03d2176f30883de0b842e2f4a47f27ea2fa2f56405594f53d4a278f6c
+  data.tar.gz: 2729dfb39b1e3d8e3df84bcf1bd321ac39de73e552d8a6c0f15f48f6b9fdb47611a076f8e11fbcbfeb4fd8097c2e6a49a2eab7d76942af92ed769c03b1b9f7d0

data/lib/switchman/active_record/attribute_methods.rb

@@ -26,10 +26,10 @@ module Switchman
         end
 
         def define_attribute_methods
-          super
+          result = super
           # ensure that we're using the sharded attribute method
           # and not the silly one in AR::AttributeMethods::PrimaryKey
-          return unless sharded_column?(@primary_key)
+          return result unless sharded_column?(@primary_key)
 
           class_eval(
             build_sharded_getter("id",
@@ -41,6 +41,7 @@ module Switchman
           class_eval(build_sharded_setter("id", @primary_key, "::#{connection_class_for_self.name}"),
                      __FILE__,
                      __LINE__)
+          result
         end
 
         protected
@@ -55,14 +56,20 @@ module Switchman
         end
 
         def define_cached_method(owner, name, namespace:, as:, &block)
-          owner.define_cached_method(name, namespace: namespace, as: as, &block)
+          if ::Rails.version < "7.1.4"
+            # https://github.com/rails/rails/commit/a2a12fc2e3f4e6d06f81d4c74c88f8e6b3369ee6#diff-5b59ece6d9396b596f06271cec0ea726e3360911383511c49b1a66f454bfc2b6L30
+            # These arguments were effectively swapped in Rails 7.1.4, so previous versions need them reversed
+            owner.define_cached_method(as, namespace: namespace, as: name, &block)
+          else
+            owner.define_cached_method(name, namespace: namespace, as: as, &block)
+          end
         end
 
-        def define_method_global_attribute(attr_name, owner:)
+        def define_method_global_attribute(attr_name, owner:, as: attr_name)
           if sharded_column?(attr_name)
             define_cached_method(owner,
-                                 "global_#{attr_name}",
-                                 as: "sharded_global_#{attr_name}",
+                                 "sharded_global_#{attr_name}",
+                                 as: "global_#{as}",
                                  namespace: :switchman) do |batch|
               batch << <<-RUBY
                 def sharded_global_#{attr_name}
@@ -79,11 +86,11 @@ module Switchman
           end
         end
 
-        def define_method_local_attribute(attr_name, owner:)
+        def define_method_local_attribute(attr_name, owner:, as: attr_name)
           if sharded_column?(attr_name)
             define_cached_method(owner,
-                                 "local_#{attr_name}",
-                                 as: "sharded_local_#{attr_name}",
+                                 "sharded_local_#{attr_name}",
+                                 as: "local_#{as}",
                                  namespace: :switchman) do |batch|
               batch << <<-RUBY
                 def sharded_local_#{attr_name}
@@ -122,21 +129,21 @@ module Switchman
           end
         end
 
-        def define_method_attribute(attr_name, owner:)
+        def define_method_attribute(attr_name, owner:, as: attr_name)
           if sharded_column?(attr_name)
             reflection = reflection_for_integer_attribute(attr_name)
             class_name = connection_class_for_self_code_for_reflection(reflection)
             safe_class_name = class_name.unpack1("h*")
             define_cached_method(owner,
-                                 attr_name,
-                                 as: "sharded_#{safe_class_name}_#{attr_name}",
+                                 "sharded_#{safe_class_name}_#{attr_name}",
+                                 as: as,
                                  namespace: :switchman) do |batch|
               batch << build_sharded_getter("sharded_#{safe_class_name}_#{attr_name}",
-                                            "original_#{attr_name}",
+                                            "original_#{as}",
                                             class_name)
             end
           else
-            define_cached_method(owner, attr_name, as: "plain_#{attr_name}", namespace: :switchman) do |batch|
+            define_cached_method(owner, "plain_#{attr_name}", as: as, namespace: :switchman) do |batch|
               batch << <<-RUBY
                 def plain_#{attr_name}
                   _read_attribute("#{attr_name}") { |n| missing_attribute(n, caller) }
@@ -169,19 +176,19 @@ module Switchman
           RUBY
         end
 
-        def define_method_attribute=(attr_name, owner:)
+        def define_method_attribute=(attr_name, owner:, as: attr_name)
           if sharded_column?(attr_name)
             reflection = reflection_for_integer_attribute(attr_name)
             class_name = connection_class_for_self_code_for_reflection(reflection)
             safe_class_name = class_name.unpack1("h*")
             define_cached_method(owner,
-                                 "#{attr_name}=",
-                                 as: "sharded_#{safe_class_name}_#{attr_name}=",
+                                 "sharded_#{safe_class_name}_#{attr_name}=",
+                                 as: "#{as}=",
                                  namespace: :switchman) do |batch|
               batch << build_sharded_setter("sharded_#{safe_class_name}_#{attr_name}", attr_name, class_name)
             end
           else
-            define_cached_method(owner, "#{attr_name}=", as: "plain_#{attr_name}=", namespace: :switchman) do |batch|
+            define_cached_method(owner, "plain_#{attr_name}=", as: "#{as}=", namespace: :switchman) do |batch|
               batch << <<-RUBY
                 def plain_#{attr_name}=(new_value)
                   _write_attribute('#{attr_name}', new_value)
@@ -199,11 +206,11 @@ module Switchman
           RUBY
         end
 
-        def define_method_original_attribute(attr_name, owner:)
+        def define_method_original_attribute(attr_name, owner:, as: attr_name)
           if sharded_column?(attr_name)
             define_cached_method(owner,
-                                 "original_#{attr_name}",
-                                 as: "sharded_original_#{attr_name}",
+                                 "sharded_original_#{attr_name}",
+                                 as: "original_#{as}",
                                  namespace: :switchman) do |batch|
               batch << <<-RUBY
                 def sharded_original_#{attr_name}
@@ -216,12 +223,12 @@ module Switchman
           end
         end
 
-        def define_method_original_attribute=(attr_name, owner:)
+        def define_method_original_attribute=(attr_name, owner:, as: attr_name)
           return unless sharded_column?(attr_name)
 
           define_cached_method(owner,
-                               "original_#{attr_name}=",
-                               as: "sharded_original_#{attr_name}=",
+                               "sharded_original_#{attr_name}=",
+                               as: "original_#{as}=",
                                namespace: :switchman) do |batch|
             batch << <<-RUBY
               def sharded_original_#{attr_name}=(new_value)
@@ -235,8 +242,8 @@ module Switchman
           return if columns_hash["#{prefix}_#{attr_name}"] || attr_name == "id"
 
           define_cached_method(owner,
-                               "#{prefix}_#{attr_name}",
-                               as: "unsharded_#{prefix}_#{attr_name}",
+                               "unsharded_#{prefix}_#{attr_name}",
+                               as: "#{prefix}_#{attr_name}",
                                namespace: :switchman) do |batch|
             batch << <<-RUBY
               def unsharded_#{prefix}_#{attr_name}

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord