dynamoid 3.12.1 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e330233bdd01c0bb962fb7253b48629fe9f0aeb1ecdcb6cfe7d3272ddddbe0
-  data.tar.gz: 7f6ee27e8d6dedb5fe21bce21a6c00397f42d85dfa40b8d30dae4e13a8294d15
+  metadata.gz: b115b0eb8a9244d3482f3b748edf42272f6d9ffa94db20c5c07c7d08a6a3cf6a
+  data.tar.gz: 60821b56861e74149f3751f0c58bbc58e6805a9b4db0a4b863527aad99748099
 SHA512:
-  metadata.gz: f84a868794dd6b812ccd6936eaa16c91a8d0f87b2ae959b89a8b01802537490168449bfa83f62d92f8643a6c47043cefeb9168da3301ca4f005400bc1086406f
-  data.tar.gz: 528587c73879f49d25e660974fa5832464eed5773da06535a76bfe3c9c96311a1877eb801e68362c94eadc479cf65a8df053a0f47574c78fbf5919859cb88e66
+  metadata.gz: 1eef7ad0569e01d06b8f52a273acff4621a23419bc7f83830dfb37a44149149ec41b010cfa96c4e81d51043b4c7154c7996c72d7e50b599b4ea969ff6bb7575f
+  data.tar.gz: ee7561403e8f0bfd2c0e29e2212c0cec903e264c83adc9d238d565054bc98f111d85b3e70e64e838d6c35a434d8b7ef3025eba347ccfee53d249a3834ce53dc0

data/CHANGELOG.md

@@ -11,7 +11,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 ### Removed
 
-## 3.12.0
+## 3.13.0
+
+### Fixed
+* [#944](https://github.com/Dynamoid/dynamoid/pull/944) Fix `#delete` and `#destroy` methods and set `#destroyed?` properly when operations fail
+* [#987](https://github.com/Dynamoid/dynamoid/pull/987) Fix checking that a primary key is given in transactional methods `#save` and `#destroy`
+### Added
+* [#941](https://github.com/Dynamoid/dynamoid/pull/941) Support table ARN and add option `:arn` for the `table` method to specify a table belonged to specific AWS account
+* [#943](https://github.com/Dynamoid/dynamoid/pull/943) Implement `delete` class method
+* [#945](https://github.com/Dynamoid/dynamoid/pull/945) Implement `#update_attribute!` method
+* [#947](https://github.com/Dynamoid/dynamoid/pull/947) Allow skipping default model fields generation and add option `:skip_generating_fields` for the `table` method to specify field names
+* [#988](https://github.com/Dynamoid/dynamoid/pull/988) Add Ruby 4.0 and Rails 8.1 in CI
+### Changed
+### Removed
+
+## 3.12.0 / 2025-08-23
 
 ### Fixed
 * [#849](https://github.com/Dynamoid/dynamoid/pull/849) Fixed saving a field of custom type when it implements both `.dynamoid_dump()` and `#dynamoid_dump` method and use the former one.

data/README.md

@@ -132,8 +132,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, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, and 3.4, JRuby 9.4.x and against Rails versions: 4.2, 5.0, 5.1,
-5.2, 6.0, 6.1, 7.0, 7.1, 7.2, and 8.0.
+2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, and 4.0, JRuby 9.4.x and against Rails versions: 4.2, 5.0, 5.1,
+5.2, 6.0, 6.1, 7.0, 7.1, 7.2, 8.0, and 8.1.
 
 ## Setup
 
@@ -1131,7 +1131,7 @@ The following actions are supported:
 
 * `#create`/`#create!` - add a new model if it does not already exist
 * `#save`/`#save!` - create or update model
-* `#update_attributes`/`#update_attributes!` - modifies one or more attributes from an existig
+* `#update_attributes`/`#update_attributes!` - modifies one or more attributes from an existing
 model
 * `#delete` - remove an model without callbacks nor validations
 * `#destroy`/`#destroy!` - remove an model

data/SECURITY.md

@@ -4,14 +4,14 @@
 
 | Version | Supported |
 |---------|-----------|
-| 3.7.x   | ✅         |
-| <= 3.6  | ❌         |
+| 3.12.x   | ✅         |
+| < 3.12  | ❌         |
 | 2.x     | ❌         |
 | 1.x     | ❌         |
 | 0.x     | ❌         |
 
-## Reporting a Vulnerability
+## Security contact information
 
-Peter Boling is responsible for the security maintenance of this gem. Please find a way
-to [contact him directly](https://railsbling.com/contact) to report the issue. Include as much relevant information as
-possible.
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.

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

@@ -63,9 +63,11 @@ module Dynamoid
                    ids.map { |hk, rk| { table.hash_key => hk, table.range_key => rk } }
                  end
 
+          table_name = table.local? ? table.name : table.arn
+
           {
             request_items: {
-              table.name => {
+              table_name => {
                 keys: keys,
                 consistent_read: options[:consistent_read]
               }

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

@@ -58,7 +58,7 @@ module Dynamoid
             # delete explicitly attributes if assigned nil value and configured
             # to not store nil values
             values_to_update = values_sanitized.reject { |_, v| v.nil? }
-            values_to_delete = values_sanitized.select { |_, v| v.nil? }
+            values_to_delete = values_sanitized.select { |_, v| v.nil? } # rubocop:disable Style/PartitionInsteadOfDoubleSelect
 
             @updates.merge!(values_to_update)
             @deletions.merge!(values_to_delete)

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

@@ -64,6 +64,9 @@ module Dynamoid
           name_placeholders = {}
           value_placeholders = {}
 
+          # use table arn if it's configured for a model
+          table_name = table.local? ? table.name : table.arn
+
           # Deal with various limits and batching
           batch_size = options[:batch_size]
           limit = [record_limit, scan_limit, batch_size].compact.min
@@ -93,7 +96,7 @@ module Dynamoid
             :exclusive_start_key
           ).compact
 
-          request[:table_name]                  = table.name
+          request[:table_name]                  = table_name
           request[:limit]                       = limit                     if limit
           request[:key_condition_expression]    = key_condition_expression  if key_condition_expression.present?
           request[:filter_expression]           = filter_expression         if filter_expression.present?

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

@@ -57,6 +57,9 @@ module Dynamoid
           name_placeholders = {}
           value_placeholders = {}
 
+          # use table arn if it's configured for a model
+          table_name = table.local? ? table.name : table.arn
+
           # Deal with various limits and batching
           batch_size = options[:batch_size]
           limit = [record_limit, scan_limit, batch_size].compact.min
@@ -79,7 +82,7 @@ module Dynamoid
             :index_name
           ).compact
 
-          request[:table_name]                  = table.name
+          request[:table_name]                  = table_name
           request[:limit]                       = limit                 if limit
           request[:filter_expression]           = filter_expression     if filter_expression.present?
           request[:expression_attribute_values] = value_placeholders    if value_placeholders.present?

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

@@ -14,6 +14,7 @@ module Dynamoid
         #
         def initialize(schema)
           @schema = schema[:table]
+          @local = false
         end
 
         def range_key
@@ -47,6 +48,18 @@ module Dynamoid
         def name
           schema[:table_name]
         end
+
+        def arn
+          schema[:table_arn]
+        end
+
+        def local!
+          @local = true
+        end
+
+        def local?
+          @local
+        end
       end
     end
   end

data/lib/dynamoid/adapter_plugin/aws_sdk_v3.rb

@@ -321,6 +321,22 @@ module Dynamoid
         false
       end
 
+      #
+      # New, semi-arbitrary API to get data on the table
+      #
+      def describe_table(table_name, reload: false)
+        (!reload && table_cache[table_name]) || begin
+          response = client.describe_table(table_name: table_name)
+          table = Table.new(response.data)
+
+          if table.name == table_name.to_s
+            table.local!
+          end
+
+          table_cache[table_name] = table
+        end
+      end
+
       def update_time_to_live(table_name, attribute)
         request = {
           table_name: table_name,
@@ -654,15 +670,6 @@ module Dynamoid
         expected
       end
 
-      #
-      # New, semi-arbitrary API to get data on the table
-      #
-      def describe_table(table_name, reload: false)
-        (!reload && table_cache[table_name]) || begin
-          table_cache[table_name] = Table.new(client.describe_table(table_name: table_name).data)
-        end
-      end
-
       #
       # Converts a hash returned by get_item, scan, etc. into a key-value hash
       #

data/lib/dynamoid/fields/declare.rb

@@ -77,7 +77,7 @@ module Dynamoid
       end
 
       def warn_if_method_exists(method)
-        if @source.instance_methods.include?(method.to_sym)
+        if @source.method_defined?(method.to_sym)
           Dynamoid.logger.warn("Method #{method} generated for the field #{@name} overrides already existing method")
         end
       end

data/lib/dynamoid/fields.rb

@@ -134,6 +134,11 @@ module Dynamoid
       # @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)
+      # @option options [Symbol] :of <description>
+      # @option options [Symbol] :store_as_string <description>
+      # @option options [Symbol] :store_as_native_boolean <description>
+      # @option options [Symbol] :default <description>
+      # @option options [Symbol] :alias <description>
       #
       # @since 0.2.0
       def field(name, type = :string, options = {})
@@ -208,9 +213,11 @@ module Dynamoid
       #
       # @param options [Hash] options to override default table settings
       # @option options [Symbol] :name name of a table
+      # @option options [Symbol] :arn table ARN; it allows referring tables in another AWS accounts; has higher priority than the +name+ option
       # @option options [Symbol] :key name of a hash key attribute
       # @option options [Symbol] :key_type type of a hash key attribute
       # @option options [Symbol] :inheritance_field name of an attribute used for STI
+      # @option options [Array<Symbol>] :skip_generating_fields don't generate implicitly methods with given names, e.g. +:id+, +:created_at+, +:updated_at+
       # @option options [Symbol] :capacity_mode table billing mode - either +provisioned+ or +on_demand+
       # @option options [Integer] :write_capacity table write capacity units
       # @option options [Integer] :read_capacity table read capacity units
@@ -220,11 +227,18 @@ module Dynamoid
       # @since 0.4.0
       def table(options)
         self.options = options
+
+        id_already_declared = true
+        timestamps_already_declared = Dynamoid::Config.timestamps
+
         # a default 'id' column is created when Dynamoid::Document is included
         unless attributes.key? hash_key
           remove_field :id
+          id_already_declared = false
+
           key_type = options[:key_type] || :string
           field(hash_key, key_type)
+          id_already_declared = hash_key == :id
         end
 
         # The created_at/updated_at fields are declared in the `included` callback first.
@@ -233,14 +247,30 @@ module Dynamoid
         # So we need to make decision again and declare the fields or rollback thier declaration.
         #
         # Do not replace with `#timestamps_enabled?`.
-        if options[:timestamps] && !Dynamoid::Config.timestamps
+        if options[:timestamps] && !timestamps_already_declared
           # The fields weren't declared in `included` callback because they are disabled globaly
           field :created_at, :datetime
           field :updated_at, :datetime
-        elsif options[:timestamps] == false && Dynamoid::Config.timestamps
+
+          timestamps_already_declared = true
+        elsif options[:timestamps] == false && timestamps_already_declared
           # The fields were declared in `included` callback but they are disabled for a table
           remove_field :created_at
           remove_field :updated_at
+
+          timestamps_already_declared = false
+        end
+
+        # handle :skip_generating_fields option
+        skip_generating_fields = options[:skip_generating_fields] || []
+        if id_already_declared && skip_generating_fields.include?(:id)
+          remove_field :id
+        end
+        if timestamps_already_declared && skip_generating_fields.include?(:created_at)
+          remove_field :created_at
+        end
+        if timestamps_already_declared && skip_generating_fields.include?(:updated_at)
+          remove_field :updated_at
         end
       end
 

data/lib/dynamoid/finders.rb

@@ -133,12 +133,14 @@ module Dynamoid
         end
 
         read_options = options.slice(:consistent_read)
+        table = Dynamoid.adapter.describe_table(table_name)
 
         items = if Dynamoid.config.backoff
                   items = []
                   backoff = nil
                   Dynamoid.adapter.read(table_name, ids, read_options) do |hash, has_unprocessed_items|
-                    items += hash[table_name]
+                    # Cannot use #table_name because it may contain a table ARN, but response contains always a table name
+                    items += hash[table.name]
 
                     if has_unprocessed_items
                       backoff ||= Dynamoid.config.build_backoff
@@ -150,7 +152,9 @@ module Dynamoid
                   items
                 else
                   items = Dynamoid.adapter.read(table_name, ids, read_options)
-                  items ? items[table_name] : []
+
+                  # Cannot use #table_name because it may contain a table ARN, but response contains always a table name
+                  items ? items[table.name] : []
                 end
 
         if items.size == ids.size || !options[:raise_error]

data/lib/dynamoid/persistence.rb

@@ -28,9 +28,16 @@ module Dynamoid
 
     module ClassMethods
       def table_name
-        table_base_name = options[:name] || base_class.name.split('::').last.downcase.pluralize
+        return @table_name if @table_name
 
-        @table_name ||= [Dynamoid::Config.namespace.to_s, table_base_name].reject(&:empty?).join('_')
+        if options[:arn]
+          @table_name = options[:arn]
+          return @table_name
+        end
+
+        base_name = options[:name] || base_class.name.split('::').last.downcase.pluralize
+        namespace = Dynamoid::Config.namespace.to_s
+        @table_name = [namespace, base_name].reject(&:empty?).join('_')
       end
 
       # Create a table.
@@ -209,6 +216,9 @@ module Dynamoid
       # Raises an exception +Dynamoid::Errors::DocumentNotValid+ if validation
       # failed.
       #
+      # If any of the +before_*+ callbacks throws +:abort+ the creation is
+      # cancelled and +create!+ raises +Dynamoid::Errors::RecordNotSaved+.
+      #
       # Accepts both Hash and Array of Hashes and can create several
       # models.
       #
@@ -448,6 +458,88 @@ module Dynamoid
         Inc.call(self, hash_key_value, range_key_value, counters)
         self
       end
+
+      # Delete a model by a given primary key.
+      #
+      # Raises +Dynamoid::Errors::MissingHashKey+ if a partition key has value
+      # +nil+ and raises +Dynamoid::Errors::MissingRangeKey+ if a sort key is
+      # required but has value +nil+ or is missing.
+      #
+      # @param ids [String|Array] primary key or an array of primary keys
+      # @return nil
+      #
+      # @example Delete a model by given partition key:
+      #   User.delete(user_id)
+      #
+      # @example Delete a model by given partition and sort keys:
+      #   User.delete(user_id, sort_key)
+      #
+      # @example Delete multiple models by given partition keys:
+      #   User.delete([id1, id2, id3])
+      #
+      # @example Delete multiple models by given partition and sort keys:
+      #   User.delete([[id1, sk1], [id2, sk2], [id3, sk3]])
+      def delete(*ids)
+        if ids.empty?
+          raise Dynamoid::Errors::MissingHashKey
+        end
+
+        if ids[0].is_a?(Array)
+          # given multiple keys
+          #   Model.delete([id1, id2, id3])
+          keys = ids[0] # ignore other arguments
+
+          ids = []
+          if self.range_key
+            # compound primary key
+            # expect [hash key, range key] pairs
+
+            range_key = []
+
+            # assume all elements are pairs, that's arrays
+            keys.each do |pk, sk|
+              raise Dynamoid::Errors::MissingHashKey if pk.nil?
+              raise Dynamoid::Errors::MissingRangeKey if self.range_key && sk.nil?
+
+              partition_key_dumped = cast_and_dump(hash_key, pk)
+              sort_key_dumped = cast_and_dump(self.range_key, sk)
+
+              ids << partition_key_dumped
+              range_key << sort_key_dumped
+            end
+          else
+            # simple primary key
+
+            range_key = nil
+
+            keys.each do |pk|
+              raise Dynamoid::Errors::MissingHashKey if pk.nil?
+
+              partition_key_dumped = cast_and_dump(hash_key, pk)
+              ids << partition_key_dumped
+            end
+          end
+
+          options = range_key ? { range_key: range_key } : {}
+          Dynamoid.adapter.delete(table_name, ids, options)
+        else
+          # given single primary key:
+          #   Model.delete(partition_key)
+          #   Model.delete(partition_key, sort_key)
+
+          partition_key, sort_key = ids
+
+          raise Dynamoid::Errors::MissingHashKey if partition_key.nil?
+          raise Dynamoid::Errors::MissingRangeKey if range_key? && sort_key.nil?
+
+          options = sort_key ? { range_key: cast_and_dump(self.range_key, sort_key) } : {}
+          partition_key_dumped = cast_and_dump(hash_key, partition_key)
+
+          Dynamoid.adapter.delete(table_name, partition_key_dumped, options)
+        end
+
+        nil
+      end
     end
 
     # Update document timestamps.
@@ -593,6 +685,9 @@ module Dynamoid
     #   user = User.new(age: -1)
     #   user.save!(validate: false) # => user
     #
+    # If any of the +before_*+ callbacks throws +:abort+ the saving is
+    # cancelled and +save!+ raises +Dynamoid::Errors::RecordNotSaved+.
+    #
     # +save!+ by default sets timestamps attributes - +created_at+ and
     # +updated_at+ when creates new model and updates +updated_at+ attribute
     # when updates already existing one.
@@ -688,6 +783,10 @@ module Dynamoid
     # Raises a +Dynamoid::Errors::DocumentNotValid+ exception if some vaidation
     # fails.
     #
+    # If any of the +before_*+ callbacks throws +:abort+ the updating is
+    # cancelled and +update_attributes!+ raises
+    # +Dynamoid::Errors::RecordNotSaved+.
+    #
     # Raises a +Dynamoid::Errors::UnknownAttribute+ exception if any of the
     # attributes is not on the model
     #
@@ -703,8 +802,6 @@ module Dynamoid
 
     # Update a single attribute, saving the object afterwards.
     #
-    # Returns +true+ if saving is successful and +false+ otherwise.
-    #
     #   user.update_attribute(:last_name, 'Tylor')
     #
     # Validation is skipped.
@@ -721,6 +818,28 @@ module Dynamoid
       # final implementation is in the Dynamoid::Validation module
     end
 
+    # Update a single attribute, saving the object afterwards.
+    #
+    #   user.update_attribute!(:last_name, 'Tylor')
+    #
+    # Validation is skipped.
+    #
+    # If any of the +before_*+ callbacks throws +:abort+ the updating is
+    # cancelled and +update_attribute!+ raises
+    # +Dynamoid::Errors::RecordNotSaved+.
+    #
+    # 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
+    #
+    # @since 0.2.0
+    def update_attribute!(attribute, value)
+      # final implementation is in the Dynamoid::Validation module
+    end
+
     # Update a model.
     #
     # Doesn't run validation. Runs only +update+ callbacks. Reloads all attribute values.
@@ -1017,13 +1136,12 @@ module Dynamoid
     # @return [Dynamoid::Document|false] whether deleted successfully
     # @since 0.2.0
     def destroy
-      ret = run_callbacks(:destroy) do
+      run_callbacks(:destroy) do
         delete
+        @destroyed = true
       end
 
-      @destroyed = true
-
-      ret == false ? false : self
+      @destroyed ? self : false
     end
 
     # Delete a model.
@@ -1086,6 +1204,7 @@ module Dynamoid
 
       self
     rescue Dynamoid::Errors::ConditionalCheckFailedException
+      @destroyed = false
       raise Dynamoid::Errors::StaleObjectError.new(self, 'delete')
     end
   end

data/lib/dynamoid/transaction_write/base.rb

@@ -42,6 +42,18 @@ module Dynamoid
       def action_request
         raise 'Not implemented'
       end
+
+      # copied from aws_sdk_v3
+      def sanitize_item(attributes)
+        config_value = Dynamoid.config.store_attribute_with_nil_value
+        store_attribute_with_nil_value = config_value.nil? ? false : !!config_value
+
+        attributes.reject do |_, v|
+          !store_attribute_with_nil_value && v.nil?
+        end.transform_values do |v|
+          v.is_a?(Hash) ? v.stringify_keys : v
+        end
+      end
     end
   end
 end

data/lib/dynamoid/transaction_write/destroy.rb

@@ -15,10 +15,10 @@ module Dynamoid
       end
 
       def on_registration
-        validate_model!
-
         @aborted = true
         @model.run_callbacks(:destroy) do
+          validate_primary_key!
+
           @aborted = false
           true
         end
@@ -70,7 +70,7 @@ module Dynamoid
 
       private
 
-      def validate_model!
+      def validate_primary_key!
         raise Dynamoid::Errors::MissingHashKey if @model.hash_key.nil?
         raise Dynamoid::Errors::MissingRangeKey if @model_class.range_key? && @model.range_value.nil?
       end

data/lib/dynamoid/transaction_write/item_updater.rb

@@ -20,7 +20,12 @@ module Dynamoid
 
       def set(attributes)
         validate_attribute_names!(attributes.keys)
-        @attributes_to_set.merge!(attributes)
+        if Dynamoid.config.store_attribute_with_nil_value
+          @attributes_to_set.merge!(attributes)
+        else
+          @attributes_to_set.merge!(attributes.reject { |_, v| v.nil? })
+          @attributes_to_remove += attributes.select { |_, v| v.nil? }.keys
+        end
       end
 
       # adds to array of fields for use in REMOVE update expression

data/lib/dynamoid/transaction_write/save.rb

@@ -18,8 +18,6 @@ module Dynamoid
       end
 
       def on_registration
-        validate_model!
-
         if @options[:validate] != false && !(@valid = @model.valid?)
           if @options[:raise_error]
             raise Dynamoid::Errors::DocumentNotValid, @model
@@ -35,6 +33,8 @@ module Dynamoid
         @model.run_callbacks(:save) do
           @model.run_callbacks(callback_name) do
             @model.run_callbacks(:validate) do
+              validate_primary_key!
+
               @aborted = false
               true
             end
@@ -88,7 +88,7 @@ module Dynamoid
 
       private
 
-      def validate_model!
+      def validate_primary_key!
         raise Dynamoid::Errors::MissingHashKey if !@was_new_record && @model.hash_key.nil?
         raise Dynamoid::Errors::MissingRangeKey if @model_class.range_key? && @model.range_value.nil?
       end
@@ -97,6 +97,7 @@ module Dynamoid
         touch_model_timestamps(skip_created_at: false)
 
         attributes_dumped = Dynamoid::Dumping.dump_attributes(@model.attributes, @model_class.attributes)
+        attributes_dumped = sanitize_item(attributes_dumped)
 
         # require primary key not to exist yet
         condition = "attribute_not_exists(#{@model_class.hash_key})"
@@ -126,7 +127,8 @@ module Dynamoid
 
         # Build UpdateExpression and keep names and values placeholders mapping
         # in ExpressionAttributeNames and ExpressionAttributeValues.
-        update_expression_statements = []
+        set_expression_statements = []
+        remove_expression_statements = []
         expression_attribute_names = {}
         expression_attribute_values = {}
 
@@ -134,12 +136,18 @@ module Dynamoid
           name_placeholder = "#_n#{i}"
           value_placeholder = ":_s#{i}"
 
-          update_expression_statements << "#{name_placeholder} = #{value_placeholder}"
+          if value || Dynamoid.config.store_attribute_with_nil_value
+            set_expression_statements << "#{name_placeholder} = #{value_placeholder}"
+            expression_attribute_values[value_placeholder] = value
+          else
+            remove_expression_statements << name_placeholder
+          end
           expression_attribute_names[name_placeholder] = name
-          expression_attribute_values[value_placeholder] = value
         end
 
-        update_expression = "SET #{update_expression_statements.join(', ')}"
+        update_expression = ''
+        update_expression += "SET #{set_expression_statements.join(', ')}" if set_expression_statements.any?
+        update_expression += " REMOVE #{remove_expression_statements.join(', ')}" if remove_expression_statements.any?
 
         {
           update: {

data/lib/dynamoid/transaction_write/update_fields.rb

@@ -54,7 +54,15 @@ module Dynamoid
         changes = add_timestamps(changes, skip_created_at: true)
         changes_dumped = Dynamoid::Dumping.dump_attributes(changes, @model_class.attributes)
 
-        builder.set_attributes(changes_dumped)
+        if Dynamoid.config.store_attribute_with_nil_value
+          builder.set_attributes(changes_dumped)
+        else
+          nil_attributes = changes_dumped.select { |_, v| v.nil? }
+          non_nil_attributes = changes_dumped.reject { |_, v| v.nil? } # rubocop:disable Style/PartitionInsteadOfDoubleSelect
+
+          builder.remove_attributes(nil_attributes.keys)
+          builder.set_attributes(non_nil_attributes)
+        end
 
         # given a block
         if @item_updater

data/lib/dynamoid/transaction_write/upsert.rb

@@ -54,7 +54,8 @@ module Dynamoid
 
         # Build UpdateExpression and keep names and values placeholders mapping
         # in ExpressionAttributeNames and ExpressionAttributeValues.
-        update_expression_statements = []
+        set_expression_statements = []
+        remove_expression_statements = []
         expression_attribute_names = {}
         expression_attribute_values = {}
 
@@ -62,12 +63,18 @@ module Dynamoid
           name_placeholder = "#_n#{i}"
           value_placeholder = ":_s#{i}"
 
-          update_expression_statements << "#{name_placeholder} = #{value_placeholder}"
+          if value || Dynamoid.config.store_attribute_with_nil_value
+            set_expression_statements << "#{name_placeholder} = #{value_placeholder}"
+            expression_attribute_values[value_placeholder] = value
+          else
+            remove_expression_statements << name_placeholder
+          end
           expression_attribute_names[name_placeholder] = name
-          expression_attribute_values[value_placeholder] = value
         end
 
-        update_expression = "SET #{update_expression_statements.join(', ')}"
+        update_expression = ''
+        update_expression += "SET #{set_expression_statements.join(', ')}" if set_expression_statements.any?
+        update_expression += " REMOVE #{remove_expression_statements.join(', ')}" if remove_expression_statements.any?
 
         {
           update: {

data/lib/dynamoid/validations.rb

@@ -47,6 +47,14 @@ module Dynamoid
       self
     end
 
+    def update_attribute!(attribute, value)
+      write_attribute(attribute, value)
+      save!(validate: false)
+      self
+    rescue Dynamoid::Errors::StaleObjectError
+      self
+    end
+
     module ClassMethods
       # Override validates_presence_of to handle false values as present.
       #

data/lib/dynamoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 3.12.1
+  version: 3.13.0
 platform: ruby
 authors:
 - Josh Symonds
@@ -18,10 +18,9 @@ authors:
 - Brian Glusman
 - Peter Boling
 - Andrew Konchin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -264,14 +263,13 @@ licenses:
 - MIT
 metadata:
   homepage_uri: http://github.com/Dynamoid/dynamoid
-  source_code_uri: https://github.com/Dynamoid/dynamoid/tree/v3.12.1
-  changelog_uri: https://github.com/Dynamoid/dynamoid/blob/v3.12.1/CHANGELOG.md
+  source_code_uri: https://github.com/Dynamoid/dynamoid/tree/v3.13.0
+  changelog_uri: https://github.com/Dynamoid/dynamoid/blob/v3.13.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/Dynamoid/dynamoid/issues
-  documentation_uri: https://www.rubydoc.info/gems/dynamoid/3.12.1
+  documentation_uri: https://www.rubydoc.info/gems/dynamoid/3.13.0
   funding_uri: https://opencollective.com/dynamoid
   wiki_uri: https://github.com/Dynamoid/dynamoid/wiki
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -286,8 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB
 test_files: []