dynamoid 3.1.0 → 3.2.0

data/lib/dynamoid/finders.rb

@@ -183,7 +183,7 @@ module Dynamoid
       def find_all_by_composite_key(hash_key, options = {})
         ActiveSupport::Deprecation.warn('[Dynamoid] .find_all_composite_key is deprecated! Call .where instead of')
 
-        Dynamoid.adapter.query(table_name, options.merge(hash_value: hash_key)).collect do |item|
+        Dynamoid.adapter.query(table_name, options.merge(hash_value: hash_key)).flat_map{ |i| i }.collect do |item|
           from_database(item)
         end
       end
@@ -240,7 +240,7 @@ module Dynamoid
           opts[range_op_mapped] = range_key_value
         end
         dynamo_options = opts.merge(options.reject { |key, _| key == :range })
-        Dynamoid.adapter.query(table_name, dynamo_options).map do |item|
+        Dynamoid.adapter.query(table_name, dynamo_options).flat_map{ |i| i }.map do |item|
           from_database(item)
         end
       end
@@ -264,7 +264,7 @@ module Dynamoid
           attributes = method.to_s.split('_by_').last.split('_and_')
 
           chain = Dynamoid::Criteria::Chain.new(self)
-          chain.query = {}.tap { |h| attributes.each_with_index { |attr, index| h[attr.to_sym] = args[index] } }
+          chain = chain.where({}.tap { |h| attributes.each_with_index { |attr, index| h[attr.to_sym] = args[index] } })
 
           if finder =~ /all/
             return chain.all

data/lib/dynamoid/persistence.rb

@@ -18,8 +18,7 @@ module Dynamoid
 
     module ClassMethods
       def table_name
-        table_base_name = options[:name] || base_class.name.split('::').last
-                                                      .downcase.pluralize
+        table_base_name = options[:name] || base_class.name.split('::').last.downcase.pluralize
 
         @table_name ||= [Dynamoid::Config.namespace.to_s, table_base_name].reject(&:empty?).join('_')
       end
@@ -151,22 +150,22 @@ module Dynamoid
       end
     end
 
-    # Updates multiple attibutes at once, saving the object once the updates are complete.
+    # Updates multiple attributes at once, saving the object once the updates are complete.
     #
     # @param [Hash] attributes a hash of attributes to update
     #
     # @since 0.2.0
     def update_attributes(attributes)
-      attributes.each { |attribute, value| write_attribute(attribute, value) } unless attributes.nil? || attributes.empty?
+      attributes.each { |attribute, value| write_attribute(attribute, value) }
       save
     end
 
-    # Updates multiple attibutes at once, saving the object once the updates are complete.
+    # Updates multiple attributes at once, saving the object once the updates are complete.
     # Raises a Dynamoid::Errors::DocumentNotValid exception if there is vaidation and it fails.
     #
     # @param [Hash] attributes a hash of attributes to update
     def update_attributes!(attributes)
-      attributes.each { |attribute, value| write_attribute(attribute, value) } unless attributes.nil? || attributes.empty?
+      attributes.each { |attribute, value| write_attribute(attribute, value) }
       save!
     end
 

data/lib/dynamoid/primary_key_type_mapping.rb

@@ -3,7 +3,7 @@
 module Dynamoid
   class PrimaryKeyTypeMapping
     def self.dynamodb_type(type, options)
-      if Class === type
+      if type.is_a?(Class)
         type = type.respond_to?(:dynamoid_field_type) ? type.dynamoid_field_type : :string
       end
 

data/lib/dynamoid/tasks.rb

@@ -0,0 +1 @@
+load "dynamoid/tasks/database.rake"

data/lib/dynamoid/tasks/database.rake

@@ -30,12 +30,12 @@ namespace :dynamoid do
     end
 
     msg = "Connection to DynamoDB #{success ? 'OK' : 'FAILED'}"
-    msg << if Dynamoid.config.endpoint
+    msg += if Dynamoid.config.endpoint
              " at local endpoint '#{Dynamoid.config.endpoint}'"
            else
              ' at remote AWS endpoint'
            end
-    msg << ", reason being '#{failure_reason}'" unless success
+    msg += ", reason being '#{failure_reason}'" unless success
     puts msg
   end
 end

data/lib/dynamoid/type_casting.rb

@@ -29,6 +29,7 @@ module Dynamoid
                           when :number     then NumberTypeCaster
                           when :set        then SetTypeCaster
                           when :array      then ArrayTypeCaster
+                          when :map        then MapTypeCaster
                           when :datetime   then DateTimeTypeCaster
                           when :date       then DateTypeCaster
                           when :raw        then RawTypeCaster
@@ -96,7 +97,7 @@ module Dynamoid
           nil
         elsif value.is_a?(Float) && !value.finite?
           nil
-        elsif !(value.respond_to?(:to_d))
+        elsif !value.respond_to?(:to_d)
           nil
         else
           value.to_d
@@ -122,8 +123,6 @@ module Dynamoid
           value.dup
         elsif value.respond_to?(:to_set)
           value.to_set
-        else
-          nil
         end
       end
 
@@ -138,20 +137,20 @@ module Dynamoid
       end
 
       def element_type
-        unless @options[:of].is_a?(Hash)
-          @options[:of]
-        else
+        if @options[:of].is_a?(Hash)
           @options[:of].keys.first
+        else
+          @options[:of]
         end
       end
 
       def element_options
-        unless @options[:of].is_a?(Hash)
-          { type: element_type }
-        else
+        if @options[:of].is_a?(Hash)
           @options[:of][element_type].dup.tap do |options|
             options[:type] = element_type
           end
+        else
+          { type: element_type }
         end
       end
     end
@@ -174,8 +173,6 @@ module Dynamoid
           value.dup
         elsif value.respond_to?(:to_a)
           value.to_a
-        else
-          nil
         end
       end
 
@@ -190,20 +187,36 @@ module Dynamoid
       end
 
       def element_type
-        unless @options[:of].is_a?(Hash)
-          @options[:of]
-        else
+        if @options[:of].is_a?(Hash)
           @options[:of].keys.first
+        else
+          @options[:of]
         end
       end
 
       def element_options
-        unless @options[:of].is_a?(Hash)
-          { type: element_type }
-        else
+        if @options[:of].is_a?(Hash)
           @options[:of][element_type].dup.tap do |options|
             options[:type] = element_type
           end
+        else
+          { type: element_type }
+        end
+      end
+    end
+
+    class MapTypeCaster < Base
+      def process(value)
+        return nil if value.nil?
+
+        if value.is_a? Hash
+          value
+        elsif value.respond_to? :to_hash
+          value.to_hash
+        elsif value.respond_to? :to_h
+          value.to_h
+        else
+          nil
         end
       end
     end
@@ -213,7 +226,11 @@ module Dynamoid
         if !value.respond_to?(:to_datetime)
           nil
         elsif value.is_a?(String)
-          dt = DateTime.parse(value) rescue nil
+          dt = begin
+                 DateTime.parse(value)
+               rescue StandardError
+                 nil
+               end
           if dt
             seconds = string_utc_offset(value) || ApplicationTimeZone.utc_offset
             offset = seconds_to_offset(seconds)
@@ -243,7 +260,8 @@ module Dynamoid
         else
           begin
             value.to_date
-          rescue ArgumentError
+          rescue StandardError
+            nil
           end
         end
       end

data/lib/dynamoid/undumping.rb

@@ -8,7 +8,7 @@ module Dynamoid
         attributes.symbolize_keys
           .select { |attribute| attributes_options.key?(attribute) }
           .each do |attribute, value|
-            h[attribute] = undump_field(value, attributes_options[attribute])
+          h[attribute] = undump_field(value, attributes_options[attribute])
         end
       end
     end
@@ -32,6 +32,7 @@ module Dynamoid
                        when :number     then NumberUndumper
                        when :set        then SetUndumper
                        when :array      then ArrayUndumper
+                       when :map        then MapUndumper
                        when :datetime   then DateTimeUndumper
                        when :date       then DateUndumper
                        when :raw        then RawUndumper
@@ -45,6 +46,35 @@ module Dynamoid
       end
     end
 
+    module UndumpHashHelper
+      extend self
+
+      def undump_hash(hash)
+        {}.tap do |h|
+          hash.each { |key, value| h[key.to_sym] = undump_hash_value(value) }
+        end
+      end
+
+      private
+
+      def undump_hash_value(val)
+        case val
+        when BigDecimal
+          if Dynamoid::Config.convert_big_decimal
+            val.to_f
+          else
+            val
+          end
+        when Hash
+          undump_hash(val)
+        when Array
+          val.map { |v| undump_hash_value(v) }
+        else
+          val
+        end
+      end
+    end
+
     class Base
       def initialize(options)
         @options = options
@@ -68,7 +98,7 @@ module Dynamoid
     end
 
     class SetUndumper < Base
-      ALLOWED_TYPES = [:string, :integer, :number, :date, :datetime, :serialized]
+      ALLOWED_TYPES = %i[string integer number date datetime serialized].freeze
 
       def process(set)
         if @options.key?(:of)
@@ -94,26 +124,26 @@ module Dynamoid
       end
 
       def element_type
-        unless @options[:of].is_a?(Hash)
-          @options[:of]
-        else
+        if @options[:of].is_a?(Hash)
           @options[:of].keys.first
+        else
+          @options[:of]
         end
       end
 
       def element_options
-        unless @options[:of].is_a?(Hash)
-          { type: element_type }
-        else
+        if @options[:of].is_a?(Hash)
           @options[:of][element_type].dup.tap do |options|
             options[:type] = element_type
           end
+        else
+          { type: element_type }
         end
       end
     end
 
     class ArrayUndumper < Base
-      ALLOWED_TYPES = [:string, :integer, :number, :date, :datetime, :serialized]
+      ALLOWED_TYPES = %i[string integer number date datetime serialized].freeze
 
       def process(array)
         if @options.key?(:of)
@@ -139,24 +169,30 @@ module Dynamoid
       end
 
       def element_type
-        unless @options[:of].is_a?(Hash)
-          @options[:of]
-        else
+        if @options[:of].is_a?(Hash)
           @options[:of].keys.first
+        else
+          @options[:of]
         end
       end
 
       def element_options
-        unless @options[:of].is_a?(Hash)
-          { type: element_type }
-        else
+        if @options[:of].is_a?(Hash)
           @options[:of][element_type].dup.tap do |options|
             options[:type] = element_type
           end
+        else
+          { type: element_type }
         end
       end
     end
 
+    class MapUndumper < Base
+      def process(value)
+        UndumpHashHelper.undump_hash(value)
+      end
+    end
+
     class DateTimeUndumper < Base
       def process(value)
         return value if value.is_a?(Date) || value.is_a?(DateTime) || value.is_a?(Time)
@@ -190,36 +226,11 @@ module Dynamoid
     class RawUndumper < Base
       def process(value)
         if value.is_a?(Hash)
-          undump_hash(value)
+          UndumpHashHelper.undump_hash(value)
         else
           value
         end
       end
-
-      private
-
-      def undump_hash(hash)
-        {}.tap do |h|
-          hash.each { |key, value| h[key.to_sym] = undump_hash_value(value) }
-        end
-      end
-
-      def undump_hash_value(val)
-        case val
-        when BigDecimal
-          if Dynamoid::Config.convert_big_decimal
-            val.to_f
-          else
-            val
-          end
-        when Hash
-          undump_hash(val)
-        when Array
-          val.map { |v| undump_hash_value(v) }
-        else
-          val
-        end
-      end
     end
 
     class SerializedUndumper < Base
@@ -233,7 +244,7 @@ module Dynamoid
     end
 
     class BooleanUndumper < Base
-      STRING_VALUES = ['t', 'f']
+      STRING_VALUES = %w[t f].freeze
 
       def process(value)
         store_as_boolean = if @options[:store_as_native_boolean].nil?

data/lib/dynamoid/validations.rb

@@ -14,6 +14,7 @@ module Dynamoid
     def save(options = {})
       options.reverse_merge!(validate: true)
       return false if options[:validate] && !valid?
+
       super
     end
 
@@ -30,6 +31,7 @@ module Dynamoid
     # @since 0.2.0
     def save!
       raise Dynamoid::Errors::DocumentNotValid, self unless valid?
+
       save(validate: false)
       self
     end

data/lib/dynamoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Josh Symonds
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -240,8 +240,15 @@ files:
 - lib/dynamoid.rb
 - lib/dynamoid/adapter.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3.rb
-- lib/dynamoid/adapter_plugin/query.rb
-- lib/dynamoid/adapter_plugin/scan.rb
+- lib/dynamoid/adapter_plugin/aws_sdk_v3/create_table.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/query.rb
+- lib/dynamoid/adapter_plugin/aws_sdk_v3/scan.rb
+- lib/dynamoid/adapter_plugin/aws_sdk_v3/table.rb
+- lib/dynamoid/adapter_plugin/aws_sdk_v3/until_past_table_status.rb
 - lib/dynamoid/application_time_zone.rb
 - lib/dynamoid/associations.rb
 - lib/dynamoid/associations/association.rb
@@ -258,6 +265,10 @@ 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/dirty.rb
 - lib/dynamoid/document.rb
 - lib/dynamoid/dumping.rb
@@ -271,6 +282,7 @@ files:
 - lib/dynamoid/persistence.rb
 - lib/dynamoid/primary_key_type_mapping.rb
 - lib/dynamoid/railtie.rb
+- lib/dynamoid/tasks.rb
 - lib/dynamoid/tasks/database.rake
 - lib/dynamoid/tasks/database.rb
 - lib/dynamoid/type_casting.rb
@@ -297,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB