better_record 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89e2cc03ce6ebc207079aa90e895f6a5e1c1b4777a83b35d4242eb389c7f9fd9
-  data.tar.gz: d0d1a17deaa4cb0c210403e8371e8a1995bfb2ec3eebebca97976730ed78ec60
+  metadata.gz: 5d98e0b7f54bd71ded48d966277be30e39f485f598f0322ad7479d852a0ddb6c
+  data.tar.gz: d6c108b373661e0513ef8fd3044a587ede56f38dea16cda8d135e132bb27f0ff
 SHA512:
-  metadata.gz: 1ff141f8ea7ddd914fed69710f1408c7b5e9d5715db95ef8619d9f53306d4f111fda9392685c1669724ac2627bb2cc8a287e1d53399d43b930ae18fbee47286b
-  data.tar.gz: aa72daa57375b9301ee5d12675e1953dde08d39dcd7f7064e4208ecd540cf99614e0f2f67c3c18738beae18d4c56003ca19e27436bbbac2d62f728a79ada55ce
+  metadata.gz: 74489d67ad1f0ffb4454d92dbc789883c74f9dcbeb4b4255c3b0cfd752a9a90624442c853eacad355252476ee5cdd661484a39f978056f01e4dd0ce347daa4a4
+  data.tar.gz: ae840a61e2d9e697ecf2d130ad037fa569f75eee558a4b05013514b6055031b72bfbc82cbb03a0b6825bf0eb2f50058774310161a05985cc61c47eda2b70d6cf

data/app/models/better_record/base.rb

@@ -36,11 +36,13 @@ module BetterRecord
       attributes.with_indifferent_access
     end
 
-    def dup
-      if defined? NON_DUPABLE_KEYS
-        self.class.new(super.indifferent_attributes.except(*NON_DUPABLE_KEYS))
+    def dup(allow_full_dup = false)
+      if !allow_full_dup && self.class.const_defined?(:NON_DUPABLE_KEYS)
+        super().tap do |r|
+          r.class::NON_DUPABLE_KEYS.each {|k| r[k] = nil }
+        end
       else
-        super
+        super()
       end
     end
   end

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

@@ -8,6 +8,12 @@ module BetterRecord
     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,
@@ -17,15 +23,11 @@ module BetterRecord
           **opts
         )
           # == Constants ============================================================
-          unless const_defined?(NON_DUPABLE_KEYS)
-            NON_DUPABLE_KEYS = []
-          end
-          
-          NON_DUPABLE_KEYS |= %I[
+          self::NON_DUPABLE_KEYS |= %I[
             #{password_field}
             new_#{password_field}
             new_#{password_field}_confirmation
-          ])
+          ]
 
           # == Attributes ===========================================================
           attribute :"new_#{password_field}", :text

data/lib/better_record/rspec/extensions/required_column.rb

@@ -21,7 +21,14 @@ module BetterRecord
               expect(record.valid?).to be true
               expect(record.save).to be true
 
-              dupped = record.dup
+              dupped = nil
+
+              begin
+                dupped = record.dup(true)
+              rescue ArgumentError
+                dupped = record.dup
+              end
+
               expect(dupped.valid?).to be false
               expect(dupped.errors[column_name]).to include("has already been taken")
               expect(dupped.save).to be false

data/lib/better_record/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Sampson Crowley