aws-record 1.0.0.pre.6 → 1.0.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09d82333932905be1917f2ae907e994673a52cc1
-  data.tar.gz: 2795843b24c5f42a1501dd79b6114155d8cf4d03
+  metadata.gz: 808122fbcc8d09789f250b6ab5f7bfa4af8a511f
+  data.tar.gz: 006ed1f3c955fe8370cd4d2ae81adb17195cc77e
 SHA512:
-  metadata.gz: 6a9f1b9e229940214d6f1be2fcfcdce24fda842a6b9892d091520be2ef382c974fc62d9d2b656422854b08320820d931e35fda4cd6011b872381a1efea69f47f
-  data.tar.gz: 9f4b99c7090f18f636fa0d0ae7c6dfbe11ed1074cce76485e1ea7f10095b2004c7a931d034f5c976202ed8cedc997f0080275135346e81a0644b375650761c6b
+  metadata.gz: 6586ed1a3add7fbe31dcd37b59f3798a0671b1ec25c0886f68c8c7545f5798fb4d6639c7c0ea14206ccba1d29b75d505ab34c211540026963a4c675542a37b4c
+  data.tar.gz: ab2ecaf0359165f4c179af7df4d96bd142ca29f630a65bc9c9985fd7be8987f44fec050b41342ee6eec8ff1d0f5592b93d36f460b170f6943eab6c68d8b410fd

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

@@ -24,8 +24,6 @@ module Aws
       #   So long as you provide a marshaler which implements +#type_cast+ and
       #   +#serialize+ that consume raw values as expected, you can bring your
       #   own marshaler type.
-      # @option options [Array] :validators An array of validator classes that
-      #   will be run when an attribute is checked for validity.
       # @option options [String] :database_attribute_name Optional attribute
       #   used to specify a different name for database persistence than the
       #   `name` parameter. Must be unique (you can't have overlap between
@@ -40,7 +38,6 @@ module Aws
         @database_name = options[:database_attribute_name] || name.to_s
         @dynamodb_type = options[:dynamodb_type]
         @marshaler = options[:marshaler] || DefaultMarshaler
-        @validators = options[:validators] || []
       end
 
       # Attempts to type cast a raw value into the attribute's type. This call
@@ -62,19 +59,6 @@ module Aws
         @marshaler.serialize(raw_value)
       end
 
-      # Checks if the raw value is valid for this attribute. This is done by
-      # type casting the raw value, then running that value through each
-      # validator present for this attribute.
-      #
-      # @return [Boolean] true if the raw value is valid for this attribute,
-      #  false if it is not.
-      def valid?(raw_value)
-        value = type_cast(raw_value)
-        @validators.all? do |validator|
-          validator.validate(value)
-        end
-      end
-
       # @api private
       def extract(dynamodb_item)
         dynamodb_item[@database_name]

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

@@ -58,8 +58,6 @@ module Aws
         #   +#serialize+ that consume raw values as expected, you can bring your
         #   own marshaler type. Convenience methods will provide this for you.
         # @param [Hash] opts
-        # @option opts [Array] :validators An array of validator classes that
-        #   will be run when an attribute is checked for validity.
         # @option opts [String] :database_attribute_name Optional attribute
         #   used to specify a different name for database persistence than the
         #   `name` parameter. Must be unique (you can't have overlap between

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

@@ -20,6 +20,7 @@ module Aws
       class KeyMissing < RecordError; end
       class NotFound < RecordError; end
       class ItemAlreadyExists < RecordError; end
+      class ValidationError < RecordError; end
 
       class NameCollision < RuntimeError; end
       class ReservedName < RuntimeError; end

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

@@ -18,7 +18,6 @@ module Aws
       # @api private
       def self.included(sub_class)
         sub_class.extend(ItemOperationsClassMethods)
-        sub_class.instance_variable_set("@errors", [])
       end
 
       # Saves this instance of an item to Amazon DynamoDB. If this item is "new"
@@ -42,35 +41,15 @@ module Aws
       #  does not have a value within this item instance.
       # @raise [Aws::Record::Errors::ItemAlreadyExists] if a conditional put
       #  fails because the item exists on the remote end.
+      # @raise [Aws::Record::Errors::ValidationError] if the item responds to
+      #  +:valid?+ and that call returned false. In such a case, checking root
+      #  cause is dependent on the validation library you are using.
       def save!(opts = {})
-        force = opts[:force]
-        expect_new = expect_new_item?
-        if force
-          dynamodb_client.put_item(
-            table_name: self.class.table_name,
-            item: build_item_for_save
-          )
-        elsif expect_new
-          put_opts = {
-            table_name: self.class.table_name,
-            item: build_item_for_save
-          }.merge(prevent_overwrite_expression)
-          begin
-            dynamodb_client.put_item(put_opts)
-          rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException => e
-            raise Errors::ItemAlreadyExists.new(
-              "Conditional #put_item call failed, an item with the same key"\
-                " already exists in the table. Either load and update this"\
-                " item, or include the :force option to clobber the remote"\
-                " item."
-            )
-          end
+        ret = save(opts)
+        if ret
+          ret
         else
-          dynamodb_client.update_item(
-            table_name: self.class.table_name,
-            key: key_values,
-            attribute_updates: dirty_changes_for_update
-          )
+          raise Errors::ValidationError.new("Validation hook returned false!")
         end
       end
 
@@ -87,27 +66,19 @@ module Aws
       # You can use the +:force+ option to perform a simple put/overwrite
       #  without conditional validation or update logic.
       #
-      # In the case where persistence fails, will populate the +errors+ array
-      #  with any generated error messages, and will cause +#valid?+ to return
-      #  false until there is a successful save.
-      #
       # @param [Hash] opts
       # @option opts [Boolean] :force if true, will save as a put operation and
       #  overwrite any existing item on the remote end. Otherwise, and by
       #  default, will either perform a conditional put or an update call.
+      # @return false if the record is invalid as defined by an attempt to call
+      #  +valid?+ on this item, if that method exists. Otherwise, returns client
+      #  call return value.
       def save(opts = {})
-        result = save!(opts)
-        errors.clear
-        result
-      rescue Errors::RecordError => e
-        errors << e.message
-        false
-      end
-
-      # Checks if the record is a valid record. +false+ if most recent +#save+
-      # call raised errors, or if there are missing keys. +true+ otherwise.
-      def valid?
-        errors.empty? && missing_key_values.empty?
+        if _invalid_record?(opts)
+          false
+        else
+          _perform_save(opts)
+        end
       end
 
       # Deletes the item instance that matches the key values of this item
@@ -122,11 +93,51 @@ module Aws
         true
       end
 
-      def errors
-        self.class.instance_variable_get("@errors")
+      private
+      def _invalid_record?(opts)
+        if self.respond_to?(:valid?)
+          if !self.valid?
+            true
+          else
+            false
+          end
+        else
+          false
+        end
+      end
+
+      def _perform_save(opts)
+        force = opts[:force]
+        expect_new = expect_new_item?
+        if force
+          dynamodb_client.put_item(
+            table_name: self.class.table_name,
+            item: build_item_for_save
+          )
+        elsif expect_new
+          put_opts = {
+            table_name: self.class.table_name,
+            item: build_item_for_save
+          }.merge(prevent_overwrite_expression)
+          begin
+            dynamodb_client.put_item(put_opts)
+          rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException => e
+            raise Errors::ItemAlreadyExists.new(
+              "Conditional #put_item call failed, an item with the same key"\
+                " already exists in the table. Either load and update this"\
+                " item, or include the :force option to clobber the remote"\
+                " item."
+            )
+          end
+        else
+          dynamodb_client.update_item(
+            table_name: self.class.table_name,
+            key: key_values,
+            attribute_updates: dirty_changes_for_update
+          )
+        end
       end
 
-      private
       def build_item_for_save
         validate_key_values
         attributes = self.class.attributes

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.6
+  version: 1.0.0.pre.7
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources