active_record_shards 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d54a5e8446f89d23e9c302763e48033f2398a72495d150772ea4bc3ec4fe575
-  data.tar.gz: 9add02d3fec821e54c6f388a021cb09f69320de09846242e49fa2f26269ce948
+  metadata.gz: e71e05125d6c15ad696e8243cb09234c09d29e1c381b47adeee2a81b0b79e188
+  data.tar.gz: f06e143aabfc0e14d3058e03acc367e54d0219bcbf9355df57ee33e174393dbf
 SHA512:
-  metadata.gz: 27627d24f879c675af2d414c334fd713f9845f2e7d93dd8e6c580194357bba038f5c1ded593be06702a570e7631beeb92e5c2be8e26d8629b5ef84b3333e4b47
-  data.tar.gz: d47b1b6906e5ff40633ebe6128fdc845cac7b81d377a16fd31ece96398a174fe87f8bd2a33406abe3516f53969ab5c910e163a792fb0f93e2e6119c8dfc15267
+  metadata.gz: 60629cde5e087c941d9ce3d753a57c5d73f37cbd78d9e7b0f6f1d921834c25267371a0b2e957a92112eac3f295a837a2a41681cda63dc3a6bfd981811dfbcd91
+  data.tar.gz: 2c4e012130eead2088089cefb2204508141b3bd5056f733ccd26029fa053ae78b10b077750b64f5b364731b752842210086e368f813b3b1b333e9cdf2fecefb9

data/lib/active_record_shards/model.rb

@@ -11,26 +11,20 @@ module ActiveRecordShards
     end
 
     def is_sharded? # rubocop:disable Naming/PredicateName
-      # "sharded" here means self.sharded, but actually writing "self.sharded"
-      # doesn't work until Ruby 2.7 (and this gem currently supports 2.6) because
-      # the sharded attr_accessor is private. Private methods must be called without
-      # a receiver, but Ruby 2.7+ does allow an explicit "self" as a receiver.
-      return sharded unless sharded.nil?
+      return @_ars_model_is_sharded unless @_ars_model_is_sharded.nil?
 
-      # Despite self.sharded not working, self.sharded= _DOES_ work. That's an exception
-      # to the "private methods must be called with no receiver" rule (presumably
-      # because it would otherwise be ambiguous with local variable assignment).
-      self.sharded = if self == ActiveRecord::Base
-                       sharded != false && supports_sharding?
-                     elsif self == base_class
-                       if sharded.nil?
-                         ActiveRecord::Base.is_sharded?
-                       else
-                         sharded != false
-                       end
-                     else
-                       base_class.is_sharded?
-                     end
+      @_ars_model_is_sharded =
+        if self == ActiveRecord::Base
+          sharded != false && supports_sharding?
+        elsif self == base_class
+          if sharded.nil?
+            ActiveRecord::Base.is_sharded?
+          else
+            sharded != false
+          end
+        else
+          base_class.is_sharded?
+        end
     end
 
     def on_replica_by_default?

data/lib/active_record_shards.rb

@@ -27,6 +27,17 @@ module ActiveRecordShards
       env || 'development'
     end
   end
+
+  # Busts internal caches kept by active_record_shards, for things which are _supposed_ to be the
+  # same for the life of the process. You shouldn't need to call this unless you're doing something
+  # truly evil like changing RAILS_ENV after boot
+  def self.reset_app_env!
+    @app_env = nil
+    models = [ActiveRecord::Base] + ActiveRecord::Base.descendants
+    models.each do |model|
+      model.remove_instance_variable(:@_ars_model_is_sharded) if model.instance_variable_defined?(:@_ars_model_is_sharded)
+    end
+  end
 end
 
 ActiveRecord::Base.extend(ActiveRecordShards::ConfigurationParser)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.3
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord