better_record 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0216b700a22a49717a214a6dd3c60b69fdb122cbacbe26c89393d52981d34add
-  data.tar.gz: eedc6c633f0f7d24575a21802513c120b86c3dbfa3e775b604a41e00bde27dd1
+  metadata.gz: 87be3ec376e667eade78445c2f216bd623e854a0b964cd8584e91dc0c3147daf
+  data.tar.gz: dbdb4945a8dbcf3d98ca030c8b2e0310dc71a596c90289db79f17fc87b6bf33f
 SHA512:
-  metadata.gz: 27b8353a2fb42ff2f2dcb370914fc18b4915a0db500cacbb35852181cdfc7d1d7bf7c623834b291479efb2ec3de321f8cb90ad487e03bd4f98ce372f4ef33e3e
-  data.tar.gz: 68f379ad36aa82e88978feb560bea1148a6d7e55659f86971a3724b9b5175569c803a5073b655d29b892fad280d6c25fcfedeaf456bb3f9345ab7ee0e3a49ca5
+  metadata.gz: 04bf71457cc94a8b17528c73abca67fb7c3b0a89c15969f97d61bc371cb824572248698bbe743ae392ae9a60db4b272b1d8c47202e1c4d1f7f8eac15a65e86cf
+  data.tar.gz: 65f90e4eba84826cbcb4066e5181862fe6b70330334a479b71d2c9cf7e9edef1182a1616e5bde9003fb9e2ab25997dda78baff1b900cc1a09b4077fda403164f

data/app/models/better_record/model_concerns/has_protected_password.rb

@@ -1,19 +1,12 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
-require 'active_support/number_helper'
 
 module BetterRecord
   module ModelConcerns
     module HasProtectedPassword
       extend ActiveSupport::Concern
 
-      included do
-        unless self.const_defined?(:NON_DUPABLE_KEYS)
-          NON_DUPABLE_KEYS = []
-        end
-      end
-
       module ClassMethods
         def has_protected_password(
           password_field: :password,
@@ -22,12 +15,29 @@ module BetterRecord
           **opts
         )
           # == Constants ============================================================
-          self::NON_DUPABLE_KEYS |= %I[
+          og_dup_arr = []
+
+          if (
+            self.const_defined?(:NON_DUPABLE_KEYS) &&
+            (
+              self.const_get(:NON_DUPABLE_KEYS).is_a?(Array) ||
+              self.const_belongs_to_parent?(:NON_DUPABLE_KEYS)
+            )
+          )
+            og_dup_arr = [*self.const_get(:NON_DUPABLE_KEYS)]
+            self.__send__ :remove_const, :NON_DUPABLE_KEYS unless self.const_belongs_to_parent?(:NON_DUPABLE_KEYS)
+          end
+
+          unless self.const_defined?(:NON_DUPABLE_KEYS)
+            self.__send__ :const_set, :NON_DUPABLE_KEYS, Set[]
+          end
+
+          self::NON_DUPABLE_KEYS.merge(%I[
             #{password_field}
             new_#{password_field}
             new_#{password_field}_confirmation
             clear_#{password_field}
-          ]
+          ])
 
           # == Attributes ===========================================================
           attribute :"new_#{password_field}", :text

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.11.4'
+  VERSION = '0.11.5'
 end

data/lib/core_ext/object.rb

@@ -18,6 +18,16 @@ class Object
     end
   end
 
+  def self.const_belongs_to_parent?(sym)
+    (
+      self.superclass &&
+      self.superclass.const_defined?(sym) &&
+      (
+        self.superclass.const_get(sym) == self.const_get(sym)
+      )
+    )
+  end
+
   def force_print_trace(msg = "CALLED TRACER METHOD")
     begin
       raise

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Sampson Crowley
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: store_as_int
   requirement: !ruby/object:Gem::Requirement