protected_attributes_continued 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a53af38e43c5d8fee4bf8cb3f199422844d27b7104ac13e3c31b7bdc7af192a
-  data.tar.gz: 318cd88bd28f923e8ba90c5dc9e8e837cab4427501adde30b1797ab24234c96d
+  metadata.gz: 5e881236bacf8378d98f06eb98269417a5082383de65360f522e524062fbcdfb
+  data.tar.gz: 45f598ce1954ed9542934e676af3ac8f53e6b5c6dea2c35e87b3100721d2522a
 SHA512:
-  metadata.gz: d9dcf4759ad7112b4b8d3191c28458ae8aa36503ae945fc481ca798e1c3e4f86bc815fc63da6d0dee616f88b70563c30e8d5a19da6ac26c05eecdf99172a2540
-  data.tar.gz: d3ffa567d9ce6896bb1ddd398a796eef5bedbf090dc08e8b00db56cdc4b132cc9776ed42b48a637382b1027dff2f40a419a8f7f4e965132ac996b21b00043e90
+  metadata.gz: 30fb108c2db47feeb17c7787dc1427a44e93b7ac47450d79f20d59a3bf814d3f8314eb42ee71a76bd3e1f54dbec508d56e917ab0f57d5a6c7c7e5a68a4ac2d8d
+  data.tar.gz: '0486645654d15f177a2ba9abd27069c598b9d08884a7beb4db9d7813ce79604265d0eab9263f937aa0957c963cbd66dc435d4628993381793789068d04d0573b'

data/lib/active_record/mass_assignment_security/association_relation.rb

@@ -5,29 +5,41 @@ module ActiveRecord
     undef :create!
 
     def build(attributes = nil, options = {}, &block)
-      if ActiveRecord::VERSION::STRING.to_f < 5.2
-        scoping { @association.build(attributes, options, &block) }
-      else
-        @association.build(attributes, options, &block)
-      end
+      block = protected_attributes_scope_block('new', block)
+      scoping { @association.build(attributes, options, &block) }
     end
     alias new build
 
     def create(attributes = nil, options = {}, &block)
-      if ActiveRecord::VERSION::STRING.to_f < 5.2
-        scoping { @association.create(attributes, options, &block) }
-      else
-        @association.create(attributes, options, &block)
-      end
+      block = protected_attributes_scope_block('create', block)
+      scoping { @association.create(attributes, options, &block) }
     end
 
     def create!(attributes = nil, options = {}, &block)
-      if ActiveRecord::VERSION::STRING.to_f < 5.2
-        scoping { @association.create!(attributes, options, &block) }
-      else
-        @association.create!(attributes, options, &block)
-      end
+      block = protected_attributes_scope_block('create!', block)
+      scoping { @association.create!(attributes, options, &block) }
     end
 
+    private
+
+    if ActiveRecord.gem_version < Gem::Version.new('6.0')
+
+      def protected_attributes_scope_block(_label, block)
+        block
+      end
+
+    elsif ActiveRecord.gem_version < Gem::Version.new('6.1')
+
+      def protected_attributes_scope_block(label, block)
+        _deprecated_scope_block(label, &block)
+      end
+
+    else
+
+      def protected_attributes_scope_block(_label, block)
+        current_scope_restoring_block(&block)
+      end
+
+    end
   end
 end

data/lib/protected_attributes/version.rb

@@ -1,3 +1,3 @@
 module ProtectedAttributes
-  VERSION = "1.8.0".freeze
+  VERSION = "1.8.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protected_attributes_continued
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel