dynamoid 1.3.4 → 2.0.0

data/lib/dynamoid/config/options.rb

@@ -43,7 +43,7 @@ module Dynamoid #:nodoc
           def #{name}?
             #{name}
           end
-          
+
           def reset_#{name}
             settings[#{name.inspect}] = defaults[#{name.inspect}]
           end

data/lib/dynamoid/criteria/chain.rb

@@ -18,6 +18,11 @@ module Dynamoid #:nodoc:
         @source = source
         @consistent_read = false
         @scan_index_forward = true
+
+        # Honor STI and :type field if it presents
+        if @source.attributes.key?(:type)
+          @query[:'type.in'] = @source.deep_subclasses.map(&:name) << @source.name
+        end
       end
 
       # The workhorse method of the criteria chain. Each key in the passed in hash will become another criteria that the
@@ -56,32 +61,36 @@ module Dynamoid #:nodoc:
       end
 
       # Returns the last fetched record matched the criteria
+      # Enumerable doesn't implement `last`, only `first`
+      # So we have to implement it ourselves
       #
       def last
-        all.last
+        all.to_a.last
       end
 
       # Destroys all the records matching the criteria.
       #
-      def destroy_all
+      def delete_all
         ids = []
+        ranges = []
 
         if key_present?
-          ranges = []
           Dynamoid.adapter.query(source.table_name, range_query).collect do |hash|
             ids << hash[source.hash_key.to_sym]
-            ranges << hash[source.range_key.to_sym]
+            ranges << hash[source.range_key.to_sym] if source.range_key
           end
 
-          Dynamoid.adapter.delete(source.table_name, ids,{:range_key => ranges})
+          Dynamoid.adapter.delete(source.table_name, ids, range_key: ranges.presence)
         else
-          Dynamoid.adapter.scan(source.table_name, query, scan_opts).collect do |hash|
+          Dynamoid.adapter.scan(source.table_name, scan_query, scan_opts).collect do |hash|
             ids << hash[source.hash_key.to_sym]
+            ranges << hash[source.range_key.to_sym] if source.range_key
           end
 
-          Dynamoid.adapter.delete(source.table_name, ids)
+          Dynamoid.adapter.delete(source.table_name, ids, range_key: ranges.presence)
         end
       end
+      alias_method :destroy_all, :delete_all
 
       # The record limit is the limit of evaluated records returned by the
       # query or scan.
@@ -121,10 +130,6 @@ module Dynamoid #:nodoc:
         records.each(&block)
       end
 
-      def consistent_opts
-        { :consistent_read => consistent_read }
-      end
-
       private
 
       # The actual records referenced by the association.
@@ -133,12 +138,11 @@ module Dynamoid #:nodoc:
       #
       # @since 0.2.0
       def records
-        results = if key_present?
+        if key_present?
           records_via_query
         else
           records_via_scan
         end
-        @batch_size ? results : Array(results)
       end
 
       def records_via_query
@@ -173,17 +177,17 @@ module Dynamoid #:nodoc:
 
         case operation
         when 'gt'
-          { :range_greater_than => val }
+          { range_greater_than: val }
         when 'lt'
-          { :range_less_than  => val }
+          { range_less_than: val }
         when 'gte'
-          { :range_gte  => val }
+          { range_gte: val }
         when 'lte'
-          { :range_lte => val }
+          { range_lte: val }
         when 'between'
-          { :range_between => val }
+          { range_between: val }
         when 'begins_with'
-          { :range_begins_with => val }
+          { range_begins_with: val }
         end
       end
 
@@ -215,6 +219,10 @@ module Dynamoid #:nodoc:
         return { name.to_sym => hash }
       end
 
+      def consistent_opts
+        { consistent_read: consistent_read }
+      end
+
       def range_query
         opts = {}
 
@@ -227,7 +235,7 @@ module Dynamoid #:nodoc:
           opts[:range_key] = @range_key
           if query[@range_key].present?
             value = type_cast_condition_parameter(@range_key, query[@range_key])
-            opts.update(:range_eq => value)
+            opts.update(range_eq: value)
           end
 
           query.keys.select { |k| k.to_s =~ /^#{@range_key}\./ }.each do |key|
@@ -261,7 +269,7 @@ module Dynamoid #:nodoc:
         query_keys = query.keys.collect { |k| k.to_s.split('.').first }
 
         # See if querying based on table hash key
-        if query_keys.include?(source.hash_key.to_s)
+        if query.keys.map(&:to_s).include?(source.hash_key.to_s)
           @hash_key = source.hash_key
 
           # Use table's default range key

data/lib/dynamoid/dirty.rb

@@ -15,7 +15,7 @@ module Dynamoid
 
     def update!(*)
       ret = super
-      clear_changes #update! completely reloads all fields on the class, so any extant changes are wiped out
+      clear_changes # update! completely reloads all fields on the class, so any extant changes are wiped out
       ret
     end
 
@@ -26,7 +26,7 @@ module Dynamoid
     def clear_changes
       previous = changes
       (block_given? ? yield : true).tap do |result|
-        unless result == false #failed validation; nil is OK.
+        unless result == false # failed validation; nil is OK.
           @previously_changed = previous
           changed_attributes.clear
         end

data/lib/dynamoid/document.rb

@@ -72,7 +72,11 @@ module Dynamoid #:nodoc:
       #
       # @since 0.2.0
       def create(attrs = {})
-        build(attrs).tap(&:save)
+        if attrs.is_a?(Array)
+          attrs.map { |attr| create(attr) }
+        else
+          build(attrs).tap(&:save)
+        end
       end
 
       # Initialize a new object and immediately save it to the database. Raise an exception if persistence failed.
@@ -83,7 +87,11 @@ module Dynamoid #:nodoc:
       #
       # @since 0.2.0
       def create!(attrs = {})
-        build(attrs).tap(&:save!)
+        if attrs.is_a?(Array)
+          attrs.map { |attr| create!(attr) }
+        else
+          build(attrs).tap(&:save!)
+        end
       end
 
       # Initialize a new object.
@@ -106,10 +114,14 @@ module Dynamoid #:nodoc:
       # @since 0.2.0
       def exists?(id_or_conditions = {})
         case id_or_conditions
-          when Hash then ! where(id_or_conditions).all.empty?
-          else !! find(id_or_conditions)
+          when Hash then where(id_or_conditions).first.present?
+          else !! find_by_id(id_or_conditions)
         end
       end
+
+      def deep_subclasses
+        subclasses + subclasses.map(&:deep_subclasses).flatten
+      end
     end
 
     # Initialize a new object.
@@ -167,7 +179,7 @@ module Dynamoid #:nodoc:
     # @since 0.2.0
     def reload
       range_key_value = range_value ? dumped_range_value : nil
-      self.attributes = self.class.find(hash_key, :range_key => range_key_value, :consistent_read => true).attributes
+      self.attributes = self.class.find(hash_key, range_key: range_key_value, consistent_read: true).attributes
       @associations.values.each(&:reset)
       self
     end

data/lib/dynamoid/errors.rb

@@ -27,7 +27,7 @@ module Dynamoid
       attr_reader :record
 
       def initialize(record)
-        super("Failed to destroy item")
+        super('Failed to destroy item')
         @record = record
       end
     end
@@ -61,6 +61,9 @@ module Dynamoid
       end
     end
 
+    class RecordNotFound < Error
+    end
+
     class DocumentNotValid < Error
       attr_reader :document
 

data/lib/dynamoid/fields.rb

@@ -23,7 +23,7 @@ module Dynamoid #:nodoc:
       field :created_at, :datetime
       field :updated_at, :datetime
 
-      field :id #Default primary key
+      field :id # Default primary key
     end
 
     module ClassMethods
@@ -50,7 +50,7 @@ module Dynamoid #:nodoc:
           Dynamoid.logger.warn("Field type :float, which you declared for '#{name}', is deprecated in favor of :number.")
           type = :number
         end
-        self.attributes = attributes.merge(name => {:type => type}.merge(options))
+        self.attributes = attributes.merge(name => {type: type}.merge(options))
 
         generated_methods.module_eval do
           define_method(named) { read_attribute(named) }
@@ -67,13 +67,13 @@ module Dynamoid #:nodoc:
         end
       end
 
-      def range(name, type = :string)
-        field(name, type)
+      def range(name, type = :string, options = {})
+        field(name, type, options)
         self.range_key = name
       end
 
       def table(options)
-        #a default 'id' column is created when Dynamoid::Document is included
+        # a default 'id' column is created when Dynamoid::Document is included
         unless(attributes.has_key? hash_key)
           remove_field :id
           field(hash_key)
@@ -82,7 +82,7 @@ module Dynamoid #:nodoc:
 
       def remove_field(field)
         field = field.to_sym
-        attributes.delete(field) or raise "No such field"
+        attributes.delete(field) or raise 'No such field'
 
         generated_methods.module_eval do
           remove_method field

data/lib/dynamoid/finders.rb

@@ -36,9 +36,19 @@ module Dynamoid
         ids = Array(ids.flatten.uniq)
         if ids.count == 1
           result = self.find_by_id(ids.first, options)
+          if result.nil?
+            message = "Couldn't find #{self.name} with '#{self.hash_key}'=#{ids[0]}"
+            raise Errors::RecordNotFound.new(message)
+          end
           expects_array ? Array(result) : result
         else
-          find_all(ids)
+          result = find_all(ids)
+          if result.size != ids.size
+            message = "Couldn't find all #{self.name.pluralize} with '#{self.hash_key}': (#{ids.join(', ')}) "
+            message << "(found #{result.size} results, but was looking for #{ids.size})"
+            raise Errors::RecordNotFound.new(message)
+          end
+          result
         end
       end
 
@@ -80,7 +90,7 @@ module Dynamoid
       # @param [String/Number] range_key of the object to find
       #
       def find_by_composite_key(hash_key, range_key, options = {})
-        find_by_id(hash_key, options.merge({:range_key => range_key}))
+        find_by_id(hash_key, options.merge(range_key: range_key))
       end
 
       # Find all objects by hash and range keys.
@@ -105,7 +115,7 @@ module Dynamoid
       # @return [Array] an array of all matching items
       #
       def find_all_by_composite_key(hash_key, options = {})
-        Dynamoid.adapter.query(self.table_name, options.merge({hash_value: hash_key})).collect do |item|
+        Dynamoid.adapter.query(self.table_name, options.merge(hash_value: hash_key)).collect do |item|
           from_database(item)
         end
       end
@@ -138,9 +148,9 @@ module Dynamoid
 
         if range_key_field
           range_key_field = range_key_field.to_s
-          range_key_op = "eq"
-          if range_key_field.include?(".")
-            range_key_field, range_key_op = range_key_field.split(".", 2)
+          range_key_op = 'eq'
+          if range_key_field.include?('.')
+            range_key_field, range_key_op = range_key_field.split('.', 2)
           end
           range_op_mapped = RANGE_MAP.fetch(range_key_op)
         end
@@ -151,9 +161,9 @@ module Dynamoid
 
         # query
         opts = {
-          :hash_key => hash_key_field.to_s,
-          :hash_value => hash_key_value,
-          :index_name => index.name,
+          hash_key: hash_key_field.to_s,
+          hash_value: hash_key_value,
+          index_name: index.name,
         }
         if range_key_field
           opts[:range_key] = range_key_field

data/lib/dynamoid/identity_map.rb

@@ -80,7 +80,6 @@ module Dynamoid
       super
     end
 
-
     def identity_map_key
       key = hash_key.to_s
       if self.class.range_key

data/lib/dynamoid/indexes.rb

@@ -39,8 +39,8 @@ module Dynamoid
         end
 
         index_opts = {
-            :read_capacity => Dynamoid::Config.read_capacity,
-            :write_capacity => Dynamoid::Config.write_capacity
+            read_capacity: Dynamoid::Config.read_capacity,
+            write_capacity: Dynamoid::Config.write_capacity
         }.merge(options)
 
         index_opts[:dynamoid_class] = self
@@ -52,7 +52,6 @@ module Dynamoid
         self
       end
 
-
       # Defines a local secondary index on a table. Will use the same primary
       # hash key as the table.
       #
@@ -83,11 +82,10 @@ module Dynamoid
             ' must use a different :range_key than the primary key')
         end
 
-        index_opts = options.merge({
-          :dynamoid_class => self,
-          :type => :local_secondary,
-          :hash_key => primary_hash_key
-        })
+        index_opts = options.merge(
+          dynamoid_class: self,
+          type: :local_secondary,
+          hash_key: primary_hash_key)
 
         index = Dynamoid::Indexes::Index.new(index_opts)
         key = index_key(primary_hash_key, index_range_key)
@@ -95,13 +93,11 @@ module Dynamoid
         self
       end
 
-
       def find_index(hash, range=nil)
         index = self.indexes[index_key(hash, range)]
         index
       end
 
-
       # Returns true iff the provided hash[,range] key combo is a local
       # secondary index.
       #
@@ -113,7 +109,6 @@ module Dynamoid
         self.local_secondary_indexes[index_key(hash, range)].present?
       end
 
-
       # Returns true iff the provided hash[,range] key combo is a global
       # secondary index.
       #
@@ -125,7 +120,6 @@ module Dynamoid
         self.global_secondary_indexes[index_key(hash, range)].present?
       end
 
-
       # Generates a convenient lookup key name for a hash/range index.
       # Should normally not be used directly.
       #
@@ -140,7 +134,6 @@ module Dynamoid
         name
       end
 
-
       # Generates a default index name.
       #
       # @param [Symbol] hash hash key name.
@@ -150,7 +143,6 @@ module Dynamoid
         "#{self.table_name}_index_#{self.index_key(hash, range)}"
       end
 
-
       # Convenience method to return all indexes on the table.
       #
       # @return [Hash<String, Object>] the combined hash of global and local
@@ -166,7 +158,6 @@ module Dynamoid
       end
     end
 
-
     # Represents the attributes of a DynamoDB index.
     class Index
       include ActiveModel::Validations
@@ -178,7 +169,6 @@ module Dynamoid
           :hash_key_schema, :range_key_schema, :projected_attributes,
           :read_capacity, :write_capacity
 
-
       validate do
         validate_index_type
         validate_hash_key
@@ -186,7 +176,6 @@ module Dynamoid
         validate_projected_attributes
       end
 
-
       def initialize(attrs={})
         unless attrs[:dynamoid_class].present?
           raise Dynamoid::Errors::InvalidIndex.new(':dynamoid_class is required')
@@ -205,7 +194,6 @@ module Dynamoid
         raise Dynamoid::Errors::InvalidIndex.new(self) unless self.valid?
       end
 
-
       # Convenience method to determine the projection type for an index.
       # Projection types are: :keys_only, :all, :include.
       #
@@ -218,56 +206,55 @@ module Dynamoid
         end
       end
 
-
       private
 
-        def validate_projected_attributes
-          unless (@projected_attributes.is_a?(Array) ||
-                  PROJECTION_TYPES.include?(@projected_attributes))
-            errors.add(:projected_attributes, 'Invalid projected attributes specified.')
-          end
+      def validate_projected_attributes
+        unless (@projected_attributes.is_a?(Array) ||
+                PROJECTION_TYPES.include?(@projected_attributes))
+          errors.add(:projected_attributes, 'Invalid projected attributes specified.')
         end
+      end
 
-        def validate_index_type
-          unless (@type.present? &&
-            [:local_secondary, :global_secondary].include?(@type))
-              errors.add(:type, 'Invalid index :type specified')
-          end
+      def validate_index_type
+        unless (@type.present? &&
+          [:local_secondary, :global_secondary].include?(@type))
+            errors.add(:type, 'Invalid index :type specified')
         end
+      end
 
-        def validate_range_key
-          if @range_key.present?
-            range_field_attributes = @dynamoid_class.attributes[@range_key]
-            if range_field_attributes.present?
-              range_key_type = range_field_attributes[:type]
-              if Dynamoid::Fields::PERMITTED_KEY_TYPES.include?(range_key_type)
-                @range_key_schema = {
-                  @range_key => @dynamoid_class.dynamo_type(range_key_type)
-                }
-              else
-                errors.add(:range_key, 'Index :range_key is not a valid key type')
-              end
+      def validate_range_key
+        if @range_key.present?
+          range_field_attributes = @dynamoid_class.attributes[@range_key]
+          if range_field_attributes.present?
+            range_key_type = range_field_attributes[:type]
+            if Dynamoid::Fields::PERMITTED_KEY_TYPES.include?(range_key_type)
+              @range_key_schema = {
+                @range_key => @dynamoid_class.dynamo_type(range_key_type)
+              }
             else
-              errors.add(:range_key, "No such field #{@range_key} defined on table")
+              errors.add(:range_key, 'Index :range_key is not a valid key type')
             end
+          else
+            errors.add(:range_key, "No such field #{@range_key} defined on table")
           end
         end
+      end
 
-        def validate_hash_key
-          hash_field_attributes = @dynamoid_class.attributes[@hash_key]
-          if hash_field_attributes.present?
-            hash_field_type = hash_field_attributes[:type]
-            if Dynamoid::Fields::PERMITTED_KEY_TYPES.include?(hash_field_type)
-              @hash_key_schema = {
-                @hash_key => @dynamoid_class.dynamo_type(hash_field_type)
-              }
-            else
-              errors.add(:hash_key, 'Index :hash_key is not a valid key type')
-            end
+      def validate_hash_key
+        hash_field_attributes = @dynamoid_class.attributes[@hash_key]
+        if hash_field_attributes.present?
+          hash_field_type = hash_field_attributes[:type]
+          if Dynamoid::Fields::PERMITTED_KEY_TYPES.include?(hash_field_type)
+            @hash_key_schema = {
+              @hash_key => @dynamoid_class.dynamo_type(hash_field_type)
+            }
           else
-            errors.add(:hash_key, "No such field #{@hash_key} defined on table")
+            errors.add(:hash_key, 'Index :hash_key is not a valid key type')
           end
+        else
+          errors.add(:hash_key, "No such field #{@hash_key} defined on table")
         end
+      end
     end
   end
 end