dm-ambition 1.0.0 → 1.1.0.rc1

data/spec/public/collection_spec.rb

@@ -18,32 +18,97 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
         property :admin, Boolean, :default => false
       end
 
-      if DataMapper.respond_to?(:auto_migrate!)
-        DataMapper.auto_migrate!
-      end
+      @model = User
     end
 
-    before :all do
-      @repository = DataMapper.repository(:default)
-      @model      = User
-      @query      = DataMapper::Query.new(@repository, @model)
+    supported_by :all do
+      before :all do
+        @query = DataMapper::Query.new(@repository, @model)
 
-      @user  = @model.create(:name => 'Dan Kubb', :admin => true)
-      @other = @model.create(:name => 'Sam Smoot')
+        @user  = @model.create(:name => 'Dan Kubb', :admin => true)
+        @other = @model.create(:name => 'Sam Smoot')
 
-      @subject = @model.all(@query)
-      @subject.to_a if loaded
-    end
+        @subject = @model.all(@query)
+        @subject.to_a if loaded
+      end
+
+      it_should_behave_like 'it has public filter methods'
+
+      unless loaded
+        [ :select, :find_all ].each do |method|
+          describe "##{method}", '(unloaded)' do
+            context 'when matching resource prepended' do
+              before :all do
+                @other.update(:admin => true)
+                @subject.unshift(@other)
+                @return = @subject.send(method) { |u| u.admin == true }
+              end
+
+              it 'should return a Collection' do
+                @return.should be_kind_of(DataMapper::Collection)
+              end
+
+              it 'should not return self' do
+                @return.should_not equal(@subject)
+              end
+
+              it 'should not be a kicker' do
+                @return.should_not be_loaded
+              end
+
+              it 'should return expected values' do
+                @return.should == [ @other, @user ]
+              end
+
+              it 'should include the exact prepended resource' do
+                @return.first.should equal(@other)
+              end
+
+              it "should return the same as Array##{method}" do
+                @return.should == @subject.to_a.send(method) { |u| u.admin == true }
+              end
+            end
+
+            context 'when matching resource appended' do
+              before :all do
+                @other.update(:admin => true)
+                @subject << @other
+                @return = @subject.send(method) { |u| u.admin == true }
+              end
+
+              it 'should return a Collection' do
+                @return.should be_kind_of(DataMapper::Collection)
+              end
+
+              it 'should not return self' do
+                @return.should_not equal(@subject)
+              end
+
+              it 'should not be a kicker' do
+                @return.should_not be_loaded
+              end
+
+              it 'should return expected values' do
+                @return.should == [ @user, @other ]
+              end
 
-    it_should_behave_like 'it has public filter methods'
+              it 'should include the exact appended resource' do
+                @return.last.should equal(@other)
+              end
 
-    unless loaded || Gem::Version.new(DataMapper::VERSION) < Gem::Version.new('0.10')
-      [ :select, :find_all ].each do |method|
-        describe "##{method}", '(unloaded)' do
-          describe 'when matching resource prepended' do
+              it "should return the same as Array##{method}" do
+                @return.should == @subject.to_a.send(method) { |u| u.admin == true }
+              end
+            end
+          end
+        end
+
+        describe '#reject', '(unloaded)' do
+          context 'when matching resource prepended' do
             before :all do
+              @other.update(:admin => true)
               @subject.unshift(@other)
-              @return = @subject.send(method) { |u| u.admin == true }
+              @return = @subject.reject { |u| u.admin != true }
             end
 
             it 'should return a Collection' do
@@ -59,14 +124,23 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
             end
 
             it 'should return expected values' do
-              @return.should == [ @user ]
+              @return.should == [ @other, @user ]
+            end
+
+            it 'should include the exact prepended resource' do
+              @return.first.should equal(@other)
+            end
+
+            it 'should return the same as Array#reject' do
+              @return.should == @subject.to_a.reject { |u| u.admin != true }
             end
           end
 
-          describe 'when matching resource appended' do
+          context 'when matching resource appended' do
             before :all do
+              @other.update(:admin => true)
               @subject << @other
-              @return = @subject.send(method) { |u| u.admin == true }
+              @return = @subject.reject { |u| u.admin != true }
             end
 
             it 'should return a Collection' do
@@ -82,56 +156,16 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
             end
 
             it 'should return expected values' do
-              @return.should == [ @user ]
+              @return.should == [ @user, @other ]
             end
-          end
-        end
-      end
-
-      describe '#reject', '(unloaded)' do
-        describe 'when matching resource prepended' do
-          before :all do
-            @subject.unshift(@other)
-            @return = @subject.reject { |u| u.admin != true }
-          end
 
-          it 'should return a Collection' do
-            @return.should be_kind_of(DataMapper::Collection)
-          end
-
-          it 'should not return self' do
-            @return.should_not equal(@subject)
-          end
-
-          it 'should not be a kicker' do
-            @return.should_not be_loaded
-          end
-
-          it 'should return expected values' do
-            @return.should == [ @user ]
-          end
-        end
-
-        describe 'when matching resource appended' do
-          before :all do
-            @subject << @other
-            @return = @subject.reject { |u| u.admin != true }
-          end
-
-          it 'should return a Collection' do
-            @return.should be_kind_of(DataMapper::Collection)
-          end
-
-          it 'should not return self' do
-            @return.should_not equal(@subject)
-          end
-
-          it 'should not be a kicker' do
-            @return.should_not be_loaded
-          end
+            it 'should include the exact appended resource' do
+              @return.last.should equal(@other)
+            end
 
-          it 'should return expected values' do
-            @return.should == [ @user ]
+            it 'should return the same as Array#reject' do
+              @return.should == @subject.to_a.reject { |u| u.admin != true }
+            end
           end
         end
       end

data/spec/public/model_spec.rb

@@ -15,20 +15,17 @@ describe DataMapper::Ambition::Model do
       property :admin, Boolean, :default => false
     end
 
-    if DataMapper.respond_to?(:auto_migrate!)
-      DataMapper.auto_migrate!
-    end
+    @model      = User
   end
 
-  before :all do
-    @repository = DataMapper.repository(:default)
-    @model      = User
+  supported_by :all do
+    before :all do
+      @user  = @model.create(:name => 'Dan Kubb', :admin => true)
+      @other = @model.create(:name => 'Sam Smoot')
 
-    @user  = @model.create(:name => 'Dan Kubb', :admin => true)
-    @other = @model.create(:name => 'Sam Smoot')
+      @subject = @model
+    end
 
-    @subject = @model
+    it_should_behave_like 'it has public filter methods'
   end
-
-  it_should_behave_like 'it has public filter methods'
 end

data/spec/public/shared/filter_shared_spec.rb

@@ -3,7 +3,7 @@ share_examples_for 'it has public filter methods' do
     it { @subject.should respond_to(method) }
 
     describe "##{method}", ('(loaded)' if loaded) do
-      describe 'with simple conditions' do
+      context 'with simple conditions' do
         before :all do
           @return = @subject.send(method) { |u| u.name == 'Dan Kubb' }
         end
@@ -25,9 +25,13 @@ share_examples_for 'it has public filter methods' do
         it 'should return expected values' do
           @return.should == [ @user ]
         end
+
+        it "should return the same as Array##{method}" do
+          @return.should == @subject.to_a.send(method) { |u| u.name == 'Dan Kubb' }
+        end
       end
 
-      describe 'with OR + AND conditions' do
+      context 'with OR + AND conditions' do
         before :all do
           @return = @subject.send(method) { |u| (u.name == 'Dan Kubb' || u.name == 'Sam Smoot') && u.admin == true }
         end
@@ -49,9 +53,13 @@ share_examples_for 'it has public filter methods' do
         it 'should return expected values' do
           @return.should == [ @user ]
         end
+
+        it "should return the same as Array##{method}" do
+          @return.should == @subject.to_a.send(method) { |u| (u.name == 'Dan Kubb' || u.name == 'Sam Smoot') && u.admin == true }
+        end
       end
 
-      describe 'with AND + OR conditions' do
+      context 'with AND + OR conditions' do
         before :all do
           @return = @subject.send(method) { |u| (u.admin == true && u.name == 'Dan Kubb') || u.name == 'Sam Smoot' }
         end
@@ -73,6 +81,10 @@ share_examples_for 'it has public filter methods' do
         it 'should return expected values' do
           @return.should == [ @user, @other ]
         end
+
+        it "should return the same as Array##{method}" do
+          @return.should == @subject.to_a.send(method) { |u| (u.admin == true && u.name == 'Dan Kubb') || u.name == 'Sam Smoot' }
+        end
       end
     end
   end
@@ -81,7 +93,7 @@ share_examples_for 'it has public filter methods' do
     it { @subject.should respond_to(method) }
 
     describe "##{method}", ('(loaded)' if loaded) do
-      describe 'with simple conditions' do
+      context 'with simple conditions' do
         before :all do
           @return = @subject.send(method) { |u| u.name == 'Dan Kubb' }
         end
@@ -99,9 +111,13 @@ share_examples_for 'it has public filter methods' do
         it 'should return expected value' do
           @return.should == @user
         end
+
+        it "should return the same as Array##{method}" do
+          @return.should == @subject.to_a.send(method) { |u| u.name == 'Dan Kubb' }
+        end
       end
 
-      describe 'with OR + AND conditions' do
+      context 'with OR + AND conditions' do
         before :all do
           @return = @subject.send(method) { |u| (u.name == 'Dan Kubb' || u.name == 'Sam Smoot') && u.admin == true }
         end
@@ -119,9 +135,13 @@ share_examples_for 'it has public filter methods' do
         it 'should return expected value' do
           @return.should == @user
         end
+
+        it "should return the same as Array##{method}" do
+          @return.should == @subject.to_a.send(method) { |u| (u.name == 'Dan Kubb' || u.name == 'Sam Smoot') && u.admin == true }
+        end
       end
 
-      describe 'with AND + OR conditions' do
+      context 'with AND + OR conditions' do
         before :all do
           @return = @subject.send(method) { |u| (u.admin == true && u.name == 'Dan Kubb') || u.name == 'Sam Smoot' }
         end
@@ -139,6 +159,10 @@ share_examples_for 'it has public filter methods' do
         it 'should return expected value' do
           @return.should == @user
         end
+
+        it "should return the same as Array##{method}" do
+          @return.should == @subject.to_a.send(method) { |u| (u.admin == true && u.name == 'Dan Kubb') || u.name == 'Sam Smoot' }
+        end
       end
     end
   end
@@ -146,7 +170,7 @@ share_examples_for 'it has public filter methods' do
   it { @subject.should respond_to(:reject) }
 
   describe '#reject', ('(loaded)' if loaded) do
-    describe 'with simple conditions' do
+    context 'with simple conditions' do
       before :all do
         @return = @subject.reject { |u| u.name != 'Dan Kubb' }
       end
@@ -168,9 +192,13 @@ share_examples_for 'it has public filter methods' do
       it 'should return expected values' do
         @return.should == [ @user ]
       end
+
+      it 'should return the same as Array#reject' do
+        @return.should == @subject.to_a.reject { |u| u.name != 'Dan Kubb' }
+      end
     end
 
-    describe 'with OR + AND conditions' do
+    context 'with OR + AND conditions' do
       before :all do
         @return = @subject.reject { |u| (u.name == 'Dan Kubb' || u.name == 'Sam Smoot') && u.admin == true }
       end
@@ -192,9 +220,13 @@ share_examples_for 'it has public filter methods' do
       it 'should return expected values' do
         @return.should == [ @other ]
       end
+
+      it 'should return the same as Array#reject' do
+        @return.should == @subject.to_a.reject { |u| (u.name == 'Dan Kubb' || u.name == 'Sam Smoot') && u.admin == true }
+      end
     end
 
-    describe 'with AND + OR conditions' do
+    context 'with AND + OR conditions' do
       before :all do
         @return = @subject.reject { |u| (u.admin == true && u.name == 'Dan Kubb') || u.name == 'Sam Smoot' }
       end
@@ -216,6 +248,10 @@ share_examples_for 'it has public filter methods' do
       it 'should return expected values' do
         @return.should == []
       end
+
+      it 'should return the same as Array#reject' do
+        @return.should == @subject.to_a.reject { |u| (u.admin == true && u.name == 'Dan Kubb') || u.name == 'Sam Smoot' }
+      end
     end
   end
 end