dynamoid 3.2.0 → 3.6.0

data/lib/dynamoid/persistence/import.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'securerandom'
+
+module Dynamoid
+  module Persistence
+    # @private
+    class Import
+      def self.call(model_class, array_of_attributes)
+        new(model_class, array_of_attributes).call
+      end
+
+      def initialize(model_class, array_of_attributes)
+        @model_class = model_class
+        @array_of_attributes = array_of_attributes
+      end
+
+      def call
+        models = @array_of_attributes.map(&method(:build_model))
+
+        unless Dynamoid.config.backoff
+          import(models)
+        else
+          import_with_backoff(models)
+        end
+
+        models.each { |d| d.new_record = false }
+        models
+      end
+
+      private
+
+      def build_model(attributes)
+        attrs = attributes.symbolize_keys
+
+        if @model_class.timestamps_enabled?
+          time_now = DateTime.now.in_time_zone(Time.zone)
+          attrs[:created_at] ||= time_now
+          attrs[:updated_at] ||= time_now
+        end
+
+        @model_class.build(attrs).tap do |model|
+          model.hash_key = SecureRandom.uuid if model.hash_key.blank?
+        end
+      end
+
+      def import_with_backoff(models)
+        backoff = nil
+        table_name = @model_class.table_name
+        items = array_of_dumped_attributes(models)
+
+        Dynamoid.adapter.batch_write_item(table_name, items) do |has_unprocessed_items|
+          if has_unprocessed_items
+            backoff ||= Dynamoid.config.build_backoff
+            backoff.call
+          else
+            backoff = nil
+          end
+        end
+      end
+
+      def import(models)
+        Dynamoid.adapter.batch_write_item(@model_class.table_name, array_of_dumped_attributes(models))
+      end
+
+      def array_of_dumped_attributes(models)
+        models.map do |m|
+          Dumping.dump_attributes(m.attributes, @model_class.attributes)
+        end
+      end
+    end
+  end
+end

data/lib/dynamoid/persistence/save.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Dynamoid
+  module Persistence
+    # @private
+    class Save
+      def self.call(model)
+        new(model).call
+      end
+
+      def initialize(model)
+        @model = model
+      end
+
+      def call
+        @model.hash_key = SecureRandom.uuid if @model.hash_key.blank?
+
+        # Add an optimistic locking check if the lock_version column exists
+        if @model.class.attributes[:lock_version]
+          @model.lock_version = (@model.lock_version || 0) + 1
+        end
+
+        attributes_dumped = Dumping.dump_attributes(@model.attributes, @model.class.attributes)
+        Dynamoid.adapter.write(@model.class.table_name, attributes_dumped, conditions_for_write)
+
+        @model.new_record = false
+        true
+      rescue Dynamoid::Errors::ConditionalCheckFailedException => e
+        if @model.new_record?
+          raise Dynamoid::Errors::RecordNotUnique.new(e, @model)
+        else
+          raise Dynamoid::Errors::StaleObjectError.new(@model, 'persist')
+        end
+      end
+
+      private
+
+      # Should be called after incrementing `lock_version` attribute
+      def conditions_for_write
+        conditions = {}
+
+        # Add an 'exists' check to prevent overwriting existing records with new ones
+        if @model.new_record?
+          conditions[:unless_exists] = [@model.class.hash_key]
+          if @model.range_key
+            conditions[:unless_exists] << @model.range_key
+          end
+        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
+        end
+
+        conditions
+      end
+    end
+  end
+end

data/lib/dynamoid/persistence/update_fields.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Dynamoid
+  module Persistence
+    # @private
+    class UpdateFields
+      def self.call(*args)
+        new(*args).call
+      end
+
+      def initialize(model_class, partition_key:, sort_key:, attributes:, conditions:)
+        @model_class = model_class
+        @partition_key = partition_key
+        @sort_key = sort_key
+        @attributes = attributes.symbolize_keys
+        @conditions = conditions
+      end
+
+      def call
+        if Dynamoid::Config.timestamps
+          @attributes[:updated_at] ||= DateTime.now.in_time_zone(Time.zone)
+        end
+
+        raw_attributes = update_item
+        @model_class.new(undump_attributes(raw_attributes))
+      rescue Dynamoid::Errors::ConditionalCheckFailedException
+      end
+
+      private
+
+      def update_item
+        Dynamoid.adapter.update_item(@model_class.table_name, @partition_key, options_to_update_item) do |t|
+          @attributes.each do |k, v|
+            value_casted = TypeCasting.cast_field(v, @model_class.attributes[k])
+            value_dumped = Dumping.dump_field(value_casted, @model_class.attributes[k])
+            t.set(k => value_dumped)
+          end
+        end
+      end
+
+      def undump_attributes(attributes)
+        Undumping.undump_attributes(attributes, @model_class.attributes)
+      end
+
+      def options_to_update_item
+        options = {}
+
+        if @model_class.range_key
+          value_casted = TypeCasting.cast_field(@sort_key, @model_class.attributes[@model_class.range_key])
+          value_dumped = Dumping.dump_field(value_casted, @model_class.attributes[@model_class.range_key])
+          options[:range_key] = value_dumped
+        end
+
+        conditions = @conditions.deep_dup
+        conditions[:if_exists] ||= {}
+        conditions[:if_exists][@model_class.hash_key] = @partition_key
+        options[:conditions] = conditions
+
+        options
+      end
+    end
+  end
+end

data/lib/dynamoid/persistence/upsert.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Dynamoid
+  module Persistence
+    # @private
+    class Upsert
+      def self.call(*args)
+        new(*args).call
+      end
+
+      def initialize(model_class, partition_key:, sort_key:, attributes:, conditions:)
+        @model_class = model_class
+        @partition_key = partition_key
+        @sort_key = sort_key
+        @attributes = attributes.symbolize_keys
+        @conditions = conditions
+      end
+
+      def call
+        if Dynamoid::Config.timestamps
+          @attributes[:updated_at] ||= DateTime.now.in_time_zone(Time.zone)
+        end
+
+        raw_attributes = update_item
+        @model_class.new(undump_attributes(raw_attributes))
+      rescue Dynamoid::Errors::ConditionalCheckFailedException
+      end
+
+      private
+
+      def update_item
+        Dynamoid.adapter.update_item(@model_class.table_name, @partition_key, options_to_update_item) do |t|
+          @attributes.each do |k, v|
+            value_casted = TypeCasting.cast_field(v, @model_class.attributes[k])
+            value_dumped = Dumping.dump_field(value_casted, @model_class.attributes[k])
+
+            t.set(k => value_dumped)
+          end
+        end
+      end
+
+      def options_to_update_item
+        options = {}
+
+        if @model_class.range_key
+          value_casted = TypeCasting.cast_field(@sort_key, @model_class.attributes[@model_class.range_key])
+          value_dumped = Dumping.dump_field(value_casted, @model_class.attributes[@model_class.range_key])
+          options[:range_key] = value_dumped
+        end
+
+        options[:conditions] = @conditions
+        options
+      end
+
+      def undump_attributes(raw_attributes)
+        Undumping.undump_attributes(raw_attributes, @model_class.attributes)
+      end
+    end
+  end
+end

data/lib/dynamoid/primary_key_type_mapping.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Dynamoid
+  # @private
   class PrimaryKeyTypeMapping
     def self.dynamodb_type(type, options)
       if type.is_a?(Class)

data/lib/dynamoid/railtie.rb

@@ -3,6 +3,7 @@
 if defined? Rails
 
   module Dynamoid
+    # @private
     class Railtie < Rails::Railtie
       rake_tasks do
         Dir[File.join(File.dirname(__FILE__), 'tasks/*.rake')].each { |f| load f }

data/lib/dynamoid/tasks.rb

@@ -1 +1,3 @@
-load "dynamoid/tasks/database.rake"
+# frozen_string_literal: true
+
+load 'dynamoid/tasks/database.rake'

data/lib/dynamoid/tasks/database.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Dynamoid
+  # @private
   module Tasks
     module Database
       module_function

data/lib/dynamoid/type_casting.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Dynamoid
+  # @private
   module TypeCasting
     def self.cast_attributes(attributes, attributes_options)
       {}.tap do |h|
@@ -35,6 +36,7 @@ module Dynamoid
                           when :raw        then RawTypeCaster
                           when :serialized then SerializedTypeCaster
                           when :boolean    then BooleanTypeCaster
+                          when :binary     then BinaryTypeCaster
                           when Class       then CustomTypeCaster
                           end
 
@@ -215,8 +217,6 @@ module Dynamoid
           value.to_hash
         elsif value.respond_to? :to_h
           value.to_h
-        else
-          nil
         end
       end
     end
@@ -285,6 +285,16 @@ module Dynamoid
       end
     end
 
+    class BinaryTypeCaster < Base
+      def process(value)
+        if value.is_a? String
+          value.dup
+        else
+          value.to_s
+        end
+      end
+    end
+
     class CustomTypeCaster < Base
     end
   end

data/lib/dynamoid/undumping.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Dynamoid
+  # @private
   module Undumping
     def self.undump_attributes(attributes, attributes_options)
       {}.tap do |h|
@@ -38,6 +39,7 @@ module Dynamoid
                        when :raw        then RawUndumper
                        when :serialized then SerializedUndumper
                        when :boolean    then BooleanUndumper
+                       when :binary     then BinaryUndumper
                        when Class       then CustomTypeUndumper
                        end
 
@@ -262,6 +264,12 @@ module Dynamoid
       end
     end
 
+    class BinaryUndumper < Base
+      def process(value)
+        Base64.strict_decode64(value)
+      end
+    end
+
     class CustomTypeUndumper < Base
       def process(value)
         field_class = @options[:type]

data/lib/dynamoid/validations.rb

@@ -10,6 +10,7 @@ module Dynamoid
 
     # Override save to provide validation support.
     #
+    # @private
     # @since 0.2.0
     def save(options = {})
       options.reverse_merge!(validate: true)
@@ -28,6 +29,7 @@ module Dynamoid
 
     # Raise an error unless this object is valid.
     #
+    # @private
     # @since 0.2.0
     def save!
       raise Dynamoid::Errors::DocumentNotValid, self unless valid?

data/lib/dynamoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Josh Symonds
@@ -19,9 +19,9 @@ authors:
 - Peter Boling
 - Andrew Konchin
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -65,34 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: null-logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,58 +97,58 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -181,65 +167,48 @@ dependencies:
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: Dynamoid is an ORM for Amazon's DynamoDB that supports offline development,
   associations, querying, and everything else you'd expect from an ActiveRecord-style
   replacement.
 email:
 - peter.boling@gmail.com
 - brian@stellaservice.com
+- andry.konchin@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- Appraisals
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- Vagrantfile
-- docker-compose.yml
-- dynamoid.gemspec
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_2.gemfile
 - lib/dynamoid.rb
 - lib/dynamoid/adapter.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3.rb
+- 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/item_updater.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3/middleware/backoff.rb
@@ -278,8 +247,14 @@ files:
 - lib/dynamoid/finders.rb
 - lib/dynamoid/identity_map.rb
 - lib/dynamoid/indexes.rb
+- lib/dynamoid/loadable.rb
+- lib/dynamoid/log/formatter.rb
 - lib/dynamoid/middleware/identity_map.rb
 - lib/dynamoid/persistence.rb
+- lib/dynamoid/persistence/import.rb
+- lib/dynamoid/persistence/save.rb
+- lib/dynamoid/persistence/update_fields.rb
+- lib/dynamoid/persistence/upsert.rb
 - lib/dynamoid/primary_key_type_mapping.rb
 - lib/dynamoid/railtie.rb
 - lib/dynamoid/tasks.rb
@@ -289,10 +264,14 @@ files:
 - lib/dynamoid/undumping.rb
 - lib/dynamoid/validations.rb
 - lib/dynamoid/version.rb
-homepage: http://github.com/Dynamoid/Dynamoid
+homepage: http://github.com/Dynamoid/dynamoid
 licenses:
 - MIT
-metadata: {}
+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: 
 rdoc_options: []
 require_paths:
@@ -308,8 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB