dynamoid 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26990dd042447eeba355601d0c7eb3657bcc482e80d00c1da5602d2f82765504
-  data.tar.gz: 76e1778155fb8a7a1d3135d4886d9e7caf1a07b72263fc38d9162ae946d5dab1
+  metadata.gz: 2146a1a188ecf2b8dd2f280172119879d6612d9eadda6cbcbf6defb3319f7022
+  data.tar.gz: df59300783324be7952fd25f8d49880707938762d3960ce1d422c18b49e26ac6
 SHA512:
-  metadata.gz: 2aadf93639577566ed5dd9dadff596316f3d22384f5d7dabd0e06aa49992d3a58e824a8c150002c3a39d6e42f7b2b17c4f383bda2c145f4d05e1d56bf21a5e54
-  data.tar.gz: 14801f95c8cd1a241d2b1522b05a1e7af307822cef50e4515502f641027ade16aaf750a099801a2f2e4e379b15a4cd96e78f84754278db37d2e6fcdaab57b242
+  metadata.gz: d2ebd06729d024b98338e5c11953976935f5252ad76f6dec9265929fd447ed488295d9f06c8ae5440c7c6a494fb1cdb44ffeba002c18ea52bd4ad100df2d4c66
+  data.tar.gz: eddf03eb98125fbc7fcfa842e8276ba5dcbd558abacc3adeb2d451e3bb71bcb92f69eb84a01231304b4690b087a826ebf7c4ee2426a16d92a7a126ceddf1e132

data/CHANGELOG.md

@@ -1,11 +1,28 @@
 # HEAD
 
+---
+
+
+
+# 3.7.0 / 2021-02-02
+
+
 ## Features
 
+* [#476](https://github.com/Dynamoid/dynamoid/pull/476) Added `#with_index` method to force an index in query (@bmalinconico)
+* [#481](https://github.com/Dynamoid/dynamoid/pull/481) Added `alias` option to the `field` method to declare a field alias and use more conventional name to set and get value
+
 ## Improvements
 
+* [#482](https://github.com/Dynamoid/dynamoid/pull/482) Support Ruby 3.0 and Rails 6.1
+* [#461](https://github.com/Dynamoid/dynamoid/pull/461) Allow to delete item attribute with `#update` method (@jkirsteins)
+* [#463](https://github.com/Dynamoid/dynamoid/pull/463) Raise `UnknownAttribute` exception when specified not declared attribute name (@AlexGascon)
+
 ## Fixes
 
+* [#480](https://github.com/Dynamoid/dynamoid/pull/480) Repair `.consistent`/`.delete_all`/`.destroy_all` calls directly on a model class
+* [#484](https://github.com/Dynamoid/dynamoid/pull/484) Fix broken foreign keys after model deleting (@kkan)
+* Fixes in Readme.md: [#470](https://github.com/Dynamoid/dynamoid/pull/470) (@rromanchuk), [#473](https://github.com/Dynamoid/dynamoid/pull/473) (@Rulikkk)
 
 ---
 

data/README.md

@@ -126,8 +126,8 @@ end
 Dynamoid supports Ruby >= 2.3 and Rails >= 4.2.
 
 Its compatibility is tested against following Ruby versions: 2.3, 2.4,
-2.5 and 2.6, JRuby 9.2.8.0 and against Rails versions: 4.2, 5.0, 5.1,
-5.2 and 6.0.
+2.5, 2.6, 2.7 and 3.0, JRuby 9.2.x and against Rails versions: 4.2, 5.0, 5.1,
+5.2, 6.0 and 6.1.
 
 ## Setup
 
@@ -365,6 +365,26 @@ field :actions_taken, :integer, default: 0
 field :joined_at, :datetime, default: -> { Time.now }
 ```
 
+#### Aliases
+
+It might be helpful to define an alias for already existing field when
+naming convention used for a table differs from conventions common in
+Ruby:
+
+```ruby
+field firstName, :string, alias: :first_name
+```
+
+This way there will be generated
+setters/getters/`<name>?`/`<name>_before_type_cast` methods for both
+original field name (`firstName`) and an alias (`first_name`).
+
+```ruby
+user = User.new(first_name: 'Michael')
+user.first_name # => 'Michael'
+user.firstName # => 'Michael'
+```
+
 #### Custom Types
 
 To use a custom type for a field, suppose you have a `Money` type.
@@ -576,7 +596,7 @@ c.my_new_type
 
 ### Type casting
 
-Dynamid supports type casting and tries to do it in the most convenient
+Dynamoid supports type casting and tries to do it in the most convenient
 way. Values for all fields (except custom type) are coerced to declared
 field types.
 
@@ -614,7 +634,7 @@ well.
 
 ### Dirty API
 
-Dynamoid supports Dirty API which equivalents to [Rails 5.2
+Dynamoid supports Dirty API which is equivalent to [Rails 5.2
 `ActiveModel::Dirty`](https://api.rubyonrails.org/v5.2/classes/ActiveModel/Dirty.html).
 There is only one limitation - change in place of field isn't detected
 automatically.
@@ -632,7 +652,7 @@ u.email = 'josh@joshsymonds.com'
 u.save
 ```
 
-Save forces persistence to the datastore: a unique ID is also assigned,
+Save forces persistence to the data store: a unique ID is also assigned,
 but it is a string and not an auto-incrementing number.
 
 ```ruby
@@ -1267,7 +1287,7 @@ class User
 end
 
 Dynamoid.config.logger.level = :debug
-Dynamoid.config.endpoint = 'localhost:8000'
+Dynamoid.config.endpoint = 'http://localhost:8000'
 
 User.create(name: 'Alex')
 
@@ -1342,12 +1362,12 @@ environment.
 
 If you want to run all the specs that travis runs, use `bundle exec
 wwtd`, but first you will need to setup all the rubies, for each of `%w(
-2.0.0-p648 2.1.10 2.2.6 2.3.3 2.4.1 jruby-9.1.8.0 )`. When you run
+2.3.8 2.4.6 2.5.5 2.6.3 2.7.0 3.0.0 9.2.14.0)`. When you run
 `bundle exec wwtd` it will take care of starting and stopping the local
 dynamodb instance.
 
 ```shell
-rvm use 2.0.0-p648
+rvm use 3.0.0
 gem install rubygems-update
 gem install bundler
 bundle install

data/lib/dynamoid/adapter.rb

@@ -158,8 +158,14 @@ module Dynamoid
     #
     # @since 0.2.0
     def method_missing(method, *args, &block)
-      return benchmark(method, *args) { adapter.send(method, *args, &block) } if adapter.respond_to?(method)
+      # Don't use keywork arguments delegating (with **kw). It works in
+      # different way in different Ruby versions: <= 2.6, 2.7, 3.0 and in some
+      # future 3.x versions. Providing that there are no downstream methods
+      # with keyword arguments in adapter.
+      #
+      # https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
 
+      return benchmark(method, *args) { adapter.send(method, *args, &block) } if adapter.respond_to?(method)
       super
     end
 

data/lib/dynamoid/adapter_plugin/aws_sdk_v3.rb

@@ -12,6 +12,15 @@ module Dynamoid
   # @private
   module AdapterPlugin
     # The AwsSdkV3 adapter provides support for the aws-sdk version 2 for ruby.
+
+    # Note: Don't use keyword arguments in public methods as far as method
+    # calls on adapter are delegated to the plugin.
+    #
+    # There are breaking changes in Ruby related to delegating keyword
+    # arguments so we have decided just to avoid them when use delegation.
+    #
+    # https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
+
     class AwsSdkV3
       EQ = 'EQ'
       RANGE_MAP = {
@@ -281,7 +290,7 @@ module Dynamoid
         false
       end
 
-      def update_time_to_live(table_name:, attribute:)
+      def update_time_to_live(table_name, attribute)
         request = {
           table_name: table_name,
           time_to_live_specification: {

data/lib/dynamoid/adapter_plugin/aws_sdk_v3/item_updater.rb

@@ -59,9 +59,9 @@ module Dynamoid
           end
           @deletions.each do |k, v|
             ret[k.to_s] = {
-              action: DELETE,
-              value: v
+              action: DELETE
             }
+            ret[k.to_s][:value] = v unless v.nil?
           end
           @updates.each do |k, v|
             ret[k.to_s] = {

data/lib/dynamoid/associations/association.rb

@@ -58,6 +58,12 @@ module Dynamoid
         :set
       end
 
+      def disassociate_source
+        Array(target).each do |target_entry|
+          target_entry.send(target_association).disassociate(source.hash_key) if target_entry && target_association
+        end
+      end
+
       private
 
       # The target class name, either inferred through the association's name or specified in options.

data/lib/dynamoid/associations/many_association.rb

@@ -25,7 +25,9 @@ module Dynamoid
       # @private
       # @since 0.2.0
       def find_target
-        Array(target_class.find(source_ids.to_a))
+        return [] if source_ids.empty?
+
+        Array(target_class.find(source_ids.to_a, raise_error: false))
       end
 
       # @private

data/lib/dynamoid/associations/single_association.rb

@@ -28,7 +28,7 @@ module Dynamoid
       # unsaved changes will be saved. Doesn't delete an associated model from
       # DynamoDB.
       def delete
-        target.send(target_association).disassociate(source.hash_key) if target && target_association
+        disassociate_source
         disassociate
         target
       end
@@ -90,7 +90,7 @@ module Dynamoid
 
       # @private
       def associate(hash_key)
-        target.send(target_association).disassociate(source.hash_key) if target && target_association
+        disassociate_source
         source.update_attribute(source_attribute, Set[hash_key])
       end
 
@@ -109,7 +109,7 @@ module Dynamoid
       def find_target
         return if source_ids.empty?
 
-        target_class.find(source_ids.first)
+        target_class.find(source_ids.first, raise_error: false)
       end
 
       def target=(object)

data/lib/dynamoid/criteria.rb

@@ -9,12 +9,19 @@ module Dynamoid
 
     # @private
     module ClassMethods
-      %i[where all first last each record_limit scan_limit batch start scan_index_forward find_by_pages project pluck].each do |meth|
+      %i[where consistent all first last delete_all destroy_all each record_limit scan_limit batch start scan_index_forward find_by_pages project pluck].each do |meth|
         # Return a criteria chain in response to a method that will begin or end a chain. For more information,
         # see Dynamoid::Criteria::Chain.
         #
         # @since 0.2.0
         define_method(meth) do |*args, &blk|
+          # Don't use keywork arguments delegating (with **kw). It works in
+          # different way in different Ruby versions: <= 2.6, 2.7, 3.0 and in some
+          # future 3.x versions. Providing that there are no downstream methods
+          # with keyword arguments in Chain.
+          #
+          # https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
+
           chain = Dynamoid::Criteria::Chain.new(self)
           if args
             chain.send(meth, *args, &blk)

data/lib/dynamoid/criteria/chain.rb

@@ -110,7 +110,7 @@ module Dynamoid
         query.update(args.symbolize_keys)
 
         # we should re-initialize keys detector every time we change query
-        @key_fields_detector = KeyFieldsDetector.new(@query, @source)
+        @key_fields_detector = KeyFieldsDetector.new(@query, @source, forced_index_name: @forced_index_name)
 
         self
       end
@@ -358,6 +358,36 @@ module Dynamoid
         self
       end
 
+      # Force the index name to use for queries.
+      #
+      # By default allows the library to select the most appropriate index.
+      # Sometimes you have more than one index which will fulfill your query's
+      # needs. When this case occurs you may want to force an order. This occurs
+      # when you are searching by hash key, but not specifying a range key.
+      #
+      #  class Comment
+      #    include Dynamoid::Document
+      #
+      #    table key: :post_id
+      #    range_key :author_id
+      #
+      #    field :post_date, :datetime
+      #
+      #    global_secondary_index name: :time_sorted_comments, hash_key: :post_id, range_key: post_date, projected_attributes: :all
+      #  end
+      #
+      #
+      #   Comment.where(post_id: id).with_index(:time_sorted_comments).scan_index_forward(false)
+      #
+      # @return [Dynamoid::Criteria::Chain]
+      def with_index(index_name)
+        raise Dynamoid::Errors::InvalidIndex, "Unknown index #{index_name}" unless @source.find_index_by_name(index_name)
+
+        @forced_index_name = index_name
+        @key_fields_detector = KeyFieldsDetector.new(@query, @source, forced_index_name: index_name)
+        self
+      end
+
       # Allows to use the results of a search as an enumerable over the results
       # found.
       #

data/lib/dynamoid/criteria/key_fields_detector.rb

@@ -24,10 +24,11 @@ module Dynamoid
         end
       end
 
-      def initialize(query, source)
+      def initialize(query, source, forced_index_name: nil)
         @query = query
         @source = source
         @query = Query.new(query)
+        @forced_index_name = forced_index_name
         @result = find_keys_in_query
       end
 
@@ -54,6 +55,8 @@ module Dynamoid
       private
 
       def find_keys_in_query
+        return match_forced_index if @forced_index_name
+
         match_table_and_sort_key ||
           match_local_secondary_index ||
           match_global_secondary_index_and_sort_key ||
@@ -133,6 +136,16 @@ module Dynamoid
           }
         end
       end
+
+      def match_forced_index
+        idx = @source.find_index_by_name(@forced_index_name)
+
+        {
+          hash_key: idx.hash_key,
+          range_key: idx.range_key,
+          index_name: idx.name,
+        }
+      end
     end
   end
 end

data/lib/dynamoid/errors.rb

@@ -75,5 +75,7 @@ module Dynamoid
     class InvalidQuery < Error; end
 
     class UnsupportedKeyType < Error; end
+
+    class UnknownAttribute < Error; end
   end
 end

data/lib/dynamoid/fields.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'dynamoid/fields/declare'
+
 module Dynamoid
   # All fields on a Dynamoid::Document must be explicitly defined -- if you have fields in the database that are not
   # specified with field, then they will be ignored.
@@ -43,15 +45,15 @@ module Dynamoid
       #   end
       #
       # Its type determines how it is coerced when read in and out of the
-      # datastore. You can specify +string+, +integer+, +number+, +set+, +array+,
+      # data store. You can specify +string+, +integer+, +number+, +set+, +array+,
       # +map+, +datetime+, +date+, +serialized+, +raw+, +boolean+ and +binary+
       # or specify a class that defines a serialization strategy.
       #
       # By default field type is +string+.
       #
       # Set can store elements of the same type only (it's a limitation of
-      # DynamoDB itself). If a set should store elements only some particular
-      # type +of+ option should be specified:
+      # DynamoDB itself). If a set should store elements only of some particular
+      # type then +of+ option should be specified:
       #
       #   field :hobbies, :set, of: :string
       #
@@ -126,41 +128,31 @@ module Dynamoid
       #   user.age # => 21 - integer
       #   user.age_before_type_cast # => '21' - string
       #
+      # There is also an option +alias+ which allows to use another name for a
+      # field:
+      #
+      #   class User
+      #     include Dynamoid::Document
+      #
+      #     field :firstName, :string, alias: :first_name
+      #   end
+      #
+      #   user = User.new(firstName: 'Michael')
+      #   user.firstName # Michael
+      #   user.first_name # Michael
+      #
       # @param name [Symbol] name of the field
       # @param type [Symbol] type of the field (optional)
       # @param options [Hash] any additional options for the field type (optional)
       #
       # @since 0.2.0
       def field(name, type = :string, options = {})
-        named = name.to_s
         if type == :float
           Dynamoid.logger.warn("Field type :float, which you declared for '#{name}', is deprecated in favor of :number.")
           type = :number
         end
-        self.attributes = attributes.merge(name => { type: type }.merge(options))
-
-        # should be called before `define_attribute_methods` method because it defines a getter itself
-        warn_about_method_overriding(name, name)
-        warn_about_method_overriding("#{named}=", name)
-        warn_about_method_overriding("#{named}?", name)
-        warn_about_method_overriding("#{named}_before_type_cast?", name)
 
-        define_attribute_method(name) # Dirty API
-
-        generated_methods.module_eval do
-          define_method(named) { read_attribute(named) }
-          define_method("#{named}?") do
-            value = read_attribute(named)
-            case value
-            when true        then true
-            when false, nil  then false
-            else
-              !value.nil?
-            end
-          end
-          define_method("#{named}=") { |value| write_attribute(named, value) }
-          define_method("#{named}_before_type_cast") { read_attribute_before_type_cast(named) }
-        end
+        Dynamoid::Fields::Declare.new(self, name, type, options).call
       end
 
       # Declare a table range key.
@@ -273,8 +265,7 @@ module Dynamoid
         options[:timestamps] || (options[:timestamps].nil? && Dynamoid::Config.timestamps)
       end
 
-      private
-
+      # @private
       def generated_methods
         @generated_methods ||= begin
           Module.new.tap do |mod|
@@ -282,12 +273,6 @@ module Dynamoid
           end
         end
       end
-
-      def warn_about_method_overriding(method_name, field_name)
-        if instance_methods.include?(method_name.to_sym)
-          Dynamoid.logger.warn("Method #{method_name} generated for the field #{field_name} overrides already existing method")
-        end
-      end
     end
 
     # You can access the attributes of an object directly on its attributes method, which is by default an empty hash.
@@ -309,6 +294,10 @@ module Dynamoid
     def write_attribute(name, value)
       name = name.to_sym
 
+      unless attribute_is_present_on_model?(name)
+        raise Dynamoid::Errors::UnknownAttribute.new("Attribute #{name} is not part of the model")
+      end
+
       if association = @associations[name]
         association.reset
       end
@@ -405,5 +394,10 @@ module Dynamoid
         send("#{type}=", self.class.name)
       end
     end
+
+    def attribute_is_present_on_model?(attribute_name)
+      setter = "#{attribute_name}=".to_sym
+      respond_to?(setter)
+    end
   end
 end

data/lib/dynamoid/fields/declare.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Dynamoid
+  module Fields
+    # @private
+    class Declare
+      def initialize(source, name, type, options)
+        @source = source
+        @name = name.to_sym
+        @type = type
+        @options = options
+      end
+
+      def call
+        # Register new field metadata
+        @source.attributes = @source.attributes.merge(
+          @name => { type: @type }.merge(@options)
+        )
+
+        # Should be called before `define_attribute_methods` method because it
+        # defines an attribute getter itself
+        warn_about_method_overriding
+
+        # Dirty API
+        @source.define_attribute_method(@name)
+
+        # Generate getters and setters as well as other helper methods
+        generate_instance_methods
+
+        # If alias name specified - generate the same instance methods
+        if @options[:alias]
+          generate_instance_methods_for_alias
+        end
+      end
+
+      private
+
+      def warn_about_method_overriding
+        warn_if_method_exists(@name)
+        warn_if_method_exists("#{@name}=")
+        warn_if_method_exists("#{@name}?")
+        warn_if_method_exists("#{@name}_before_type_cast?")
+      end
+
+      def generate_instance_methods
+        # only local variable is visible in `module_eval` block
+        name = @name
+
+        @source.generated_methods.module_eval do
+          define_method(name) { read_attribute(name) }
+          define_method("#{name}?") do
+            value = read_attribute(name)
+            case value
+            when true        then true
+            when false, nil  then false
+            else
+              !value.nil?
+            end
+          end
+          define_method("#{name}=") { |value| write_attribute(name, value) }
+          define_method("#{name}_before_type_cast") { read_attribute_before_type_cast(name) }
+        end
+      end
+
+      def generate_instance_methods_for_alias
+        # only local variable is visible in `module_eval` block
+        name = @name
+
+        alias_name = @options[:alias].to_sym
+
+        @source.generated_methods.module_eval do
+          alias_method alias_name, name
+          alias_method "#{alias_name}=", "#{name}="
+          alias_method "#{alias_name}?", "#{name}?"
+          alias_method "#{alias_name}_before_type_cast", "#{name}_before_type_cast"
+        end
+      end
+
+      def warn_if_method_exists(method)
+        if @source.instance_methods.include?(method.to_sym)
+          Dynamoid.logger.warn("Method #{method} generated for the field #{@name} overrides already existing method")
+        end
+      end
+    end
+  end
+end

data/lib/dynamoid/indexes.rb

@@ -154,6 +154,16 @@ module Dynamoid
         index
       end
 
+      # Returns an index by its name
+      #
+      # @param name [string, symbol] the name of the index to lookup
+      # @return [Dynamoid::Indexes::Index, nil] index object or nil if it isn't found
+      def find_index_by_name(name)
+        string_name = name.to_s
+        indexes.each_value.detect{ |i| i.name.to_s == string_name }
+      end
+
+
       # Returns true iff the provided hash[,range] key combo is a local
       # secondary index.
       #

data/lib/dynamoid/loadable.rb

@@ -10,7 +10,7 @@ module Dynamoid
       end
     end
 
-    # Reload an object from the database -- if you suspect the object has changed in the datastore and you need those
+    # Reload an object from the database -- if you suspect the object has changed in the data store and you need those
     # changes to be reflected immediately, you would call this method. This is a consistent read.
     #
     # @return [Dynamoid::Document] the document this method was called on
@@ -23,7 +23,7 @@ module Dynamoid
         options[:range_key] = range_value
       end
 
-      self.attributes = self.class.find(hash_key, options).attributes
+      self.attributes = self.class.find(hash_key, **options).attributes
       @associations.values.each(&:reset)
       self
     end

data/lib/dynamoid/persistence.rb

@@ -8,11 +8,12 @@ require 'dynamoid/persistence/import'
 require 'dynamoid/persistence/update_fields'
 require 'dynamoid/persistence/upsert'
 require 'dynamoid/persistence/save'
+require 'dynamoid/persistence/update_validations'
 
 # encoding: utf-8
 module Dynamoid
-  #   # Persistence is responsible for dumping objects to and marshalling objects from the datastore. It tries to reserialize
-  #   # values to be of the same type as when they were passed in, based on the fields in the class.
+  # Persistence is responsible for dumping objects to and marshalling objects from the data store. It tries to reserialize
+  # values to be of the same type as when they were passed in, based on the fields in the class.
   module Persistence
     extend ActiveSupport::Concern
 
@@ -111,7 +112,7 @@ module Dynamoid
 
         if created_successfuly && self.options[:expires]
           attribute = self.options[:expires][:field]
-          Dynamoid.adapter.update_time_to_live(table_name: table_name, attribute: attribute)
+          Dynamoid.adapter.update_time_to_live(table_name, attribute)
         end
       end
 
@@ -276,6 +277,9 @@ module Dynamoid
       # +update_fields+ uses the +UpdateItem+ operation so it saves changes and
       # loads an updated document back with one HTTP request.
       #
+      # Raises a +Dynamoid::Errors::UnknownAttribute+ exception if any of the
+      # attributes is not on the model
+      #
       # @param hash_key_value [Scalar value] hash key
       # @param range_key_value [Scalar value] range key (optional)
       # @param attrs [Hash]
@@ -324,6 +328,9 @@ module Dynamoid
       # +upsert+ uses the +UpdateItem+ operation so it saves changes and loads
       # an updated document back with one HTTP request.
       #
+      # Raises a +Dynamoid::Errors::UnknownAttribute+ exception if any of the
+      # attributes is not on the model
+      #
       # @param hash_key_value [Scalar value] hash key
       # @param range_key_value [Scalar value] range key (optional)
       # @param attrs [Hash]
@@ -491,6 +498,9 @@ module Dynamoid
     #
     #   user.update_attributes(age: 27, last_name: 'Tylor')
     #
+    # Raises a +Dynamoid::Errors::UnknownAttribute+ exception if any of the
+    # attributes is not on the model
+    #
     # @param attributes [Hash] a hash of attributes to update
     # @return [true|false] Whether updating successful or not
     # @since 0.2.0
@@ -507,6 +517,9 @@ module Dynamoid
     # Raises a +Dynamoid::Errors::DocumentNotValid+ exception if some vaidation
     # fails.
     #
+    # Raises a +Dynamoid::Errors::UnknownAttribute+ exception if any of the
+    # attributes is not on the model
+    #
     # @param attributes [Hash] a hash of attributes to update
     def update_attributes!(attributes)
       attributes.each { |attribute, value| write_attribute(attribute, value) }
@@ -519,6 +532,9 @@ module Dynamoid
     #
     #   user.update_attribute(:last_name, 'Tylor')
     #
+    # Raises a +Dynamoid::Errors::UnknownAttribute+ exception if any of the
+    # attributes is not on the model
+    #
     # @param attribute [Symbol] attribute name to update
     # @param value [Object] the value to assign it
     # @return [Dynamoid::Document] self
@@ -786,6 +802,10 @@ module Dynamoid
       @destroyed = true
 
       Dynamoid.adapter.delete(self.class.table_name, hash_key, options)
+
+      self.class.associations.each do |name, options|
+        send(name).disassociate_source
+      end
     rescue Dynamoid::Errors::ConditionalCheckFailedException
       raise Dynamoid::Errors::StaleObjectError.new(self, 'delete')
     end

data/lib/dynamoid/persistence/update_fields.rb

@@ -4,8 +4,8 @@ module Dynamoid
   module Persistence
     # @private
     class UpdateFields
-      def self.call(*args)
-        new(*args).call
+      def self.call(*args, **options)
+        new(*args, **options).call
       end
 
       def initialize(model_class, partition_key:, sort_key:, attributes:, conditions:)
@@ -17,6 +17,8 @@ module Dynamoid
       end
 
       def call
+        UpdateValidations.validate_attributes_exist(@model_class, @attributes)
+
         if Dynamoid::Config.timestamps
           @attributes[:updated_at] ||= DateTime.now.in_time_zone(Time.zone)
         end

data/lib/dynamoid/persistence/update_validations.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Dynamoid
+  module Persistence
+    # @private
+    module UpdateValidations
+      def self.validate_attributes_exist(model_class, attributes)
+        model_attributes = model_class.attributes.keys
+
+        attributes.each do |attr_name, _|
+          unless model_attributes.include?(attr_name)
+            raise Dynamoid::Errors::UnknownAttribute.new("Attribute #{attr_name} does not exist in #{model_class}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dynamoid/persistence/upsert.rb

@@ -4,8 +4,8 @@ module Dynamoid
   module Persistence
     # @private
     class Upsert
-      def self.call(*args)
-        new(*args).call
+      def self.call(*args, **options)
+        new(*args, **options).call
       end
 
       def initialize(model_class, partition_key:, sort_key:, attributes:, conditions:)
@@ -17,6 +17,8 @@ module Dynamoid
       end
 
       def call
+        UpdateValidations.validate_attributes_exist(@model_class, @attributes)
+
         if Dynamoid::Config.timestamps
           @attributes[:updated_at] ||= DateTime.now.in_time_zone(Time.zone)
         end

data/lib/dynamoid/validations.rb

@@ -50,7 +50,10 @@ module Dynamoid
       class PresenceValidator < ActiveModel::EachValidator
         # Validate the record for the record and value.
         def validate_each(record, attr_name, value)
-          record.errors.add(attr_name, :blank, options) if not_present?(value)
+          # Use keyword argument `options` because it was a Hash in Rails < 6.1
+          # and became a keyword argument in 6.1.  This way it works in both
+          # cases.
+          record.errors.add(attr_name, :blank, **options) if not_present?(value)
         end
 
         private

data/lib/dynamoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dynamoid
-  VERSION = '3.6.0'
+  VERSION = '3.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Josh Symonds
@@ -18,10 +18,10 @@ authors:
 - Brian Glusman
 - Peter Boling
 - Andrew Konchin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -244,6 +244,7 @@ files:
 - lib/dynamoid/dynamodb_time_zone.rb
 - lib/dynamoid/errors.rb
 - lib/dynamoid/fields.rb
+- lib/dynamoid/fields/declare.rb
 - lib/dynamoid/finders.rb
 - lib/dynamoid/identity_map.rb
 - lib/dynamoid/indexes.rb
@@ -254,6 +255,7 @@ files:
 - lib/dynamoid/persistence/import.rb
 - lib/dynamoid/persistence/save.rb
 - lib/dynamoid/persistence/update_fields.rb
+- lib/dynamoid/persistence/update_validations.rb
 - lib/dynamoid/persistence/upsert.rb
 - lib/dynamoid/primary_key_type_mapping.rb
 - lib/dynamoid/railtie.rb
@@ -269,10 +271,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/Dynamoid/dynamoid/issues
-  changelog_uri: https://github.com/Dynamoid/dynamoid/tree/v3.6.0/CHANGELOG.md
-  source_code_uri: https://github.com/Dynamoid/dynamoid/tree/v3.6.0
-  documentation_uri: https://rubydoc.info/gems/dynamoid/3.6.0
-post_install_message: 
+  changelog_uri: https://github.com/Dynamoid/dynamoid/tree/v3.7.0/CHANGELOG.md
+  source_code_uri: https://github.com/Dynamoid/dynamoid/tree/v3.7.0
+  documentation_uri: https://rubydoc.info/gems/dynamoid/3.7.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -287,8 +289,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.0
+signing_key:
 specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB
 test_files: []