Merge pull request #480 from Dynamoid/revise-methods-delerated-to-chain

Repair Model .consistent/.delete_all/.destroy_all calls

Author: andrykonchin

README.md

@@ -126,7 +126,7 @@ end
 Dynamoid supports Ruby >= 2.3 and Rails >= 4.2.
 
 Its compatibility is tested against following Ruby versions: 2.3, 2.4,
-2.5 and 2.6, JRuby 9.2.8.0 and against Rails versions: 4.2, 5.0, 5.1,
+2.5, 2.6 and 2.7, JRuby 9.2.8.0 and against Rails versions: 4.2, 5.0, 5.1,
 5.2 and 6.0.
 
 ## Setup
@@ -614,7 +614,7 @@ well.
 
 ### Dirty API
 
-Dynamoid supports Dirty API which equivalents to [Rails 5.2
+Dynamoid supports Dirty API which is equivalent to [Rails 5.2
 `ActiveModel::Dirty`](https://api.rubyonrails.org/v5.2/classes/ActiveModel/Dirty.html).
 There is only one limitation - change in place of field isn't detected
 automatically.

bin/console

@@ -11,5 +11,12 @@ require 'dynamoid'
 # require "pry"
 # Pry.start
 
+Dynamoid.configure do |config|
+  config.access_key = 'REPLACE_WITH_ACCESS_KEY_ID'
+  config.secret_key = 'REPLACE_WITH_SECRET_ACCESS_KEY'
+  config.region = 'us-west-2'
+  config.endpoint = 'http://localhost:8000'
+end
+
 require 'irb'
 IRB.start

lib/dynamoid/criteria.rb

@@ -9,7 +9,7 @@ module Criteria
 
     # @private
     module ClassMethods
-      %i[where all first last each record_limit scan_limit batch start scan_index_forward find_by_pages project pluck].each do |meth|
+      %i[where consistent all first last delete_all destroy_all each record_limit scan_limit batch start scan_index_forward find_by_pages project pluck].each do |meth|
         # Return a criteria chain in response to a method that will begin or end a chain. For more information,
         # see Dynamoid::Criteria::Chain.
         #

spec/dynamoid/criteria_new_spec.rb

@@ -0,0 +1,182 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Dynamoid::Criteria do
+  it 'supports querying with .where method' do
+    klass = new_class do
+      field :name
+    end
+
+    objects = klass.create([{ name: 'Alex' }, { name: 'Bob' }, { name: 'Alex' }])
+    expect(klass.where(name: 'Alex')).to contain_exactly(objects[0], objects[2])
+  end
+
+  it 'supports querying with .all method' do
+    klass = new_class do
+      field :name
+    end
+
+    objects = klass.create([{ name: 'Alex' }, { name: 'Bob' }])
+    expect(klass.all).to match_array(objects)
+  end
+
+  it 'supports querying with .first method' do
+    klass = new_class do
+      range :name
+    end
+
+    object = klass.create(name: 'Alex')
+    expect(klass.first).to eq object
+  end
+
+  it 'supports querying with .last method' do
+    klass = new_class do
+      range :name
+    end
+
+    object = klass.create(name: 'Alex')
+    expect(klass.last).to eq object
+  end
+
+  it 'supports querying with .each method' do
+    klass = new_class do
+      range :name
+    end
+
+    result = []
+    objects = klass.create([{ name: 'Alex' }, { name: 'Bob' }])
+    klass.each { |obj| result << obj }
+
+    expect(result).to match_array(objects)
+  end
+
+  it 'supports querying with .record_limit method' do
+    klass = new_class do
+      field :name
+    end
+
+    objects = klass.create([{ name: 'Alex' }, { name: 'Bob' }])
+    actual = klass.record_limit(1).all.to_a
+
+    expect(actual.size).to eq 1
+    expect(actual[0]).to satisfy { |v| v.name == 'Alex' || v.name == 'Bob' }
+  end
+
+  it 'supports querying with .scan_limit method' do
+    klass = new_class do
+      field :name
+    end
+
+    objects = klass.create([{ name: 'Alex' }, { name: 'Bob' }])
+    actual = klass.scan_limit(1).all.to_a
+
+    expect(actual.size).to eq 1
+    expect(actual[0]).to satisfy { |v| v.name == 'Alex' || v.name == 'Bob' }
+  end
+
+  it 'supports querying with .batch method' do
+    klass = new_class do
+      field :name
+    end
+
+    objects = klass.create([{ name: 'Alex' }, { name: 'Bob' }, { name: 'Alex' }])
+    expect(klass.batch(2).all).to match_array(objects)
+  end
+
+  it 'supports querying with .start method' do
+    klass = new_class do
+      table key: :age
+      range :name
+      field :age, :integer
+    end
+
+    objects = klass.create([{ age: 20, name: 'Alex' }, { age: 20, name: 'Bob' }, { age: 20, name: 'Michael' }])
+
+    actual = klass.start(objects[0]).all.to_a
+    expect(actual).to eq objects[1..2]
+  end
+
+  it 'supports querying with .scan_index_forward method' do
+    klass = new_class do
+      table key: :age
+      range :name
+      field :age, :integer
+    end
+
+    objects = klass.create([{ age: 20, name: 'Alex' }, { age: 20, name: 'Bob' }, { age: 20, name: 'Michael' }])
+
+    # force Query with age: 20 partition key condition
+    actual = klass.scan_index_forward(true).where(age: 20).all.to_a
+    expect(actual).to eq objects
+
+    # force Query with age: 20 partition key condition
+    actual = klass.scan_index_forward(false).where(age: 20).all.to_a
+    expect(actual).to eq objects.reverse
+  end
+
+  it 'supports querying with .find_by_pages method' do
+    klass = new_class
+    objects = klass.create([{}, {}, {}])
+
+    pages = []
+    klass.find_by_pages do |models, options|
+      pages << models  # actually there is only one page
+    end
+
+    expect(pages.flatten).to match_array(objects)
+  end
+
+  it 'supports querying with .project method' do
+    klass = new_class do
+      field :age, :integer
+      field :name, :string
+    end
+    klass.create(age: 20, name: 'Alex')
+
+    objects_with_name = klass.project(:name).to_a
+    expect(objects_with_name.size).to eq 1
+
+    object_with_name = objects_with_name[0]
+    expect(object_with_name.name).to eq 'Alex'
+    expect(object_with_name.age).to eq nil
+  end
+
+  it 'supports querying with .pluck method' do
+    klass = new_class do
+      field :age, :integer
+      field :name, :string
+    end
+
+    klass.create([{ age: 20, name: 'Alex' }, { age: 20, name: 'Bob' }])
+    expect(klass.pluck(:name)).to contain_exactly('Alex', 'Bob')
+  end
+
+  it 'supports querying with .consistent method' do
+    klass = new_class do
+      field :age, :integer
+    end
+
+    objects = klass.create([{ age: 20 }, { age: 30 }])
+    actual = klass.consistent.all.to_a
+    expect(actual).to match_array(objects)
+  end
+
+  it 'supports .delete_all method' do
+    klass = new_class do
+      field :age, :integer
+    end
+
+    objects = klass.create([{ age: 20 }, { age: 30 }])
+    expect { klass.delete_all }.to change { klass.all.to_a.size }.from(2).to(0)
+  end
+
+  it 'supports .destroy_all method' do
+    klass = new_class do
+      field :age, :integer
+    end
+
+    objects = klass.create([{ age: 20 }, { age: 30 }])
+    expect { klass.destroy_all }.to change { klass.all.to_a.size }.from(2).to(0)
+  end
+end

spec/dynamoid/criteria_spec.rb

@@ -2,6 +2,9 @@
 
 require 'spec_helper'
 
+# This file contains legacy specs. They should be revised and moved to the
+# criteria_new_spec.rb file.
+
 describe Dynamoid::Criteria do
   let!(:user1) { User.create(name: 'Josh', email: '[email protected]', admin: true) }
   let!(:user2) { User.create(name: 'Justin', email: '[email protected]', admin: false) }