adept_dynamoid 0.5.0.8 → 0.6.0

data/Rakefile

@@ -14,11 +14,11 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "adept_dynamoid"
+  gem.name = "dynamoid"
   gem.homepage = "http://github.com/Veraticus/Dynamoid"
   gem.license = "MIT"
   gem.summary = "Dynamoid is an ORM for Amazon's DynamoDB"
-  gem.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. Make sure you add require 'dynamoid' to before your configure script with adept_dynamoid"
+  gem.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."
   gem.email = "josh@joshsymonds.com"
   gem.authors = ["Josh Symonds"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.5.0.8
+0.0.0

data/adept_dynamoid.gemspec

@@ -0,0 +1,195 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "adept_dynamoid"
+  s.version = "0.6.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Josh Symonds"]
+  s.date = "2012-12-05"
+  s.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. Make sure you add require 'dynamoid' to before your configure script with adept_dynamoid"
+  s.email = "josh@joshsymonds.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.markdown"
+  ]
+  s.files = [
+    ".document",
+    ".project",
+    ".rspec",
+    "Dynamoid.gemspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "adept_dynamoid.gemspec",
+    "doc/.nojekyll",
+    "doc/Dynamoid.html",
+    "doc/Dynamoid/Adapter.html",
+    "doc/Dynamoid/Adapter/AwsSdk.html",
+    "doc/Dynamoid/Adapter/Local.html",
+    "doc/Dynamoid/Associations.html",
+    "doc/Dynamoid/Associations/Association.html",
+    "doc/Dynamoid/Associations/BelongsTo.html",
+    "doc/Dynamoid/Associations/ClassMethods.html",
+    "doc/Dynamoid/Associations/HasAndBelongsToMany.html",
+    "doc/Dynamoid/Associations/HasMany.html",
+    "doc/Dynamoid/Associations/HasOne.html",
+    "doc/Dynamoid/Associations/ManyAssociation.html",
+    "doc/Dynamoid/Associations/SingleAssociation.html",
+    "doc/Dynamoid/Components.html",
+    "doc/Dynamoid/Config.html",
+    "doc/Dynamoid/Config/Options.html",
+    "doc/Dynamoid/Criteria.html",
+    "doc/Dynamoid/Criteria/Chain.html",
+    "doc/Dynamoid/Criteria/ClassMethods.html",
+    "doc/Dynamoid/Document.html",
+    "doc/Dynamoid/Document/ClassMethods.html",
+    "doc/Dynamoid/Errors.html",
+    "doc/Dynamoid/Errors/DocumentNotValid.html",
+    "doc/Dynamoid/Errors/Error.html",
+    "doc/Dynamoid/Errors/InvalidField.html",
+    "doc/Dynamoid/Errors/MissingRangeKey.html",
+    "doc/Dynamoid/Fields.html",
+    "doc/Dynamoid/Fields/ClassMethods.html",
+    "doc/Dynamoid/Finders.html",
+    "doc/Dynamoid/Finders/ClassMethods.html",
+    "doc/Dynamoid/Indexes.html",
+    "doc/Dynamoid/Indexes/ClassMethods.html",
+    "doc/Dynamoid/Indexes/Index.html",
+    "doc/Dynamoid/Persistence.html",
+    "doc/Dynamoid/Persistence/ClassMethods.html",
+    "doc/Dynamoid/Validations.html",
+    "doc/_index.html",
+    "doc/class_list.html",
+    "doc/css/common.css",
+    "doc/css/full_list.css",
+    "doc/css/style.css",
+    "doc/file.LICENSE.html",
+    "doc/file.README.html",
+    "doc/file_list.html",
+    "doc/frames.html",
+    "doc/index.html",
+    "doc/js/app.js",
+    "doc/js/full_list.js",
+    "doc/js/jquery.js",
+    "doc/method_list.html",
+    "doc/top-level-namespace.html",
+    "lib/dynamoid.rb",
+    "lib/dynamoid/adapter.rb",
+    "lib/dynamoid/adapter/aws_sdk.rb",
+    "lib/dynamoid/associations.rb",
+    "lib/dynamoid/associations/association.rb",
+    "lib/dynamoid/associations/belongs_to.rb",
+    "lib/dynamoid/associations/has_and_belongs_to_many.rb",
+    "lib/dynamoid/associations/has_many.rb",
+    "lib/dynamoid/associations/has_one.rb",
+    "lib/dynamoid/associations/many_association.rb",
+    "lib/dynamoid/associations/single_association.rb",
+    "lib/dynamoid/components.rb",
+    "lib/dynamoid/config.rb",
+    "lib/dynamoid/config/options.rb",
+    "lib/dynamoid/criteria.rb",
+    "lib/dynamoid/criteria/chain.rb",
+    "lib/dynamoid/dirty.rb",
+    "lib/dynamoid/document.rb",
+    "lib/dynamoid/errors.rb",
+    "lib/dynamoid/fields.rb",
+    "lib/dynamoid/finders.rb",
+    "lib/dynamoid/identity_map.rb",
+    "lib/dynamoid/indexes.rb",
+    "lib/dynamoid/indexes/index.rb",
+    "lib/dynamoid/middleware/identity_map.rb",
+    "lib/dynamoid/persistence.rb",
+    "lib/dynamoid/validations.rb",
+    "spec/app/models/address.rb",
+    "spec/app/models/camel_case.rb",
+    "spec/app/models/magazine.rb",
+    "spec/app/models/message.rb",
+    "spec/app/models/sponsor.rb",
+    "spec/app/models/subscription.rb",
+    "spec/app/models/tweet.rb",
+    "spec/app/models/user.rb",
+    "spec/dynamoid/adapter/aws_sdk_spec.rb",
+    "spec/dynamoid/adapter_spec.rb",
+    "spec/dynamoid/associations/association_spec.rb",
+    "spec/dynamoid/associations/belongs_to_spec.rb",
+    "spec/dynamoid/associations/has_and_belongs_to_many_spec.rb",
+    "spec/dynamoid/associations/has_many_spec.rb",
+    "spec/dynamoid/associations/has_one_spec.rb",
+    "spec/dynamoid/associations_spec.rb",
+    "spec/dynamoid/config_spec.rb",
+    "spec/dynamoid/criteria/chain_spec.rb",
+    "spec/dynamoid/criteria_spec.rb",
+    "spec/dynamoid/dirty_spec.rb",
+    "spec/dynamoid/document_spec.rb",
+    "spec/dynamoid/fields_spec.rb",
+    "spec/dynamoid/finders_spec.rb",
+    "spec/dynamoid/identity_map_spec.rb",
+    "spec/dynamoid/indexes/index_spec.rb",
+    "spec/dynamoid/indexes_spec.rb",
+    "spec/dynamoid/persistence_spec.rb",
+    "spec/dynamoid/validations_spec.rb",
+    "spec/dynamoid_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/Veraticus/Dynamoid"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Dynamoid is an ORM for Amazon's DynamoDB"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activemodel>, [">= 0"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
+      s.add_runtime_dependency(%q<aws-sdk>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<redcarpet>, ["= 1.17.2"])
+      s.add_development_dependency(%q<github-markup>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<fake_dynamo>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, ["= 0.10.0"])
+    else
+      s.add_dependency(%q<activemodel>, [">= 0"])
+      s.add_dependency(%q<tzinfo>, [">= 0"])
+      s.add_dependency(%q<aws-sdk>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<redcarpet>, ["= 1.17.2"])
+      s.add_dependency(%q<github-markup>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<fake_dynamo>, [">= 0"])
+      s.add_dependency(%q<mocha>, ["= 0.10.0"])
+    end
+  else
+    s.add_dependency(%q<activemodel>, [">= 0"])
+    s.add_dependency(%q<tzinfo>, [">= 0"])
+    s.add_dependency(%q<aws-sdk>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<redcarpet>, ["= 1.17.2"])
+    s.add_dependency(%q<github-markup>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<fake_dynamo>, [">= 0"])
+    s.add_dependency(%q<mocha>, ["= 0.10.0"])
+  end
+end
+

data/lib/dynamoid/adapter.rb

@@ -73,7 +73,7 @@ module Dynamoid
         ids = ids.collect{|id| range_key ? [id, range_key] : id}
         if Dynamoid::Config.partitioning?
           results = batch_get_item(table => id_with_partitions(ids))
-          {table => result_for_partition(results[table])}
+          {table => result_for_partition(results[table],table)}
         else
           batch_get_item(table => ids)
         end
@@ -81,7 +81,7 @@ module Dynamoid
         if Dynamoid::Config.partitioning?
           ids = range_key ? [[ids, range_key]] : ids
           results = batch_get_item(table => id_with_partitions(ids))
-          result_for_partition(results[table]).first
+          result_for_partition(results[table],table).first
         else
           get_item(table, ids, options)
         end
@@ -91,15 +91,31 @@ module Dynamoid
     # Delete an item from a table. If partitioning is turned on, deletes all partitioned keys as well.
     #
     # @param [String] table the name of the table to write the object to
-    # @param [String] id the id of the record
-    # @param [Number] range_key the range key of the record
+    # @param [Array] ids to delete, can also be a string of just one id
+    # @param [Array] range_key of the record to delete, can also be a string of just one range_key
     #
-    # @since 0.2.0
-    def delete(table, id, options = {})
-      if Dynamoid::Config.partitioning?
-        id_with_partitions(id).each {|i| delete_item(table, i, options)}
+    def delete(table, ids, options = {})
+      range_key = options[:range_key] #array of range keys that matches the ids passed in
+      if ids.respond_to?(:each)
+        if range_key.respond_to?(:each)
+          #turn ids into array of arrays each element being hash_key, range_key
+          ids = ids.each_with_index.map{|id,i| [id,range_key[i]]}
+        else
+          ids = range_key ? [[ids, range_key]] : ids
+        end
+        
+        if Dynamoid::Config.partitioning?
+          batch_delete_item(table => id_with_partitions(ids))
+        else
+          batch_delete_item(table => ids)
+        end
       else
-        delete_item(table, id, options)
+        if Dynamoid::Config.partitioning?
+          ids = range_key ? [[ids, range_key]] : ids
+          batch_delete_item(table => id_with_partitions(ids))
+        else
+          delete_item(table, ids, options)
+        end
       end
     end
 
@@ -112,7 +128,7 @@ module Dynamoid
     def scan(table, query, opts = {})
       if Dynamoid::Config.partitioning?
         results = benchmark('Scan', table, query) {adapter.scan(table, query, opts)}
-        result_for_partition(results)
+        result_for_partition(results,table)
       else
         benchmark('Scan', table, query) {adapter.scan(table, query, opts)}
       end
@@ -141,27 +157,59 @@ module Dynamoid
     def id_with_partitions(ids)
       Array(ids).collect {|id| (0...Dynamoid::Config.partition_size).collect{|n| id.is_a?(Array) ? ["#{id.first}.#{n}", id.last] : "#{id}.#{n}"}}.flatten(1)
     end
+    
+    #Get original id (hash_key) and partiton number from a hash_key
+    #
+    # @param [String] id the id or hash_key of a record, ex. xxxxx.13
+    #
+    # @return [String,String] original_id and the partition number, ex original_id = xxxxx partition = 13
+    def get_original_id_and_partition id
+      partition = id.split('.').last
+      id = id.split(".#{partition}").first
+
+      return id, partition
+    end
 
-    # Takes an array of results that are partitioned, find the most recently updated one, and return only it. Compares each result by
+    # Takes an array of query results that are partitioned, find the most recently updated ones that share an id and range_key, and return only the most recently updated. Compares each result by
     # their id and updated_at attributes; if the updated_at is the greatest, then it must be the correct result.
     #
     # @param [Array] returned partitioned results from a query
+    # @param [String] table_name the name of the table
     #
     # @since 0.2.0
-    def result_for_partition(results)
-      {}.tap do |hash|
-        Array(results).each do |result|
-          next if result.nil?
-          #Need to find the value of id with out the . and partition number
-          partition = result[:id].split('.').last
-          id = result[:id].split(".#{partition}").first
+    def result_for_partition(results, table_name)
+      table = Dynamoid::Adapter::AwsSdk.get_table(table_name)
+      
+      if table.range_key     
+        range_key_name = table.range_key.name.to_sym
+        
+        final_hash = {}
+        
+        results.each do |record|
+          test_record = final_hash[record[range_key_name]]
           
-          if !hash[id] || (result[:updated_at] > hash[id][:updated_at])
-            result[:id] = id
-            hash[id] = result
+          if test_record.nil? || ((record[range_key_name] == test_record[range_key_name]) && (record[:updated_at] > test_record[:updated_at]))
+            #get ride of our partition and put it in the array with the range key
+            record[:id], partition = get_original_id_and_partition  record[:id]
+            final_hash[record[range_key_name]] = record
           end
         end
-      end.values
+  
+        return final_hash.values
+      else
+        {}.tap do |hash|
+          Array(results).each do |result|
+            next if result.nil?
+            #Need to find the value of id with out the . and partition number
+            id, partition = get_original_id_and_partition result[:id]
+  
+            if !hash[id] || (result[:updated_at] > hash[id][:updated_at])
+              result[:id] = id
+              hash[id] = result
+            end
+          end
+        end.values
+      end
     end
 
     # Delegate all methods that aren't defind here to the underlying adapter.
@@ -171,7 +219,47 @@ module Dynamoid
       return benchmark(method, *args) {adapter.send(method, *args, &block)} if @adapter.respond_to?(method)
       super
     end
+    
+    # Query the DynamoDB table. This employs DynamoDB's indexes so is generally faster than scanning, but is
+    # only really useful for range queries, since it can only find by one hash key at once. Only provide
+    # one range key to the hash. If paritioning is on, will run a query for every parition and join the results
+    #
+    # @param [String] table_name the name of the table
+    # @param [Hash] opts the options to query the table with
+    # @option opts [String] :hash_value the value of the hash key to find
+    # @option opts [Range] :range_value find the range key within this range
+    # @option opts [Number] :range_greater_than find range keys greater than this
+    # @option opts [Number] :range_less_than find range keys less than this
+    # @option opts [Number] :range_gte find range keys greater than or equal to this
+    # @option opts [Number] :range_lte find range keys less than or equal to this
+    #
+    # @return [Array] an array of all matching items
+    #
+    def query(table_name, opts = {})
+      
+      unless Dynamoid::Config.partitioning?
+        #no paritioning? just pass to the standard query method
+        Dynamoid::Adapter::AwsSdk.query(table_name, opts)
+      else
+        #get all the hash_values that could be possible
+        ids = id_with_partitions(opts[:hash_value])
 
-  end
+        #lets not overwrite with the original options
+        modified_options = opts.clone     
+        results = []
+        
+        #loop and query on each of the partition ids
+        ids.each do |id|
+          modified_options[:hash_value] = id
+
+          query_result = Dynamoid::Adapter::AwsSdk.query(table_name, modified_options)
+          query_result = [query_result] if !query_result.is_a?(Array)
 
+          results = results + query_result unless query_result.nil? 
+        end 
+        
+        result_for_partition results, table_name
+      end
+    end
+  end
 end

data/lib/dynamoid/adapter/aws_sdk.rb

@@ -54,6 +54,29 @@ module Dynamoid
         end
         hash
       end
+      
+      # Delete many items at once from DynamoDB. More efficient than delete each item individually.
+      #
+      # @example Delete IDs 1 and 2 from the table testtable
+      #   Dynamoid::Adapter::AwsSdk.batch_delete_item('table1' => ['1', '2'])
+      #or
+      #   Dynamoid::Adapter::AwsSdk.batch_delete_item('table1' => [['hk1', 'rk2'], ['hk1', 'rk2']]]))
+      #
+      # @param [Hash] options the hash of tables and IDs to delete
+      #
+      # @return nil
+      #
+      def batch_delete_item(options)
+        return nil if options.all?{|k, v| v.empty?}
+        options.each do |t, ids|
+          Array(ids).in_groups_of(25, false) do |group|
+            batch = AWS::DynamoDB::BatchWrite.new(:config => @@connection.config)
+            batch.delete(t,group)
+            batch.process!          
+          end
+        end
+        nil
+      end
 
       # Create a table on DynamoDB. This usually takes a long time to complete.
       #
@@ -111,9 +134,6 @@ module Dynamoid
       # @return [Hash] a hash representing the raw item in DynamoDB
       #
       # @since 0.2.0
-
-
-
       def get_item(table_name, key, options = {})
         range_key = options.delete(:range_key)
         table = get_table(table_name)

data/lib/dynamoid/criteria/chain.rb

@@ -46,6 +46,63 @@ module Dynamoid #:nodoc:
       def all
         records
       end
+      
+      # Destroys all the records matching the criteria.
+      #
+      def destroy_all
+        ids = []
+        
+        if range?
+          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]
+          end
+          
+          Dynamoid::Adapter.delete(source.table_name, ids,{:range_key => ranges})
+        elsif index
+          #TODO: test this throughly and find a way to delete all index table records for one source record
+          if index.range_key?
+            results = Dynamoid::Adapter.query(index.table_name, index_query.merge(consistent_opts))
+          else
+            results = Dynamoid::Adapter.read(index.table_name, index_query[:hash_value], consistent_opts)
+          end
+          
+          results.collect do |hash| 
+            ids << hash[source.hash_key.to_sym]
+            index_ranges << hash[source.range_key.to_sym]
+          end
+        
+          unless ids.nil? || ids.empty?
+            ids = ids.to_a
+  
+            if @start
+              ids = ids.drop_while { |id| id != @start.hash_key }.drop(1)
+              index_ranges = index_ranges.drop_while { |range| range != @start.hash_key }.drop(1) unless index_ranges.nil?
+            end
+  
+            if @limit           
+              ids = ids.take(@limit) 
+              index_ranges = index_ranges.take(@limit)
+            end
+            
+            Dynamoid::Adapter.delete(source.table_name, ids)
+            
+            if index.range_key?
+              Dynamoid::Adapter.delete(index.table_name, ids,{:range_key => index_ranges})
+            else
+              Dynamoid::Adapter.delete(index.table_name, ids)
+            end
+            
+          end
+        else
+          Dynamoid::Adapter.scan(source.table_name, query, scan_opts).collect do |hash| 
+            ids << hash[source.hash_key.to_sym]
+          end
+          
+          Dynamoid::Adapter.delete(source.table_name, ids)
+        end   
+      end
 
       # Returns the first record matching the criteria.
       #
@@ -151,7 +208,7 @@ module Dynamoid #:nodoc:
           raise Dynamoid::Errors::InvalidQuery, 'Consistent read is not supported by SCAN operation'
         end
 
-        Dynamoid::Adapter.scan(source.table_name, query, query_opts).collect {|hash| source.from_database(hash) }
+        Dynamoid::Adapter.scan(source.table_name, query, scan_opts).collect {|hash| source.from_database(hash) }
       end
 
       # Format the provided query so that it can be used to query results from DynamoDB.
@@ -236,6 +293,13 @@ module Dynamoid #:nodoc:
         opts[:scan_index_forward] = @scan_index_forward
         opts
       end
+      
+      def scan_opts
+        opts = {}
+        opts[:limit] = @limit if @limit
+        opts[:next_token] = start_key if @start
+        opts
+      end
     end
 
   end

data/lib/dynamoid/fields.rb

@@ -95,6 +95,8 @@ module Dynamoid #:nodoc:
             end
           end
         end
+        
+        save
       end
     end
 

data/spec/dynamoid/adapter/aws_sdk_spec.rb

@@ -16,7 +16,7 @@ describe Dynamoid::Adapter::AwsSdk do
       end
     end
 
-    context 'with a preexisting table' do
+    context 'with a preexisting table without paritioning' do
       before(:all) do
         Dynamoid::Adapter.create_table('dynamoid_tests_TestTable1', :id) unless Dynamoid::Adapter.list_tables.include?('dynamoid_tests_TestTable1')
         Dynamoid::Adapter.create_table('dynamoid_tests_TestTable2', :id) unless Dynamoid::Adapter.list_tables.include?('dynamoid_tests_TestTable2')
@@ -99,6 +99,56 @@ describe Dynamoid::Adapter::AwsSdk do
         results['dynamoid_tests_TestTable3'].should include({:name => 'Josh', :id => '1', :range => 1.0})
         results['dynamoid_tests_TestTable3'].should include({:name => 'Justin', :id => '2', :range => 2.0})
       end
+      
+      # BatchDeleteItem
+      it "performs BatchDeleteItem with singular keys" do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '1', :name => 'Josh'})
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable2', {:id => '1', :name => 'Justin'})
+
+        Dynamoid::Adapter.batch_delete_item('dynamoid_tests_TestTable1' => ['1'], 'dynamoid_tests_TestTable2' => ['1'])
+        
+        results = Dynamoid::Adapter.batch_get_item('dynamoid_tests_TestTable1' => '1', 'dynamoid_tests_TestTable2' => '1')
+        results.size.should == 0
+        
+        results['dynamoid_tests_TestTable1'].should_not include({:name => 'Josh', :id => '1'})
+        results['dynamoid_tests_TestTable2'].should_not include({:name => 'Justin', :id => '1'})
+      end
+
+      it "performs BatchDeleteItem with multiple keys" do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '1', :name => 'Josh'})
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '2', :name => 'Justin'})
+
+        Dynamoid::Adapter.batch_delete_item('dynamoid_tests_TestTable1' => ['1', '2'])
+        
+        results = Dynamoid::Adapter.batch_get_item('dynamoid_tests_TestTable1' => ['1', '2'])
+        results.size.should == 0
+        
+        results['dynamoid_tests_TestTable1'].should_not include({:name => 'Josh', :id => '1'})
+        results['dynamoid_tests_TestTable1'].should_not include({:name => 'Justin', :id => '2'})
+      end
+
+      it 'performs BatchDeleteItem with one ranged key' do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable3', {:id => '1', :name => 'Josh', :range => 1.0})
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable3', {:id => '2', :name => 'Justin', :range => 2.0})
+
+        Dynamoid::Adapter.batch_delete_item('dynamoid_tests_TestTable3' => [['1', 1.0]])
+        results = Dynamoid::Adapter.batch_get_item('dynamoid_tests_TestTable3' => [['1', 1.0]])
+        results.size.should == 0
+
+        results['dynamoid_tests_TestTable3'].should_not include({:name => 'Josh', :id => '1', :range => 1.0})
+      end
+
+      it 'performs BatchDeleteItem with multiple ranged keys' do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable3', {:id => '1', :name => 'Josh', :range => 1.0})
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable3', {:id => '2', :name => 'Justin', :range => 2.0})
+
+        Dynamoid::Adapter.batch_delete_item('dynamoid_tests_TestTable3' => [['1', 1.0],['2', 2.0]])
+        results = Dynamoid::Adapter.batch_get_item('dynamoid_tests_TestTable3' => [['1', 1.0],['2', 2.0]])
+        results.size.should == 0
+         
+        results['dynamoid_tests_TestTable3'].should_not include({:name => 'Josh', :id => '1', :range => 1.0})
+        results['dynamoid_tests_TestTable3'].should_not include({:name => 'Justin', :id => '2', :range => 2.0})
+      end
 
       # ListTables
       it 'performs ListTables' do
@@ -175,6 +225,90 @@ describe Dynamoid::Adapter::AwsSdk do
         Dynamoid::Adapter.scan('dynamoid_tests_TestTable1', {}).should include({:name=>"Josh", :id=>"2"}, {:name=>"Josh", :id=>"1"})
       end
     end
+    
+    context 'with a preexisting table with paritioning' do
+      before(:all) do
+        @previous_value = Dynamoid::Config.partitioning
+        Dynamoid::Config.partitioning = true
+        
+        Dynamoid::Adapter.create_table('dynamoid_tests_TestTable1', :id) unless Dynamoid::Adapter.list_tables.include?('dynamoid_tests_TestTable1')
+        Dynamoid::Adapter.create_table('dynamoid_tests_TestTable2', :id) unless Dynamoid::Adapter.list_tables.include?('dynamoid_tests_TestTable2')
+        Dynamoid::Adapter.create_table('dynamoid_tests_TestTable3', :id, :range_key => { :range => :number }) unless Dynamoid::Adapter.list_tables.include?('dynamoid_tests_TestTable3')
+      end
+
+      after(:all) do
+        Dynamoid::Config.partitioning = @previous_value
+      end
+
+      # Query
+      it 'performs query on a table and returns items' do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '1.1', :name => 'Josh'})
+
+        Dynamoid::Adapter.query('dynamoid_tests_TestTable1', :hash_value => '1').first.should == { :id=> '1', :name=>"Josh" }
+      end
+
+      it 'performs query on a table and returns items if there are multiple items' do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '1.1', :name => 'Josh'})
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '2.1', :name => 'Justin'})
+
+        Dynamoid::Adapter.query('dynamoid_tests_TestTable1', :hash_value => '1').first.should == { :id=> '1', :name=>"Josh" }
+      end
+
+      context 'range queries' do
+        before do
+          Dynamoid::Adapter.put_item('dynamoid_tests_TestTable3', {:id => '1.1', :range => 1.0})
+          Dynamoid::Adapter.put_item('dynamoid_tests_TestTable3', {:id => '1.1', :range => 3.0})
+        end
+
+        it 'performs query on a table with a range and selects items in a range' do
+          Dynamoid::Adapter.query('dynamoid_tests_TestTable3', :hash_value => '1', :range_value => 0.0..3.0).should =~ [{:id => '1', :range => BigDecimal.new(1)}, {:id => '1', :range => BigDecimal.new(3)}]
+        end
+
+        it 'performs query on a table with a range and selects items greater than' do
+          Dynamoid::Adapter.query('dynamoid_tests_TestTable3', :hash_value => '1', :range_greater_than => 1.0).should =~ [{:id => '1', :range => BigDecimal.new(3)}]
+        end
+
+        it 'performs query on a table with a range and selects items less than' do
+          Dynamoid::Adapter.query('dynamoid_tests_TestTable3', :hash_value => '1', :range_less_than => 2.0).should =~ [{:id => '1', :range => BigDecimal.new(1)}]
+        end
+
+        it 'performs query on a table with a range and selects items gte' do
+          Dynamoid::Adapter.query('dynamoid_tests_TestTable3', :hash_value => '1', :range_gte => 1.0).should =~ [{:id => '1', :range => BigDecimal.new(1)}, {:id => '1', :range => BigDecimal.new(3)}]
+        end
+
+        it 'performs query on a table with a range and selects items lte' do
+          Dynamoid::Adapter.query('dynamoid_tests_TestTable3', :hash_value => '1', :range_lte => 3.0).should =~ [{:id => '1', :range => BigDecimal.new(1)}, {:id => '1', :range => BigDecimal.new(3)}]
+        end
+      end
+
+      # Scan
+      it 'performs scan on a table and returns items' do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '1.1', :name => 'Josh'})
+
+        Dynamoid::Adapter.scan('dynamoid_tests_TestTable1', :name => 'Josh').should == [{ :id=> '1', :name=>"Josh" }]
+      end
+
+      it 'performs scan on a table and returns items if there are multiple items but only one match' do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '1.1', :name => 'Josh'})
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '2.1', :name => 'Justin'})
+
+        Dynamoid::Adapter.scan('dynamoid_tests_TestTable1', :name => 'Josh').should == [{ :id=> '1', :name=>"Josh" }]
+      end
+
+      it 'performs scan on a table and returns multiple items if there are multiple matches' do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '1.1', :name => 'Josh'})
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '2.1', :name => 'Josh'})
+
+        Dynamoid::Adapter.scan('dynamoid_tests_TestTable1', :name => 'Josh').should include({:name=>"Josh", :id=>"2"}, {:name=>"Josh", :id=>"1"})
+      end
+
+      it 'performs scan on a table and returns all items if no criteria are specified' do
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '1.1', :name => 'Josh'})
+        Dynamoid::Adapter.put_item('dynamoid_tests_TestTable1', {:id => '2.1', :name => 'Josh'})
+
+        Dynamoid::Adapter.scan('dynamoid_tests_TestTable1', {}).should include({:name=>"Josh", :id=>"2"}, {:name=>"Josh", :id=>"1"})
+      end
+    end
 
     # DescribeTable
 

data/spec/dynamoid/adapter_spec.rb

@@ -42,6 +42,18 @@ describe "Dynamoid::Adapter" do
       Dynamoid::Adapter.read('dynamoid_tests_TestTable', ['1', '2'])
     end
     
+    it 'delete through the adapter for one ID' do
+      Dynamoid::Adapter.expects(:delete_item).with('dynamoid_tests_TestTable', '123', {}).returns(nil)
+
+      Dynamoid::Adapter.delete('dynamoid_tests_TestTable', '123')
+    end
+    
+    it 'deletes through the adapter for many IDs' do
+      Dynamoid::Adapter.expects(:batch_delete_item).with({'dynamoid_tests_TestTable' => ['1', '2']}).returns(nil)
+
+      Dynamoid::Adapter.delete('dynamoid_tests_TestTable', ['1', '2'])
+    end
+    
     it 'reads through the adapter for one ID and a range key' do
       Dynamoid::Adapter.expects(:get_item).with('dynamoid_tests_TestTable', '123', :range_key => 2.0).returns(true)
 
@@ -53,6 +65,18 @@ describe "Dynamoid::Adapter" do
 
       Dynamoid::Adapter.read('dynamoid_tests_TestTable', ['1', '2'], :range_key => 2.0)
     end
+    
+    it 'deletes through the adapter for one ID and a range key' do
+      Dynamoid::Adapter.expects(:delete_item).with('dynamoid_tests_TestTable', '123', :range_key => 2.0).returns(nil)
+
+      Dynamoid::Adapter.delete('dynamoid_tests_TestTable', '123', :range_key => 2.0)      
+    end
+    
+    it 'deletes through the adapter for many IDs and a range key' do
+      Dynamoid::Adapter.expects(:batch_delete_item).with({'dynamoid_tests_TestTable' => [['1', 2.0], ['2', 2.0]]}).returns(nil)
+
+      Dynamoid::Adapter.delete('dynamoid_tests_TestTable', ['1', '2'], :range_key => [2.0,2.0])
+    end
   end
   
   context 'with partitioning' do
@@ -109,9 +133,38 @@ describe "Dynamoid::Adapter" do
       @time = DateTime.now
       @array =[{:id => '1.0', :updated_at => @time - 6.hours}, {:id => '1.1', :updated_at => @time - 3.hours}, {:id => '1.2', :updated_at => @time - 1.hour}, {:id => '1.3', :updated_at => @time - 6.hours}, {:id => '2.0', :updated_at => @time}]
     
-      Dynamoid::Adapter.result_for_partition(@array).should =~ [{:id => '1', :updated_at => @time - 1.hour}, {:id => '2', :updated_at => @time}]
+      Dynamoid::Adapter.result_for_partition(@array,"dynamoid_tests_TestTable").should =~ [{:id => '1', :updated_at => @time - 1.hour}, {:id => '2', :updated_at => @time}]
     end
     
+    it 'returns a valid original id and partition number' do
+      @id = "12345.387327.-sdf3"
+      @partition_number = "4"
+      Dynamoid::Adapter.get_original_id_and_partition("#{@id}.#{@partition_number}").should == [@id, @partition_number]
+    end
+    
+    it 'delete through the adapter for one ID' do
+      Dynamoid::Adapter.expects(:batch_delete_item).with('dynamoid_tests_TestTable' => (0...Dynamoid::Config.partition_size).collect{|n| "123.#{n}"}).returns(nil)
+
+      Dynamoid::Adapter.delete('dynamoid_tests_TestTable', '123')
+    end
+    
+    it 'deletes through the adapter for many IDs' do
+      Dynamoid::Adapter.expects(:batch_delete_item).with('dynamoid_tests_TestTable' => (0...Dynamoid::Config.partition_size).collect{|n| "1.#{n}"} + (0...Dynamoid::Config.partition_size).collect{|n| "2.#{n}"}).returns(nil)
+
+      Dynamoid::Adapter.delete('dynamoid_tests_TestTable', ['1', '2'])
+    end
+    
+    it 'deletes through the adapter for one ID and a range key' do
+      Dynamoid::Adapter.expects(:batch_delete_item).with('dynamoid_tests_TestTable' => (0...Dynamoid::Config.partition_size).collect{|n| ["123.#{n}", 2.0]}).returns(nil)
+
+      Dynamoid::Adapter.delete('dynamoid_tests_TestTable', '123', :range_key => 2.0)      
+    end
+    
+    it 'deletes through the adapter for many IDs and a range key' do
+      Dynamoid::Adapter.expects(:batch_delete_item).with('dynamoid_tests_TestTable' => (0...Dynamoid::Config.partition_size).collect{|n| ["1.#{n}", 2.0]} + (0...Dynamoid::Config.partition_size).collect{|n| ["2.#{n}", 2.0]}).returns(nil)
+
+      Dynamoid::Adapter.delete('dynamoid_tests_TestTable', ['1', '2'], :range_key => [2.0,2.0])
+    end
   end
 
 end

data/spec/dynamoid/criteria/chain_spec.rb

@@ -136,5 +136,29 @@ describe "Dynamoid::Associations::Chain" do
       @chain.send(:records_with_range).should == [@tweet3]
     end
   end
+  
+  context 'destroy alls' do
+    before do
+      @tweet1 = Tweet.create(:tweet_id => "x", :group => "one")
+      @tweet2 = Tweet.create(:tweet_id => "x", :group => "two")
+      @tweet3 = Tweet.create(:tweet_id => "xx", :group => "two")
+      @chain = Dynamoid::Criteria::Chain.new(Tweet)
+    end
+    
+    it 'destroys tweet with a range simple range query' do
+      @chain.query = { :tweet_id => "x" }
+      @chain.all.size.should == 2
+      @chain.destroy_all
+      @chain.consistent.all.size.should == 0
+    end
+
+    it 'deletes one specific tweet with range' do
+      @chain = Dynamoid::Criteria::Chain.new(Tweet)
+      @chain.query = { :tweet_id => "xx", :group => "two" }
+      @chain.all.size.should == 1
+      @chain.destroy_all
+      @chain.consistent.all.size.should == 0
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adept_dynamoid
 version: !ruby/object:Gem::Version
-  version: 0.5.0.8
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -240,6 +240,7 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- adept_dynamoid.gemspec
 - doc/.nojekyll
 - doc/Dynamoid.html
 - doc/Dynamoid/Adapter.html
@@ -362,6 +363,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 108672444036973826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -375,4 +379,3 @@ signing_key:
 specification_version: 3
 summary: Dynamoid is an ORM for Amazon's DynamoDB
 test_files: []
-has_rdoc: