dynamoid 3.4.1 → 3.5.0

data/lib/dynamoid/dirty.rb

@@ -153,67 +153,67 @@ module Dynamoid
 
     private
 
-      def changes_include?(attr_name)
-        attributes_changed_by_setter.include?(attr_name)
-      end
-      alias attribute_changed_by_setter? changes_include?
-
-      # Removes current changes and makes them accessible through +previous_changes+.
-      def changes_applied # :doc:
-        @previously_changed = changes
-        @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
-      end
+    def changes_include?(attr_name)
+      attributes_changed_by_setter.include?(attr_name)
+    end
+    alias attribute_changed_by_setter? changes_include?
 
-      # Clear all dirty data: current changes and previous changes.
-      def clear_changes_information # :doc:
-        @previously_changed = ActiveSupport::HashWithIndifferentAccess.new
-        @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
-      end
+    # Removes current changes and makes them accessible through +previous_changes+.
+    def changes_applied # :doc:
+      @previously_changed = changes
+      @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+    end
 
-      # Handle <tt>*_change</tt> for +method_missing+.
-      def attribute_change(attr)
-        [changed_attributes[attr], __send__(attr)] if attribute_changed?(attr)
-      end
+    # Clear all dirty data: current changes and previous changes.
+    def clear_changes_information # :doc:
+      @previously_changed = ActiveSupport::HashWithIndifferentAccess.new
+      @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+    end
 
-      # Handle <tt>*_will_change!</tt> for +method_missing+.
-      def attribute_will_change!(attr)
-        return if attribute_changed?(attr)
+    # Handle <tt>*_change</tt> for +method_missing+.
+    def attribute_change(attr)
+      [changed_attributes[attr], __send__(attr)] if attribute_changed?(attr)
+    end
 
-        begin
-          value = __send__(attr)
-          value = value.duplicable? ? value.clone : value
-        rescue TypeError, NoMethodError
-        end
+    # Handle <tt>*_will_change!</tt> for +method_missing+.
+    def attribute_will_change!(attr)
+      return if attribute_changed?(attr)
 
-        set_attribute_was(attr, value)
+      begin
+        value = __send__(attr)
+        value = value.duplicable? ? value.clone : value
+      rescue TypeError, NoMethodError
       end
 
-      # Handle <tt>restore_*!</tt> for +method_missing+.
-      def restore_attribute!(attr)
-        if attribute_changed?(attr)
-          __send__("#{attr}=", changed_attributes[attr])
-          clear_attribute_changes([attr])
-        end
-      end
+      set_attribute_was(attr, value)
+    end
 
-      # Returns +true+ if attr_name were changed before the model was saved,
-      # +false+ otherwise.
-      def previous_changes_include?(attr_name)
-        previous_changes.include?(attr_name)
+    # Handle <tt>restore_*!</tt> for +method_missing+.
+    def restore_attribute!(attr)
+      if attribute_changed?(attr)
+        __send__("#{attr}=", changed_attributes[attr])
+        clear_attribute_changes([attr])
       end
+    end
+
+    # Returns +true+ if attr_name were changed before the model was saved,
+    # +false+ otherwise.
+    def previous_changes_include?(attr_name)
+      previous_changes.include?(attr_name)
+    end
 
-      # This is necessary because `changed_attributes` might be overridden in
-      # other implemntations (e.g. in `ActiveRecord`)
-      alias_method :attributes_changed_by_setter, :changed_attributes # :nodoc:
+    # This is necessary because `changed_attributes` might be overridden in
+    # other implemntations (e.g. in `ActiveRecord`)
+    alias attributes_changed_by_setter changed_attributes # :nodoc:
 
-      # Force an attribute to have a particular "before" value
-      def set_attribute_was(attr, old_value)
-        attributes_changed_by_setter[attr] = old_value
-      end
+    # Force an attribute to have a particular "before" value
+    def set_attribute_was(attr, old_value)
+      attributes_changed_by_setter[attr] = old_value
+    end
 
-      # Remove changes information for the provided attributes.
-      def clear_attribute_changes(attributes) # :doc:
-        attributes_changed_by_setter.except!(*attributes)
-      end
+    # Remove changes information for the provided attributes.
+    def clear_attribute_changes(attributes) # :doc:
+      attributes_changed_by_setter.except!(*attributes)
+    end
   end
 end

data/lib/dynamoid/document.rb

@@ -51,7 +51,6 @@ module Dynamoid #:nodoc:
         options[:write_capacity] || Dynamoid::Config.write_capacity
       end
 
-
       # Returns the billing (capacity) mode for this table.
       # Could be either :provisioned or :on_demand
       def capacity_mode
@@ -225,3 +224,5 @@ module Dynamoid #:nodoc:
     end
   end
 end
+
+ActiveSupport.run_load_hooks(:dynamoid, Dynamoid::Document)

data/lib/dynamoid/fields.rb

@@ -55,6 +55,12 @@ module Dynamoid #:nodoc:
         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
@@ -127,6 +133,12 @@ module Dynamoid #:nodoc:
           end
         end
       end
+
+      def warn_about_method_overriding(method_name, field_name)
+        if self.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.
@@ -192,7 +204,8 @@ module Dynamoid #:nodoc:
     #
     # @since 0.2.0
     def set_updated_at
-      if self.class.timestamps_enabled? && !updated_at_changed?
+      # @_touch_record=false means explicit disabling
+      if self.class.timestamps_enabled? && !updated_at_changed? && @_touch_record != false
         self.updated_at = DateTime.now.in_time_zone(Time.zone)
       end
     end

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)).flat_map{ |i| i }.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).flat_map{ |i| i }.map do |item|
+        Dynamoid.adapter.query(table_name, dynamo_options).flat_map { |i| i }.map do |item|
           from_database(item)
         end
       end
@@ -267,9 +267,9 @@ module Dynamoid
           chain = chain.where({}.tap { |h| attributes.each_with_index { |attr, index| h[attr.to_sym] = args[index] } })
 
           if finder =~ /all/
-            return chain.all
+            chain.all
           else
-            return chain.first
+            chain.first
           end
         else
           super

data/lib/dynamoid/indexes.rb

@@ -165,8 +165,8 @@ module Dynamoid
       DEFAULT_PROJECTION_TYPE = :keys_only
 
       attr_accessor :name, :dynamoid_class, :type, :hash_key, :range_key,
-        :hash_key_schema, :range_key_schema, :projected_attributes,
-        :read_capacity, :write_capacity
+                    :hash_key_schema, :range_key_schema, :projected_attributes,
+                    :read_capacity, :write_capacity
 
       validate do
         validate_index_type

data/lib/dynamoid/persistence.rb

@@ -11,8 +11,8 @@ require 'dynamoid/persistence/save'
 
 # 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 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.
   module Persistence
     extend ActiveSupport::Concern
 
@@ -146,6 +146,25 @@ module Dynamoid
         model
       end
 
+      # Update document with provided attributes.
+      #
+      # Instantiates document and saves changes.
+      # Runs validations and callbacks. Raises Dynamoid::Errors::DocumentNotValid exception if validation fails.
+      #
+      # @param [Scalar value] partition key
+      # @param [Scalar value] sort key, optional
+      # @param [Hash] attributes
+      #
+      # @return [Dynamoid::Doument] updated document
+      #
+      # @example Update document
+      #   Post.update!(101, title: 'New title')
+      def update!(hash_key, range_key_value = nil, attrs)
+        model = find(hash_key, range_key: range_key_value, consistent_read: true)
+        model.update_attributes!(attrs)
+        model
+      end
+
       # Update document.
       #
       # Uses efficient low-level `UpdateItem` API call.
@@ -264,14 +283,16 @@ module Dynamoid
     #
     # @since 0.2.0
     def persisted?
-      !new_record?
+      !(new_record? || @destroyed)
     end
 
     # Run the callbacks and then persist this object in the datastore.
     #
     # @since 0.2.0
-    def save(_options = {})
-      self.class.create_table
+    def save(options = {})
+      self.class.create_table(sync: true)
+
+      @_touch_record = options[:touch]
 
       if new_record?
         run_callbacks(:create) do
@@ -342,7 +363,6 @@ module Dynamoid
           raise Dynamoid::Errors::StaleObjectError.new(self, 'update')
         end
       end
-
     end
 
     def update(conditions = {}, &block)
@@ -389,6 +409,9 @@ module Dynamoid
       ret = run_callbacks(:destroy) do
         delete
       end
+
+      @destroyed = true
+
       ret == false ? false : self
     end
 
@@ -413,6 +436,9 @@ module Dynamoid
           end
         options[:conditions] = conditions
       end
+
+      @destroyed = true
+
       Dynamoid.adapter.delete(self.class.table_name, hash_key, options)
     rescue Dynamoid::Errors::ConditionalCheckFailedException
       raise Dynamoid::Errors::StaleObjectError.new(self, 'delete')

data/lib/dynamoid/persistence/upsert.rb

@@ -57,4 +57,3 @@ module Dynamoid
     end
   end
 end
-

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/type_casting.rb

@@ -215,8 +215,6 @@ module Dynamoid
           value.to_hash
         elsif value.respond_to? :to_h
           value.to_h
-        else
-          nil
         end
       end
     end

data/lib/dynamoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Josh Symonds
@@ -19,9 +19,9 @@ authors:
 - Peter Boling
 - Andrew Konchin
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-04-04 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
@@ -83,16 +83,16 @@ dependencies:
   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 +111,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,63 +181,44 @@ 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
-- gemfiles/rails_6_0.gemfile
 - lib/dynamoid.rb
 - lib/dynamoid/adapter.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v3.rb
@@ -296,10 +277,13 @@ 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/tag/v3.5.0/CHANGELOG.md
+  source_code_uri: https://github.com/Dynamoid/dynamoid/tree/v3.5.0
 post_install_message: 
 rdoc_options: []
 require_paths: