dynamoid 3.9.0 → 3.10.0

data/lib/dynamoid/indexes.rb

@@ -130,13 +130,13 @@ module Dynamoid
         index_range_key = options[:range_key]
 
         unless index_range_key.present?
-          raise Dynamoid::Errors::InvalidIndex, 'A local secondary index '\
-            'requires a :range_key to be specified'
+          raise Dynamoid::Errors::InvalidIndex, 'A local secondary index ' \
+                                                'requires a :range_key to be specified'
         end
 
         if primary_range_key.present? && index_range_key == primary_range_key
-          raise Dynamoid::Errors::InvalidIndex, 'A local secondary index'\
-            ' must use a different :range_key than the primary key'
+          raise Dynamoid::Errors::InvalidIndex, 'A local secondary index ' \
+                                                'must use a different :range_key than the primary key'
         end
 
         index_opts = options.merge(
@@ -159,8 +159,7 @@ module Dynamoid
       # @param range [scalar] the range key used to declare an index (optional)
       # @return [Dynamoid::Indexes::Index, nil] index object or nil if it isn't found
       def find_index(hash, range = nil)
-        index = indexes[index_key(hash, range)]
-        index
+        indexes[index_key(hash, range)]
       end
 
       # Returns an index by its name
@@ -317,7 +316,7 @@ module Dynamoid
 
         key_dynamodb_type = dynamodb_type(key_field_attributes[:type], key_field_attributes)
         if PERMITTED_KEY_DYNAMODB_TYPES.include?(key_dynamodb_type)
-          send("#{key_param}_schema=", { key_val => key_dynamodb_type })
+          send(:"#{key_param}_schema=", { key_val => key_dynamodb_type })
         else
           errors.add(key_param, "Index :#{key_param} is not a valid key type")
         end

data/lib/dynamoid/loadable.rb

@@ -6,7 +6,7 @@ module Dynamoid
 
     def load(attrs)
       attrs.each do |key, value|
-        send("#{key}=", value) if respond_to?("#{key}=")
+        send(:"#{key}=", value) if respond_to?(:"#{key}=")
       end
 
       self
@@ -27,7 +27,7 @@ module Dynamoid
 
       self.attributes = self.class.find(hash_key, **options).attributes
 
-      @associations.values.each(&:reset)
+      @associations.each_value(&:reset)
       @new_record = false
 
       self

data/lib/dynamoid/persistence/save.rb

@@ -68,13 +68,11 @@ module Dynamoid
         end
 
         # Add an optimistic locking check if the lock_version column exists
-        if @model.class.attributes[:lock_version]
-          # Uses the original lock_version value from Dirty API
-          # in case user changed 'lock_version' manually
-          if @model.changes[:lock_version][0]
-            conditions[:if] ||= {}
-            conditions[:if][:lock_version] = @model.changes[:lock_version][0]
-          end
+        # Uses the original lock_version value from Dirty API
+        # in case user changed 'lock_version' manually
+        if @model.class.attributes[:lock_version] && (@model.changes[:lock_version][0])
+          conditions[:if] ||= {}
+          conditions[:if][:lock_version] = @model.changes[:lock_version][0]
         end
 
         conditions
@@ -89,17 +87,15 @@ module Dynamoid
         end
 
         conditions = {}
-        conditions[:if_exists] ||= {}
-        conditions[:if_exists][@model.class.hash_key] = @model.hash_key
+        conditions[:if] ||= {}
+        conditions[:if][@model.class.hash_key] = @model.hash_key
 
         # Add an optimistic locking check if the lock_version column exists
-        if @model.class.attributes[:lock_version]
-          # Uses the original lock_version value from Dirty API
-          # in case user changed 'lock_version' manually
-          if @model.changes[:lock_version][0]
-            conditions[:if] ||= {}
-            conditions[:if][:lock_version] = @model.changes[:lock_version][0]
-          end
+        # Uses the original lock_version value from Dirty API
+        # in case user changed 'lock_version' manually
+        if @model.class.attributes[:lock_version] && (@model.changes[:lock_version][0])
+          conditions[:if] ||= {}
+          conditions[:if][:lock_version] = @model.changes[:lock_version][0]
         end
 
         options[:conditions] = conditions

data/lib/dynamoid/persistence/update_fields.rb

@@ -54,8 +54,8 @@ module Dynamoid
         end
 
         conditions = @conditions.deep_dup
-        conditions[:if_exists] ||= {}
-        conditions[:if_exists][@model_class.hash_key] = @partition_key
+        conditions[:if] ||= {}
+        conditions[:if][@model_class.hash_key] = @partition_key
         options[:conditions] = conditions
 
         options

data/lib/dynamoid/persistence/update_validations.rb

@@ -7,7 +7,7 @@ module Dynamoid
       def self.validate_attributes_exist(model_class, attributes)
         model_attributes = model_class.attributes.keys
 
-        attributes.each do |attr_name, _|
+        attributes.each_key do |attr_name|
           unless model_attributes.include?(attr_name)
             raise Dynamoid::Errors::UnknownAttribute, "Attribute #{attr_name} does not exist in #{model_class}"
           end

data/lib/dynamoid/persistence.rb

@@ -271,7 +271,7 @@ module Dynamoid
       # meets the specified conditions. Conditions can be specified as a +Hash+
       # with +:if+ key:
       #
-      #   User.update_fields('1', { age: 26 }, if: { version: 1 })
+      #   User.update_fields('1', { age: 26 }, { if: { version: 1 } })
       #
       # Here +User+ model has an integer +version+ field and the document will
       # be updated only if the +version+ attribute currently has value 1.
@@ -279,6 +279,13 @@ module Dynamoid
       # If a document with specified hash and range keys doesn't exist or
       # conditions were specified and failed the method call returns +nil+.
       #
+      # To check if some attribute (or attributes) isn't stored in a DynamoDB
+      # item (e.g. it wasn't set explicitly) there is another condition -
+      # +unless_exists+:
+      #
+      #   user = User.create(name: 'Tylor')
+      #   User.update_fields(user.id, { age: 18 }, { unless_exists: [:age] })
+      #
       # +update_fields+ uses the +UpdateItem+ operation so it saves changes and
       # loads an updated document back with one HTTP request.
       #
@@ -323,11 +330,18 @@ module Dynamoid
       # meets the specified conditions. Conditions can be specified as a +Hash+
       # with +:if+ key:
       #
-      #   User.upsert('1', { age: 26 }, if: { version: 1 })
+      #   User.upsert('1', { age: 26 }, { if: { version: 1 } })
       #
       # Here +User+ model has an integer +version+ field and the document will
       # be updated only if the +version+ attribute currently has value 1.
       #
+      # To check if some attribute (or attributes) isn't stored in a DynamoDB
+      # item (e.g. it wasn't set explicitly) there is another condition -
+      # +unless_exists+:
+      #
+      #   user = User.create(name: 'Tylor')
+      #   User.upsert(user.id, { age: 18 }, { unless_exists: [:age] })
+      #
       # If conditions were specified and failed the method call returns +nil+.
       #
       # +upsert+ uses the +UpdateItem+ operation so it saves changes and loads
@@ -507,7 +521,10 @@ module Dynamoid
     # @return [true|false] Whether saving successful or not
     # @since 0.2.0
     def save(options = {})
-      self.class.create_table(sync: true)
+      if Dynamoid.config.create_table_on_save
+        self.class.create_table(sync: true)
+      end
+
       create_or_update = new_record? ? :create : :update
 
       run_callbacks(:save) do
@@ -618,6 +635,15 @@ module Dynamoid
     #     t.add(age: 1)
     #   end
     #
+    # To check if some attribute (or attributes) isn't stored in a DynamoDB
+    # item (e.g. it wasn't set explicitly) there is another condition -
+    # +unless_exists+:
+    #
+    #   user = User.create(name: 'Tylor')
+    #   user.update!(unless_exists: [:age]) do |t|
+    #     t.set(age: 18)
+    #   end
+    #
     # If a document doesn't meet conditions it raises
     # +Dynamoid::Errors::StaleObjectError+ exception.
     #
@@ -714,6 +740,15 @@ module Dynamoid
     #     t.add(age: 1)
     #   end
     #
+    # To check if some attribute (or attributes) isn't stored in a DynamoDB
+    # item (e.g. it wasn't set explicitly) there is another condition -
+    # +unless_exists+:
+    #
+    #   user = User.create(name: 'Tylor')
+    #   user.update(unless_exists: [:age]) do |t|
+    #     t.set(age: 18)
+    #   end
+    #
     # If a document doesn't meet conditions it just returns +false+. Otherwise it returns +true+.
     #
     # It will increment the +lock_version+ attribute if a table has the column,
@@ -889,7 +924,7 @@ module Dynamoid
 
       Dynamoid.adapter.delete(self.class.table_name, hash_key, options)
 
-      self.class.associations.each do |name, _options|
+      self.class.associations.each_key do |name|
         send(name).disassociate_source
       end
 

data/lib/dynamoid/type_casting.rb

@@ -57,11 +57,12 @@ module Dynamoid
 
     class StringTypeCaster < Base
       def process(value)
-        if value == true
+        case value
+        when true
           't'
-        elsif value == false
+        when false
           'f'
-        elsif value.is_a? String
+        when String
           value.dup
         else
           value.to_s
@@ -71,6 +72,7 @@ module Dynamoid
 
     class IntegerTypeCaster < Base
       def process(value)
+        # rubocop:disable Lint/DuplicateBranch
         if value == true
           1
         elsif value == false
@@ -84,11 +86,13 @@ module Dynamoid
         else
           value.to_i
         end
+        # rubocop:enable Lint/DuplicateBranch
       end
     end
 
     class NumberTypeCaster < Base
       def process(value)
+        # rubocop:disable Lint/DuplicateBranch
         if value == true
           1
         elsif value == false
@@ -104,6 +108,7 @@ module Dynamoid
         else
           value.to_d
         end
+        # rubocop:enable Lint/DuplicateBranch
       end
     end
 
@@ -135,7 +140,7 @@ module Dynamoid
           raise ArgumentError, "Set element type #{element_type} isn't supported"
         end
 
-        set.map { |el| type_caster.process(el) }.to_set
+        set.to_set { |el| type_caster.process(el) }
       end
 
       def element_type
@@ -227,10 +232,10 @@ module Dynamoid
           nil
         elsif value.is_a?(String)
           dt = begin
-                 DateTime.parse(value)
-               rescue StandardError
-                 nil
-               end
+            DateTime.parse(value)
+          rescue StandardError
+            nil
+          end
           if dt
             seconds = string_utc_offset(value) || ApplicationTimeZone.utc_offset
             offset = seconds_to_offset(seconds)
@@ -255,9 +260,7 @@ module Dynamoid
 
     class DateTypeCaster < Base
       def process(value)
-        if !value.respond_to?(:to_date)
-          nil
-        else
+        if value.respond_to?(:to_date)
           begin
             value.to_date
           rescue StandardError
@@ -277,10 +280,8 @@ module Dynamoid
       def process(value)
         if value == ''
           nil
-        elsif [false, 'false', 'FALSE', 0, '0', 'f', 'F', 'off', 'OFF'].include? value
-          false
         else
-          true
+          ![false, 'false', 'FALSE', 0, '0', 'f', 'F', 'off', 'OFF'].include? value
         end
       end
     end

data/lib/dynamoid/undumping.rb

@@ -115,7 +115,7 @@ module Dynamoid
       def process_typed_collection(set)
         if allowed_type?
           undumper = Undumping.find_undumper(element_options)
-          set.map { |el| undumper.process(el) }.to_set
+          set.to_set { |el| undumper.process(el) }
         else
           raise ArgumentError, "Set element type #{element_type} isn't supported"
         end

data/lib/dynamoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Josh Symonds
@@ -21,7 +21,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -122,33 +122,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-lts
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -185,10 +185,12 @@ files:
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/batch_get_item.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/create_table.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/execute_statement.rb
+- lib/dynamoid/adapter_plugin/aws_sdk_v3/filter_expression_convertor.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/item_updater.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/middleware/backoff.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/middleware/limit.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/middleware/start_key.rb
+- lib/dynamoid/adapter_plugin/aws_sdk_v3/projection_expression_convertor.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/query.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/scan.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/table.rb
@@ -209,10 +211,9 @@ files:
 - lib/dynamoid/config/options.rb
 - lib/dynamoid/criteria.rb
 - lib/dynamoid/criteria/chain.rb
-- lib/dynamoid/criteria/ignored_conditions_detector.rb
 - lib/dynamoid/criteria/key_fields_detector.rb
 - lib/dynamoid/criteria/nonexistent_fields_detector.rb
-- lib/dynamoid/criteria/overwritten_conditions_detector.rb
+- lib/dynamoid/criteria/where_conditions.rb
 - lib/dynamoid/dirty.rb
 - lib/dynamoid/document.rb
 - lib/dynamoid/dumping.rb
@@ -247,10 +248,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: http://github.com/Dynamoid/dynamoid
-  source_code_uri: https://github.com/Dynamoid/dynamoid/tree/v3.9.0
-  changelog_uri: https://github.com/Dynamoid/dynamoid/blob/v3.9.0/CHANGELOG.md
+  source_code_uri: https://github.com/Dynamoid/dynamoid/tree/v3.10.0
+  changelog_uri: https://github.com/Dynamoid/dynamoid/blob/v3.10.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/Dynamoid/dynamoid/issues
-  documentation_uri: https://www.rubydoc.info/gems/dynamoid/3.9.0
+  documentation_uri: https://www.rubydoc.info/gems/dynamoid/3.10.0
   funding_uri: https://opencollective.com/dynamoid
   wiki_uri: https://github.com/Dynamoid/dynamoid/wiki
   rubygems_mfa_required: 'true'
@@ -269,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB

data/lib/dynamoid/criteria/ignored_conditions_detector.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Dynamoid
-  module Criteria
-    # @private
-    class IgnoredConditionsDetector
-      def initialize(conditions)
-        @conditions = conditions
-        @ignored_keys = ignored_keys
-      end
-
-      def found?
-        @ignored_keys.present?
-      end
-
-      def warning_message
-        return unless found?
-
-        'Where conditions may contain only one condition for an attribute. ' \
-          "Following conditions are ignored: #{ignored_conditions}"
-      end
-
-      private
-
-      def ignored_keys
-        @conditions.keys
-          .group_by(&method(:key_to_field))
-          .select { |_, ary| ary.size > 1 }
-          .flat_map { |_, ary| ary[0..-2] }
-      end
-
-      def key_to_field(key)
-        key.to_s.split('.')[0]
-      end
-
-      def ignored_conditions
-        @conditions.slice(*@ignored_keys)
-      end
-    end
-  end
-end

data/lib/dynamoid/criteria/overwritten_conditions_detector.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Dynamoid
-  module Criteria
-    # @private
-    class OverwrittenConditionsDetector
-      def initialize(conditions, conditions_new)
-        @conditions = conditions
-        @new_conditions = conditions_new
-        @overwritten_keys = overwritten_keys
-      end
-
-      def found?
-        @overwritten_keys.present?
-      end
-
-      def warning_message
-        return unless found?
-
-        'Where conditions may contain only one condition for an attribute. ' \
-          "Following conditions are ignored: #{ignored_conditions}"
-      end
-
-      private
-
-      def overwritten_keys
-        new_fields = @new_conditions.keys.map(&method(:key_to_field))
-        @conditions.keys.select { |key| key_to_field(key).in?(new_fields) }
-      end
-
-      def key_to_field(key)
-        key.to_s.split('.')[0]
-      end
-
-      def ignored_conditions
-        @conditions.slice(*@overwritten_keys.map(&:to_sym))
-      end
-    end
-  end
-end