cuprum-collections 0.5.1 → 0.6.0.rc.0

data/lib/cuprum/collections/rspec/deferred/collection_examples.rb

@@ -77,7 +77,11 @@ module Cuprum::Collections::RSpec::Deferred
       include_deferred 'should define the command', :validate_one
 
       describe '#==' do
-        let(:other_options)    { { name: } }
+        let(:other_options) do
+          next super() if defined?(super())
+
+          { name: }
+        end
         let(:other_collection) { described_class.new(**other_options) }
 
         describe 'with nil' do
@@ -223,7 +227,9 @@ module Cuprum::Collections::RSpec::Deferred
 
         describe 'with matching entity class as a Class' do
           let(:configured_entity_class) do
-            options.fetch(:default_entity_class, Book)
+            value = options.fetch(:default_entity_class, Book)
+            value = instance_exec(&value) if value.is_a?(Proc)
+            value
           end
           let(:other_options) { { entity_class: configured_entity_class } }
 
@@ -232,7 +238,9 @@ module Cuprum::Collections::RSpec::Deferred
 
         describe 'with matching entity class as a String' do
           let(:configured_entity_class) do
-            options.fetch(:default_entity_class, Book)
+            value = options.fetch(:default_entity_class, Book)
+            value = instance_exec(&value) if value.is_a?(Proc)
+            value
           end
           let(:other_options) do
             { entity_class: configured_entity_class.to_s }
@@ -241,8 +249,14 @@ module Cuprum::Collections::RSpec::Deferred
           it { expect(collection.matches?(**other_options)).to be true }
         end
 
-        describe 'with matching name' do
-          let(:other_options) { { name: } }
+        describe 'with matching name as a String' do
+          let(:other_options) { { name: name.to_s } }
+
+          it { expect(collection.matches?(**other_options)).to be true }
+        end
+
+        describe 'with matching name as a Symbol' do
+          let(:other_options) { { name: name.intern } }
 
           it { expect(collection.matches?(**other_options)).to be true }
         end
@@ -259,8 +273,14 @@ module Cuprum::Collections::RSpec::Deferred
           it { expect(collection.matches?(**other_options)).to be true }
         end
 
-        describe 'with matching qualified name' do
-          let(:other_options) { { qualified_name: name } }
+        describe 'with matching qualified name as a String' do
+          let(:other_options) { { qualified_name: name.to_s } }
+
+          it { expect(collection.matches?(**other_options)).to be true }
+        end
+
+        describe 'with matching qualified name as a Symbol' do
+          let(:other_options) { { qualified_name: name.intern } }
 
           it { expect(collection.matches?(**other_options)).to be true }
         end

data/lib/cuprum/collections/rspec/deferred/commands/assign_one_examples.rb

@@ -77,8 +77,8 @@ module Cuprum::Collections::RSpec::Deferred::Commands
         describe 'with an attributes hash with extra attributes' do
           let(:attributes) do
             {
-              title:     'The Book of Lost Tales',
-              audiobook: true
+              'title'     => 'The Book of Lost Tales',
+              'audiobook' => true
             }
           end
 
@@ -143,8 +143,8 @@ module Cuprum::Collections::RSpec::Deferred::Commands
           describe 'with an attributes hash with extra attributes' do
             let(:attributes) do
               {
-                title:     'The Book of Lost Tales',
-                audiobook: true
+                'title'     => 'The Book of Lost Tales',
+                'audiobook' => true
               }
             end
 

data/lib/cuprum/collections/rspec/deferred/commands/build_one_examples.rb

@@ -62,8 +62,8 @@ module Cuprum::Collections::RSpec::Deferred::Commands
         describe 'with an attributes hash with extra attributes' do
           let(:attributes) do
             {
-              title:     'The Book of Lost Tales',
-              audiobook: true
+              'title'     => 'The Book of Lost Tales',
+              'audiobook' => true
             }
           end
 

data/lib/cuprum/collections/rspec/deferred/commands/destroy_one_examples.rb

@@ -35,7 +35,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
             Cuprum::Collections::Errors::NotFound.new(
               attribute_name:  collection.primary_key_name,
               attribute_value: primary_key,
-              collection_name: collection.name,
+              name:            collection.name,
               primary_key:     true
             )
           end
@@ -69,7 +69,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
               Cuprum::Collections::Errors::NotFound.new(
                 attribute_name:  collection.primary_key_name,
                 attribute_value: primary_key,
-                collection_name: collection.name,
+                name:            collection.name,
                 primary_key:     true
               )
             end

data/lib/cuprum/collections/rspec/deferred/commands/find_many_examples.rb

@@ -67,7 +67,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
                 Cuprum::Collections::Errors::NotFound.new(
                   attribute_name:  collection.primary_key_name,
                   attribute_value: primary_key,
-                  collection_name: collection.name,
+                  name:            collection.name,
                   primary_key:     true
                 )
               end
@@ -112,7 +112,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
                   Cuprum::Collections::Errors::NotFound.new(
                     attribute_name:  collection.primary_key_name,
                     attribute_value: primary_key,
-                    collection_name: collection.name,
+                    name:            collection.name,
                     primary_key:     true
                   )
                 end
@@ -140,7 +140,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
                   Cuprum::Collections::Errors::NotFound.new(
                     attribute_name:  collection.primary_key_name,
                     attribute_value: primary_key,
-                    collection_name: collection.name,
+                    name:            collection.name,
                     primary_key:     true
                   )
                 end
@@ -183,7 +183,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
                     Cuprum::Collections::Errors::NotFound.new(
                       attribute_name:  collection.primary_key_name,
                       attribute_value: primary_key,
-                      collection_name: collection.name,
+                      name:            collection.name,
                       primary_key:     true
                     )
                   end
@@ -211,7 +211,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
                     Cuprum::Collections::Errors::NotFound.new(
                       attribute_name:  collection.primary_key_name,
                       attribute_value: primary_key,
-                      collection_name: collection.name,
+                      name:            collection.name,
                       primary_key:     true
                     )
                   end

data/lib/cuprum/collections/rspec/deferred/commands/find_matching_examples.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'cuprum/collections/rspec/contracts/query_contracts'
 require 'cuprum/collections/rspec/deferred/command_examples'
 require 'cuprum/collections/rspec/deferred/commands'
+require 'cuprum/collections/rspec/deferred/query_examples'
 
 module Cuprum::Collections::RSpec::Deferred::Commands
   # Namespace for deferred example groups for validating FindMatching commands.
@@ -11,8 +11,8 @@ module Cuprum::Collections::RSpec::Deferred::Commands
 
     deferred_examples 'should implement the FindMatching command' do
       describe '#call' do
-        include Cuprum::Collections::RSpec::Contracts::QueryContracts
         include Cuprum::Collections::RSpec::Deferred::CommandExamples
+        include Cuprum::Collections::RSpec::Deferred::QueryExamples
 
         shared_examples 'should return the matching items' do
           it { expect(result).to be_a_passing_result }
@@ -59,7 +59,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
           defined?(super()) ? super() : matching_data
         end
 
-        def call_command
+        define_method :call_command do
           command.call(**options, &block)
         end
 
@@ -98,11 +98,21 @@ module Cuprum::Collections::RSpec::Deferred::Commands
         end
 
         describe 'with an invalid where value' do
-          let(:options) { super().merge(where: Object.new.freeze) }
+          describe 'with an object' do
+            let(:options) { super().merge(where: Object.new.freeze) }
 
-          include_deferred 'should validate the parameter',
-            :where,
-            message: 'where is not a scope or query hash'
+            include_deferred 'should validate the parameter',
+              :where,
+              message: 'where is not a scope or query hash'
+          end
+
+          describe 'with an Proc with invalid arity' do
+            let(:options) { super().merge(where: ->(_a, _b = nil) {}) }
+
+            include_deferred 'should validate the parameter',
+              :where,
+              message: 'where is not a scope or query hash'
+          end
         end
 
         describe 'with an invalid filter block' do
@@ -127,13 +137,36 @@ module Cuprum::Collections::RSpec::Deferred::Commands
         context 'when the collection has many items' do
           let(:data) { fixtures_data }
 
-          include_contract 'should query the collection' do
-            include_examples 'should return the matching items'
+          context 'when passed a scope as a block' do
+            include_deferred 'should query the collection' do
+              include_examples 'should return the matching items'
+
+              describe 'with envelope: true' do
+                let(:options) { super().merge(envelope: true) }
+
+                include_examples 'should return the wrapped items'
+              end
+            end
+          end
+
+          context 'when passed a scope as a proc' do
+            let(:options) do
+              opts = super()
+
+              opts[:where] = filter unless filter.nil?
+
+              opts
+            end
+            let(:block) { nil }
+
+            include_deferred 'should query the collection' do
+              include_examples 'should return the matching items'
 
-            describe 'with envelope: true' do
-              let(:options) { super().merge(envelope: true) }
+              describe 'with envelope: true' do
+                let(:options) { super().merge(envelope: true) }
 
-              include_examples 'should return the wrapped items'
+                include_examples 'should return the wrapped items'
+              end
             end
           end
         end

data/lib/cuprum/collections/rspec/deferred/commands/find_one_examples.rb

@@ -46,7 +46,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
             Cuprum::Collections::Errors::NotFound.new(
               attribute_name:  collection.primary_key_name,
               attribute_value: primary_key,
-              collection_name: collection.name,
+              name:            collection.name,
               primary_key:     true
             )
           end
@@ -74,7 +74,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
               Cuprum::Collections::Errors::NotFound.new(
                 attribute_name:  collection.primary_key_name,
                 attribute_value: primary_key,
-                collection_name: collection.name,
+                name:            collection.name,
                 primary_key:     true
               )
             end

data/lib/cuprum/collections/rspec/deferred/commands/insert_one_examples.rb

@@ -81,7 +81,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
                 primary_key_name.to_s,
                 attributes[primary_key_name.intern]
               ),
-              collection_name: collection.name,
+              name:            collection.name,
               primary_key:     true
             )
           end

data/lib/cuprum/collections/rspec/deferred/commands/update_one_examples.rb

@@ -52,7 +52,7 @@ module Cuprum::Collections::RSpec::Deferred::Commands
                 primary_key_name.to_s,
                 attributes[primary_key_name.intern]
               ),
-              collection_name: collection.name,
+              name:            collection.name,
               primary_key:     true
             )
           end