aws-record 1.0.0.pre.9 → 1.0.0.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e20ddd5caa633c5ac1a7acb5e0e6cacfeed52595
-  data.tar.gz: 7317f916341e270b2418d54753a7c0d20540cd7f
+  metadata.gz: 6c99f94d8f0401d3de3c1886e58cc8af973cd5ec
+  data.tar.gz: b824eac6e13b8d37927ec34eb4cb24d39cf15063
 SHA512:
-  metadata.gz: be783b2361e461595023f044f6147d0bf6935c5a15bbfa585d9cf97b92f63faad4c4d585da6827ec4a93dc1e8581c8e1c7774a400463236695554647a6edb5b0
-  data.tar.gz: 6c22f85ad6a3ca6455d0ac8d04de0bc8849605818605130a430ee7789c47f9088d219f4d363790e6dc3224fc4b22c352b0447b4e61e4be141af7a8295a7f972a
+  metadata.gz: c5e381404cc144a57792316da027c990f0d7b5600187e38afa9eb84c559fc1d0e896da300beee534f76eca4dbed21d90198db7b6740c3f261d2db5719a045865
+  data.tar.gz: 3c985a0bb11eed715c941f3138cc3195be3b34bad7b12f21d3e4ae0eccaf5de783015c4fab5bc099ea37c3e1bf64814c94b5644f9b8df8fc33a6661828ff496c

data/lib/aws-record.rb

@@ -22,7 +22,10 @@ module Aws
     autoload :DirtyTracking,    'aws-record/record/dirty_tracking'
     autoload :Errors,           'aws-record/record/errors'
     autoload :ItemCollection,   'aws-record/record/item_collection'
+    autoload :ItemData,         'aws-record/record/item_data'
     autoload :ItemOperations,   'aws-record/record/item_operations'
+    autoload :KeyAttributes,    'aws-record/record/key_attributes'
+    autoload :ModelAttributes,  'aws-record/record/model_attributes'
     autoload :Query,            'aws-record/record/query'
     autoload :SecondaryIndexes, 'aws-record/record/secondary_indexes'
     autoload :TableMigration,   'aws-record/record/table_migration'

data/lib/aws-record/record.rb

@@ -204,6 +204,12 @@ module Aws
         @track_mutations == false ? false : true
       end
 
+      def model_valid?
+        if @keys.hash_key.nil?
+          raise Errors::InvalidModel.new("Table models must include a hash key")
+        end
+      end
+
       private
       def _user_agent(custom)
         if custom

data/lib/aws-record/record/attribute.rb

@@ -39,11 +39,6 @@ module Aws
       #   "M", "L". Optional if this attribute will never be used for a key or
       #   secondary index, but most convenience methods for setting attributes
       #   will provide this.
-      # @option options [Boolean] :mutation_tracking Optional attribute used to
-      #   indicate whether mutations to values should be explicitly tracked when
-      #   determining if a value is "dirty". Important for collection types
-      #   which are often primarily modified by mutation of a single object
-      #   reference. By default, is false.
       # @option options [Boolean] :persist_nil Optional attribute used to
       #   indicate whether nil values should be persisted. If true, explicitly
       #   set nil values will be saved to DynamoDB as a "null" type. If false,
@@ -56,7 +51,6 @@ module Aws
         @database_name = options[:database_attribute_name] || name.to_s
         @dynamodb_type = options[:dynamodb_type]
         @marshaler = options[:marshaler] || DefaultMarshaler
-        @mutation_tracking = options[:mutation_tracking]
         @persist_nil = options[:persist_nil]
         dv = options[:default_value]
         @default_value = type_cast(dv) unless dv.nil?
@@ -85,12 +79,6 @@ module Aws
         @marshaler.serialize(cast_value)
       end
 
-      # @return [Boolean] true if this attribute should do active mutation
-      #  tracking, false otherwise. Default: false
-      def track_mutations?
-        @mutation_tracking ? true : false
-      end
-
       # @return [Boolean] true if this attribute will actively persist nil
       #   values, false otherwise. Default: false
       def persist_nil?

data/lib/aws-record/record/attributes.rb

@@ -17,9 +17,9 @@ module Aws
 
       def self.included(sub_class)
         sub_class.extend(ClassMethods)
-        sub_class.instance_variable_set("@keys", {})
-        sub_class.instance_variable_set("@attributes", {})
-        sub_class.instance_variable_set("@storage_attributes", {})
+        model_attributes = ModelAttributes.new(self)
+        sub_class.instance_variable_set("@attributes", model_attributes)
+        sub_class.instance_variable_set("@keys", KeyAttributes.new(model_attributes))
       end
 
       # @example Usage Example
@@ -40,7 +40,10 @@ module Aws
       #  attribute values you wish to set.
       # @return [Aws::Record] An item instance for your model.
       def initialize(attr_values = {})
-        @data = {}
+        opts = {
+          track_mutations: self.class.mutation_tracking_enabled?
+        }
+        @data = ItemData.new(self.class.attributes, opts)
         attr_values.each do |attr_name, attr_value|
           send("#{attr_name}=", attr_value)
         end
@@ -50,23 +53,9 @@ module Aws
       #
       # @return [Hash] Map of attribute names to raw values.
       def to_h
-        @data.dup
+        @data.hash_copy
       end
 
-      private
-
-      # @private
-      def read_attribute(name, attribute)
-        raw = @data[name]
-        attribute.type_cast(raw)
-      end
-
-      # @private
-      def write_attribute(name, attribute, value)
-        @data[name] = value
-      end
-        
-
       module ClassMethods
 
         # Define an attribute for your model, providing your own attribute type.
@@ -87,11 +76,6 @@ module Aws
         #   "M", "L". Optional if this attribute will never be used for a key or
         #   secondary index, but most convenience methods for setting attributes
         #   will provide this.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate whether mutations to values should be explicitly tracked
-        #   when determining if a value is "dirty". Important for collection
-        #   types which are often primarily modified by mutation of a single
-        #   object reference. By default, is false.
         # @option opts [Boolean] :persist_nil Optional attribute used to
         #   indicate whether nil values should be persisted. If true, explicitly
         #   set nil values will be saved to DynamoDB as a "null" type. If false,
@@ -104,21 +88,9 @@ module Aws
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
         def attr(name, marshaler, opts = {})
-          validate_attr_name(name)
-
-          opts = opts.merge(marshaler: marshaler)
-          attribute = Attribute.new(name, opts)
-
-          storage_name = attribute.database_name
-
-          check_for_naming_collisions(name, storage_name)
-          check_if_reserved(name)
-
-          @attributes[name] = attribute
-          @storage_attributes[storage_name] = name
-
-          define_attr_methods(name, attribute)
-          key_attributes(name, opts)
+          @attributes.register_attribute(name, marshaler, opts)
+          _define_attr_methods(name)
+          _key_attributes(name, opts)
         end
 
         # Define a string-type attribute for your model.
@@ -130,11 +102,6 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is false.
         # @option opts [Boolean] :persist_nil Optional attribute used to
         #   indicate whether nil values should be persisted. If true, explicitly
         #   set nil values will be saved to DynamoDB as a "null" type. If false,
@@ -156,11 +123,6 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is false.
         # @option opts [Boolean] :persist_nil Optional attribute used to
         #   indicate whether nil values should be persisted. If true, explicitly
         #   set nil values will be saved to DynamoDB as a "null" type. If false,
@@ -182,11 +144,6 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is false.
         # @option opts [Boolean] :persist_nil Optional attribute used to
         #   indicate whether nil values should be persisted. If true, explicitly
         #   set nil values will be saved to DynamoDB as a "null" type. If false,
@@ -208,11 +165,6 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is false.
         # @option opts [Boolean] :persist_nil Optional attribute used to
         #   indicate whether nil values should be persisted. If true, explicitly
         #   set nil values will be saved to DynamoDB as a "null" type. If false,
@@ -234,11 +186,6 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is false.
         # @option opts [Boolean] :persist_nil Optional attribute used to
         #   indicate whether nil values should be persisted. If true, explicitly
         #   set nil values will be saved to DynamoDB as a "null" type. If false,
@@ -260,11 +207,6 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is false.
         # @option opts [Boolean] :persist_nil Optional attribute used to
         #   indicate whether nil values should be persisted. If true, explicitly
         #   set nil values will be saved to DynamoDB as a "null" type. If false,
@@ -304,17 +246,11 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is true.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
         #   item is nil or not set at persistence time.
         def list_attr(name, opts = {})
           opts[:dynamodb_type] = "L"
-          opts[:mutation_tracking] = true if opts[:mutation_tracking].nil?
           attr(name, Marshalers::ListMarshaler.new(opts), opts)
         end
 
@@ -345,17 +281,11 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is true.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
         #   item is nil or not set at persistence time.
         def map_attr(name, opts = {})
           opts[:dynamodb_type] = "M"
-          opts[:mutation_tracking] = true if opts[:mutation_tracking].nil?
           attr(name, Marshalers::MapMarshaler.new(opts), opts)
         end
 
@@ -376,17 +306,11 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is true.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
         #   item is nil or not set at persistence time.
         def string_set_attr(name, opts = {})
           opts[:dynamodb_type] = "SS"
-          opts[:mutation_tracking] = true if opts[:mutation_tracking].nil?
           attr(name, Marshalers::StringSetMarshaler.new(opts), opts)
         end
 
@@ -407,118 +331,57 @@ module Aws
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
         #   the range key for the table.
-        # @option opts [Boolean] :mutation_tracking Optional attribute used to
-        #   indicate if mutations to values should be explicitly tracked when
-        #   determining if a value is "dirty". Important for collection types
-        #   which are often primarily modified by mutation of a single object
-        #   reference. By default, is true.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
         #   item is nil or not set at persistence time.
         def numeric_set_attr(name, opts = {})
           opts[:dynamodb_type] = "NS"
-          opts[:mutation_tracking] = true if opts[:mutation_tracking].nil?
           attr(name, Marshalers::NumericSetMarshaler.new(opts), opts)
         end
 
-        # @return [Hash] hash of symbolized attribute names to attribute objects
-        def attributes
-          @attributes
-        end
-
-        # @return [Hash] hash of database names to attribute names
-        def storage_attributes
-          @storage_attributes
-        end
-
-        # @return [Aws::Record::Attribute,nil]
+        # @return [Symbol,nil]
         def hash_key
-          @attributes[@keys[:hash]]
+          @keys.hash_key
         end
 
-        # @return [Aws::Record::Attribute,nil]
+        # @return [Symbol,nil]
         def range_key
-          @attributes[@keys[:range]]
+          @keys.range_key
         end
 
-        # @return [Hash] A mapping of the :hash and :range keys to the attribute
-        #   name symbols associated with them.
-        def keys
-          @keys
+        # @api private
+        def attributes
+          @attributes
         end
 
-        # @param [Symbol] attr_sym The symbolized name of the attribute.
-        # @return [Boolean] true if object mutations are tracked for dirty
-        #   checking of that attribute, false if mutations are not tracked.
-        def track_mutations?(attr_sym)
-          mutation_tracking_enabled? && attributes[attr_sym].track_mutations?
+        # @api private
+        def keys
+          @keys.keys
         end
 
         private
-        def define_attr_methods(name, attribute)
+        def _define_attr_methods(name)
           define_method(name) do
-            read_attribute(name, attribute)
+            @data.get_attribute(name)
           end
 
           define_method("#{name}=") do |value|
-            write_attribute(name, attribute, value)
+            @data.set_attribute(name, value)
           end
         end
 
-        def key_attributes(id, opts)
+        def _key_attributes(id, opts)
           if opts[:hash_key] == true && opts[:range_key] == true
             raise ArgumentError.new(
               "Cannot have the same attribute be a hash and range key."
             )
           elsif opts[:hash_key] == true
-            define_key(id, :hash)
+            @keys.hash_key = id
           elsif opts[:range_key] == true
-            define_key(id, :range)
-          end
-        end
-
-        def define_key(id, type)
-          @keys[type] = id
-        end
-
-        def validate_attr_name(name)
-          unless name.is_a?(Symbol)
-            raise ArgumentError.new("Must use symbolized :name attribute.")
-          end
-          if @attributes[name]
-            raise Errors::NameCollision.new(
-              "Cannot overwrite existing attribute #{name}"
-            )
+            @keys.range_key = id
           end
         end
 
-        def check_if_reserved(name)
-          if instance_methods.include?(name)
-            raise Errors::ReservedName.new(
-              "Cannot name an attribute #{name}, that would collide with an"\
-                " existing instance method."
-            )
-          end
-        end
-
-        def check_for_naming_collisions(name, storage_name)
-          if @attributes[storage_name.to_sym]
-            raise Errors::NameCollision.new(
-              "Custom storage name #{storage_name} already exists as an"\
-                " attribute name in #{@attributes}"
-            )
-          elsif @storage_attributes[name.to_s]
-            raise Errors::NameCollision.new(
-              "Attribute name #{name} already exists as a custom storage"\
-                " name in #{@storage_attributes}"
-            )
-          elsif @storage_attributes[storage_name]
-            raise Errors::NameCollision.new(
-              "Custom storage name #{storage_name} already in use in"\
-                " #{@storage_attributes}"
-            )
-          end
-        end
       end
 
     end

data/lib/aws-record/record/dirty_tracking.rb

@@ -19,15 +19,6 @@ module Aws
         sub_class.extend(DirtyTrackingClassMethods)
       end
 
-      # @private
-      #
-      # @override initialize(*)
-      def initialize(*)
-        @dirty_data = {}
-        @mutation_copies = {}
-        super
-      end
-
       # Returns +true+ if the specified attribute has any dirty changes, +false+ otherwise.
       #
       # @example
@@ -45,7 +36,7 @@ module Aws
       # @param [String, Symbol] name The name of the attribute to to check for dirty changes.
       # @return [Boolean] +true+ if the specified attribute has any dirty changes, +false+ otherwise.
       def attribute_dirty?(name)
-        @dirty_data.has_key?(name) || _mutated?(name)
+        @data.attribute_dirty?(name)
       end 
 
       # Returns the original value of the specified attribute.
@@ -64,11 +55,7 @@ module Aws
       # @param [String, Symbol] name The name of the attribute to retrieve the original value of.
       # @return [Object] The original value of the specified attribute.
       def attribute_was(name)
-        if @mutation_copies.has_key?(name)
-          @mutation_copies[name]
-        else
-          attribute_dirty?(name) ? @dirty_data[name] : @data[name]
-        end
+        @data.attribute_was(name)
       end
 
       # Mark that an attribute is changing. This is useful in situations where it is necessary to track that the value of an 
@@ -106,44 +93,7 @@ module Aws
       # @param [String, Symbol] name The name of the attribute to mark as 
       #  changing.
       def attribute_dirty!(name)
-        return if attribute_dirty?(name)
-
-        current_value = @data[name]
-
-        @dirty_data[name] = 
-          begin
-            _deep_copy(current_value)
-          rescue TypeError
-            current_value
-          end
-      end
-
-      # Marks the changes as applied by clearing the current changes and making 
-      # them accessible through +previous_changes+.
-      #
-      # # @example
-      #  class Model
-      #    include Aws::Record
-      #    integer_attr :id, hash_key: true
-      #    string_attr  :name
-      #  end
-      #
-      #  model.name   # => 'Alex'
-      #  model.name = 'Nick'
-      #  model.dirty? # => true
-      #
-      #  model.clean!
-      #  model.dirty? # false
-      #
-      def clean!
-        @dirty_data.clear
-        self.class.attributes.each do |name, attribute|
-          if self.class.track_mutations?(name)
-            if @data[name]
-              @mutation_copies[name] = _deep_copy(@data[name])
-            end
-          end
-        end
+        @data.attribute_dirty!(name)
       end
 
       # Returns an array with the name of the attributes with dirty changes.
@@ -162,13 +112,7 @@ module Aws
       #
       # @return [Array] The names of attributes with dirty changes.
       def dirty
-        ret = @dirty_data.keys.dup
-        @mutation_copies.each do |key, value|
-          if @data[key] != value
-            ret << key unless ret.include?(key)
-          end
-        end
-        ret
+        @data.dirty
       end
 
       # Returns +true+ if any attributes have dirty changes, +false+ otherwise.
@@ -188,10 +132,7 @@ module Aws
       # @return [Boolean] +true+ if any attributes have dirty changes, +false+ 
       #  otherwise.
       def dirty?
-        return true if @dirty_data.size > 0
-        @mutation_copies.any? do |name, value|
-          @mutation_copies[name] != @data[name]
-        end
+        @data.dirty?
       end
 
       # Fetches attributes for this instance of an item from Amazon DynamoDB 
@@ -236,14 +177,7 @@ module Aws
       #
       # @param [String, Symbol] name The name of the attribute to restore
       def rollback_attribute!(name)
-        return unless attribute_dirty?(name)
-
-        if @mutation_copies.has_key?(name)
-          @data[name] = @mutation_copies[name]
-          @dirty_data.delete(name) if @dirty_data.has_key?(name)
-        else
-          @data[name] = @dirty_data.delete(name)
-        end
+        @data.rollback_attribute!(name)
       end
 
       # Restores all attributes to their original values.
@@ -265,6 +199,11 @@ module Aws
         Array(names).each { |name| rollback_attribute!(name) }
       end
 
+      # @api private
+      def clean!
+        @data.clean!
+      end
+
       # @private
       #
       # @override save(*)
@@ -272,36 +211,6 @@ module Aws
         super.tap { clean! }
       end
 
-      private 
-      
-      # @private
-      #
-      # @override write_attribute(*)
-      def write_attribute(name, attribute, value)
-        _dirty_write_attribute(name, attribute, value)
-        super
-      end
-
-      def _dirty_write_attribute(name, attribute, value)
-        if value == attribute_was(name)
-          @dirty_data.delete(name)
-        else
-          attribute_dirty!(name)
-        end
-      end
-
-      def _mutated?(name)
-        if @mutation_copies.has_key?(name)
-          @data[name] != @mutation_copies[name]
-        else
-          false
-        end
-      end
-
-      def _deep_copy(obj)
-        Marshal.load(Marshal.dump(obj))
-      end
-
       module DirtyTrackingClassMethods
 
         private
@@ -316,7 +225,7 @@ module Aws
         # @private
         #
         # @override define_attr_methods(*)
-        def define_attr_methods(name, attribute)
+        def _define_attr_methods(name)
           super.tap do 
             define_method("#{name}_dirty?") do 
               attribute_dirty?(name)

data/lib/aws-record/record/item_collection.rb

@@ -43,9 +43,10 @@ module Aws
         items.each do |item|
           record = model.new
           data = record.instance_variable_get("@data")
-          model.attributes.each do |name, attr|
-            data[name] = attr.extract(item)
+          model.attributes.attributes.each do |name, attr|
+            data.set_attribute(name, attr.extract(item))
           end
+          data.clean!
           ret << record
         end
         ret

data/lib/aws-record/record/item_data.rb

@@ -0,0 +1,123 @@
+# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not
+# use this file except in compliance with the License. A copy of the License is
+# located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is distributed on
+# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
+module Aws
+  module Record
+
+    # @api private
+    class ItemData
+      def initialize(model_attributes, opts)
+        @data = {}
+        @clean_copies = {}
+        @dirty_flags = {}
+        @model_attributes = model_attributes
+        @track_mutations = opts[:track_mutations]
+        @track_mutations = true if opts[:track_mutations].nil?
+      end
+
+      def get_attribute(name)
+        @model_attributes.attribute_for(name).type_cast(@data[name])
+      end
+
+      def set_attribute(name, value)
+        @data[name] = value
+      end
+
+      def raw_value(name)
+        @data[name]
+      end
+
+      def clean!
+        @dirty_flags = {}
+        @model_attributes.attributes.each_key do |name|
+          populate_default_values
+          value = get_attribute(name)
+          if @track_mutations
+            @clean_copies[name] = _deep_copy(value)
+          else
+            @clean_copies[name] = value
+          end
+        end
+      end
+
+      def attribute_dirty?(name)
+        if @dirty_flags[name]
+          true
+        else
+          value = get_attribute(name)
+          value != @clean_copies[name]
+        end
+      end
+
+      def attribute_was(name)
+        @clean_copies[name]
+      end
+
+      def attribute_dirty!(name)
+        @dirty_flags[name] = true
+      end
+
+      def dirty
+        @model_attributes.attributes.keys.inject([]) do |acc, name|
+          acc << name if attribute_dirty?(name)
+          acc
+        end
+      end
+
+      def dirty?
+        dirty.empty? ? false : true
+      end
+
+      def rollback_attribute!(name)
+        if attribute_dirty?(name)
+          @dirty_flags.delete(name)
+          set_attribute(name, attribute_was(name))
+        end
+        get_attribute(name)
+      end
+
+      def hash_copy
+        @data.dup
+      end
+
+      def build_save_hash
+        @data.inject({}) do |acc, name_value_pair|
+          attr_name, raw_value = name_value_pair
+          attribute = @model_attributes.attribute_for(attr_name)
+          if !raw_value.nil? || attribute.persist_nil?
+            db_name = attribute.database_name
+            acc[db_name] = attribute.serialize(raw_value)
+          end
+          acc
+        end
+      end
+
+      def populate_default_values
+        @model_attributes.attributes.each do |name, attribute|
+          unless attribute.default_value.nil?
+            if @data[name].nil? && @data[name].nil?
+              @data[name] = attribute.default_value
+            end
+          end
+        end
+      end
+
+      private
+      def _deep_copy(obj)
+        Marshal.load(Marshal.dump(obj))
+      end
+      
+    end
+
+  end
+end

data/lib/aws-record/record/item_operations.rb

@@ -154,33 +154,17 @@ module Aws
 
       def _build_item_for_save
         validate_key_values
-        attributes = self.class.attributes
-        _populate_default_values(attributes)
-        @data.inject({}) do |acc, name_value_pair|
-          attr_name, raw_value = name_value_pair
-          attribute = attributes[attr_name]
-          if !raw_value.nil? || attribute.persist_nil?
-            db_name = attribute.database_name
-            acc[db_name] = attribute.serialize(raw_value)
-          end
-          acc
-        end
-      end
-
-      def _populate_default_values(attributes)
-        attributes.each do |attr_name, attribute|
-          if !attribute.default_value.nil? && @data[attribute.name].nil?
-            @data[attr_name] = attribute.default_value
-          end
-        end
+        @data.populate_default_values
+        @data.build_save_hash
       end
 
       def key_values
         validate_key_values
         attributes = self.class.attributes
         self.class.keys.inject({}) do |acc, (_, attr_name)|
-          db_name = attributes[attr_name].database_name
-          acc[db_name] = attributes[attr_name].serialize(@data[attr_name])
+          db_name = attributes.storage_name_for(attr_name)
+          acc[db_name] = attributes.attribute_for(attr_name).
+            serialize(@data.raw_value(attr_name))
           acc
         end
       end
@@ -196,7 +180,7 @@ module Aws
 
       def missing_key_values
         self.class.keys.inject([]) do |acc, key|
-          acc << key.last if @data[key.last].nil?
+          acc << key.last if @data.raw_value(key.last).nil?
           acc
         end
       end
@@ -211,13 +195,14 @@ module Aws
       def prevent_overwrite_expression
         conditions = []
         expression_attribute_names = {}
+        keys = self.class.instance_variable_get("@keys")
         # Hash Key
         conditions << "attribute_not_exists(#H)"
-        expression_attribute_names["#H"] = self.class.hash_key.database_name
+        expression_attribute_names["#H"] = keys.hash_key_attribute.database_name
         # Range Key
         if self.class.range_key
           conditions << "attribute_not_exists(#R)"
-          expression_attribute_names["#R"] = self.class.range_key.database_name
+          expression_attribute_names["#R"] = keys.range_key_attribute.database_name
         end
         {
           condition_expression: conditions.join(" and "),
@@ -228,7 +213,7 @@ module Aws
       def _dirty_changes_for_update
         attributes = self.class.attributes
         ret = dirty.inject({}) do |acc, attr_name|
-          acc[attr_name] = @data[attr_name]
+          acc[attr_name] = @data.raw_value(attr_name)
           acc
         end
         ret
@@ -252,14 +237,15 @@ module Aws
         #  not include all table keys.
         def find(opts)
           key = {}
-          @keys.each_value do |attr_sym|
+          @keys.keys.each_value do |attr_sym|
             unless opts[attr_sym]
               raise Errors::KeyMissing.new(
                 "Missing required key #{attr_sym} in #{opts}"
               )
             end
-            attr_name = attributes[attr_sym].database_name
-            key[attr_name] = attributes[attr_sym].serialize(opts[attr_sym])
+            attr_name = attributes.storage_name_for(attr_sym)
+            key[attr_name] = attributes.attribute_for(attr_sym).
+              serialize(opts[attr_sym])
           end
           request_opts = {
             table_name: table_name,
@@ -298,14 +284,14 @@ module Aws
         def update(opts)
           key = {}
           updates = {}
-          @keys.each_value do |attr_sym|
+          @keys.keys.each_value do |attr_sym|
             unless value = opts.delete(attr_sym)
               raise Errors::KeyMissing.new(
                 "Missing required key #{attr_sym} in #{opts}"
               )
             end
-            attr_name = attributes[attr_sym].database_name
-            key[attr_name] = attributes[attr_sym].serialize(value)
+            attr_name = attributes.storage_name_for(attr_sym)
+            key[attr_name] = attributes.attribute_for(attr_sym).serialize(value)
           end
           request_opts = {
             table_name: table_name,
@@ -335,8 +321,8 @@ module Aws
             name_sub_token = name_sub_token.succ
             value_sub_token = value_sub_token.succ
 
-            attribute = attributes[attr_sym]
-            attr_name = attribute.database_name
+            attribute = attributes.attribute_for(attr_sym)
+            attr_name = attributes.storage_name_for(attr_sym)
             exp_attr_names[name_sub] = attr_name
             if _update_type_remove?(attribute, value)
               remove_expressions << "#{name_sub}"
@@ -362,8 +348,8 @@ module Aws
         def build_item_from_resp(resp)
           record = new
           data = record.instance_variable_get("@data")
-          attributes.each do |name, attr|
-            data[name] = attr.extract(resp.item)
+          attributes.attributes.each do |name, attr|
+            data.set_attribute(name, attr.extract(resp.item))
           end
           record
         end

data/lib/aws-record/record/key_attributes.rb

@@ -0,0 +1,54 @@
+# Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not
+# use this file except in compliance with the License. A copy of the License is
+# located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is distributed on
+# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
+module Aws
+  module Record
+
+    # @api private
+    class KeyAttributes
+      attr_reader :keys
+
+      def initialize(model_attributes)
+        @keys = {}
+        @model_attributes = model_attributes
+      end
+
+      def hash_key
+        @hash_key
+      end
+
+      def hash_key_attribute
+        @model_attributes.attribute_for(hash_key)
+      end
+
+      def range_key
+        @range_key
+      end
+
+      def range_key_attribute
+        @model_attributes.attribute_for(range_key)
+      end
+
+      def hash_key=(value)
+        @keys[:hash] = value
+        @hash_key = value
+      end
+
+      def range_key=(value)
+        @keys[:range] = value
+        @range_key = value
+      end
+    end
+
+  end
+end

data/lib/aws-record/record/model_attributes.rb

@@ -0,0 +1,99 @@
+# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not
+# use this file except in compliance with the License. A copy of the License is
+# located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is distributed on
+# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
+module Aws
+  module Record
+
+    # @api private
+    class ModelAttributes
+      attr_reader :attributes, :storage_attributes
+
+      def initialize(model_class)
+        @model_class = model_class
+        @attributes = {}
+        @storage_attributes = {}
+      end
+
+      def register_attribute(name, marshaler, opts)
+        attribute = Attribute.new(name, opts.merge(marshaler: marshaler))
+        _new_attr_validation(name, attribute)
+        @attributes[name] = attribute
+        @storage_attributes[attribute.database_name] = name
+        attribute
+      end
+
+      def attribute_for(name)
+        @attributes[name]
+      end
+
+      def storage_name_for(name)
+        attribute_for(name).database_name
+      end
+
+      def present?(name)
+        attribute_for(name) ? true : false
+      end
+
+      def db_to_attribute_name(storage_name)
+        @storage_attributes[storage_name]
+      end
+
+      private
+      def _new_attr_validation(name, attribute)
+        _validate_attr_name(name)
+        _check_for_naming_collisions(name, attribute.database_name)
+        _check_if_reserved(name)
+      end
+
+      def _validate_attr_name(name)
+        unless name.is_a?(Symbol)
+          raise ArgumentError.new("Must use symbolized :name attribute.")
+        end
+        if @attributes[name]
+          raise Errors::NameCollision.new(
+            "Cannot overwrite existing attribute #{name}"
+          )
+        end
+      end
+
+      def _check_if_reserved(name)
+        if @model_class.instance_methods.include?(name)
+          raise Errors::ReservedName.new(
+            "Cannot name an attribute #{name}, that would collide with an"\
+              " existing instance method."
+          )
+        end
+      end
+
+      def _check_for_naming_collisions(name, storage_name)
+        if @attributes[storage_name.to_sym]
+          raise Errors::NameCollision.new(
+            "Custom storage name #{storage_name} already exists as an"\
+              " attribute name in #{@attributes}"
+          )
+        elsif @storage_attributes[name.to_s]
+          raise Errors::NameCollision.new(
+            "Attribute name #{name} already exists as a custom storage"\
+              " name in #{@storage_attributes}"
+          )
+        elsif @storage_attributes[storage_name]
+          raise Errors::NameCollision.new(
+            "Custom storage name #{storage_name} already in use in"\
+              " #{@storage_attributes}"
+          )
+        end
+      end
+    end
+
+  end
+end

data/lib/aws-record/record/secondary_indexes.rb

@@ -37,7 +37,7 @@ module Aws
         #   are copied from the table to the index. See shape details in the
         #   {http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Types/Projection.html AWS SDK for Ruby V2 docs}.
         def local_secondary_index(name, opts)
-          opts[:hash_key] = hash_key.name
+          opts[:hash_key] = hash_key
           _validate_required_lsi_keys(opts)
           local_secondary_indexes[name] = opts
         end
@@ -102,12 +102,12 @@ module Aws
         def _si_key_schema(opts)
           key_schema = [{
             key_type: "HASH",
-            attribute_name: @attributes[opts[:hash_key]].database_name
+            attribute_name: @attributes.storage_name_for(opts[:hash_key])
           }]
           if opts[:range_key]
             key_schema << {
               key_type: "RANGE",
-              attribute_name: @attributes[opts[:range_key]].database_name
+              attribute_name: @attributes.storage_name_for(opts[:range_key])
             }
           end
           key_schema
@@ -139,13 +139,13 @@ module Aws
 
         def _validate_attributes_exist(*attr_names)
           missing = attr_names.select do |attr_name|
-            @attributes[attr_name].nil?
+            !@attributes.present?(attr_name)
           end
           unless missing.empty?
             raise ArgumentError.new(
               "#{missing.join(", ")} not present in model attributes."\
                 " Please ensure that attributes are defined in the model"\
-                " class BEFORE defining a index on those attributes."
+                " class BEFORE defining an index on those attributes."
             )
           end
         end

data/lib/aws-record/record/table_migration.rb

@@ -133,7 +133,7 @@ module Aws
       private
       def _assert_model_valid(model)
         _assert_required_include(model)
-        _assert_keys(model)
+        model.model_valid?
       end
 
       def _assert_required_include(model)
@@ -142,12 +142,6 @@ module Aws
         end
       end
 
-      def _assert_keys(model)
-        if model.hash_key.nil?
-          raise Errors::InvalidModel.new("Table models must include a hash key")
-        end
-      end
-
       def _attribute_definitions
         _keys.map do |type, attr|
           {
@@ -158,6 +152,7 @@ module Aws
       end
 
       def _append_to_attribute_definitions(secondary_indexes, create_opts)
+        attributes = @model.attributes
         attr_def = create_opts[:attribute_definitions]
         secondary_indexes.each do |si|
           si[:key_schema].each do |key_schema|
@@ -165,9 +160,9 @@ module Aws
               a[:attribute_name] == key_schema[:attribute_name]
             }
             unless exists
-              attr = @model.attributes[
-                @model.storage_attributes[key_schema[:attribute_name]]
-              ]
+              attr = attributes.attribute_for(
+                attributes.db_to_attribute_name(key_schema[:attribute_name])
+              )
               attr_def << {
                 attribute_name: attr.database_name,
                 attribute_type: attr.dynamodb_type
@@ -208,7 +203,7 @@ module Aws
 
       def _keys
         @model.keys.inject({}) do |acc, (type, name)|
-          acc[type] = @model.attributes[name]
+          acc[type] = @model.attributes.attribute_for(name)
           acc
         end
       end

data/lib/aws-record/record/version.rb

@@ -13,6 +13,6 @@
 
 module Aws
   module Record
-    VERSION = '1.0.0.pre.9'
+    VERSION = '1.0.0.pre.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.9
+  version: 1.0.0.pre.10
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources
@@ -38,7 +38,9 @@ files:
 - lib/aws-record/record/dirty_tracking.rb
 - lib/aws-record/record/errors.rb
 - lib/aws-record/record/item_collection.rb
+- lib/aws-record/record/item_data.rb
 - lib/aws-record/record/item_operations.rb
+- lib/aws-record/record/key_attributes.rb
 - lib/aws-record/record/marshalers/boolean_marshaler.rb
 - lib/aws-record/record/marshalers/date_marshaler.rb
 - lib/aws-record/record/marshalers/date_time_marshaler.rb
@@ -49,6 +51,7 @@ files:
 - lib/aws-record/record/marshalers/numeric_set_marshaler.rb
 - lib/aws-record/record/marshalers/string_marshaler.rb
 - lib/aws-record/record/marshalers/string_set_marshaler.rb
+- lib/aws-record/record/model_attributes.rb
 - lib/aws-record/record/query.rb
 - lib/aws-record/record/secondary_indexes.rb
 - lib/aws-record/record/table_migration.rb