couch_potato 0.5.6 → 0.5.7

data/CHANGES.md

@@ -1,5 +1,10 @@
 ## Changes
 
+### 0.5.7
+
+* support CouchPotato::Database#first/#first! calls when using `stub_db` from tests (langalex)
+* support RSpec2 block syntax in `stub_db` (langalex)
+
 ### 0.5.6
 
 * remove the stale parameter from a view query if it's nil, as couchdb only allows stale to be ok or update\_after (langalex)

data/README.md

@@ -400,6 +400,7 @@ For stubbing out the database couch potato offers some helpers:
     db.stub_view(Comment, :by_commenter_id).with('23').and_return([:comment1, :comment2])
     
     CouchPotato.database.view(Comment.by_commenter_id('23)) # => [:comment1, :comment2]
+    CouchPotato.database.first(Comment.by_commenter_id('23)) # => :comment1
 
 ##### Testing map/reduce functions
 

data/lib/couch_potato/persistence.rb

@@ -27,6 +27,8 @@ module CouchPotato
         alias_method :id, :_id
         alias_method :id=, :_id=
       end
+      
+      CouchPotato.models << base
     end
 
     # initialize a new instance of the model optionally passing it a hash of attributes.

data/lib/couch_potato/rspec/stub_db.rb

@@ -8,8 +8,9 @@ module CouchPotato::RSpec
         @db = db
       end
     
-      def with(*args)
+      def with(*args, &block)
         @args = args
+        and_return(block.call) if block
         self
       end
 
@@ -19,11 +20,21 @@ module CouchPotato::RSpec
         _stub.with(*@args) if @args
         _stub.and_return(view_stub)
         @db.stub(:view).with(view_stub).and_return(return_value)
+        if return_value.respond_to?(:first)
+          @db.stub(:first).with(view_stub).and_return(return_value.first)
+          if return_value.first
+            @db.stub(:first!).with(view_stub).and_return(return_value.first)
+          else
+            @db.stub(:first!).with(view_stub).and_raise(CouchPotato::NotFound)
+          end
+        end
       end
     end
 
-    def stub_view(clazz, view)
-      ViewStub.new clazz, view, self
+    def stub_view(clazz, view, &block)
+      stub = ViewStub.new clazz, view, self
+      stub.and_return(block.call) if block
+      stub
     end
   end
 

data/lib/couch_potato/version.rb

@@ -1,3 +1,3 @@
 module CouchPotato
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/lib/couch_potato.rb

@@ -13,6 +13,12 @@ module CouchPotato
   Config.split_design_documents_per_view = false
   
   class NotFound < StandardError; end
+  
+  # returns all the classes that implement the CouchPotato::Persistence module
+  def self.models
+    @models ||= []
+    @models
+  end
 
   # Returns a database instance which you can then use to create objects and query views. You have to set the CouchPotato::Config.database_name before this works.
   def self.database

data/spec/unit/couch_potato_spec.rb

@@ -19,6 +19,15 @@ describe CouchPotato, 'full_url_to_database' do
   end
 end
 
+describe CouchPotato, '.models' do
+  it "returns all classes that have implemented CouchPotato::Persistence" do
+    clazz = Class.new
+    clazz.send(:include, CouchPotato::Persistence)
+    
+    CouchPotato.models.should include(clazz)
+  end
+end
+
 describe CouchPotato, 'validation_framework' do
   before(:each) do
     @original_validation_framework = CouchPotato::Config.validation_framework

data/spec/unit/rspec_stub_db_spec.rb

@@ -32,4 +32,35 @@ describe "stubbing a view" do
   it "should stub the database to return fake results when called with the stub" do
     @db.view(WithStubbedView.stubbed_view('123')).should == [:result]
   end
+  
+  it "stubs the database to return the first fake result" do
+    @db.first(WithStubbedView.stubbed_view('123')).should == :result
+    @db.first!(WithStubbedView.stubbed_view('123')).should == :result
+  end
+  
+  it "raises an error if there is no first result" do
+    @db.stub_view(WithStubbedView, :stubbed_view).and_return([])
+    lambda {
+      @db.first!(WithStubbedView.stubbed_view('123'))
+    }.should raise_error(CouchPotato::NotFound)
+  end
+  
+  it "skips stubbing the first view (i.e. doesn't crash) if the fake result does not respond to first" do
+    @db.stub_view(WithStubbedView, :stubbed_view).with('123').and_return(:results)
+    
+    @db.view(WithStubbedView.stubbed_view('123')).should == :results
+  end
+  
+  it "supports the block style return syntax with `with`" do
+    @db.stub_view(WithStubbedView, :stubbed_view).with('123') {:results}
+    
+    @db.view(WithStubbedView.stubbed_view('123')).should == :results
+  end
+  
+  it "supports the block style return syntax without `with`" do
+    @db.stub_view(WithStubbedView, :stubbed_view) {:results}
+    
+    @db.view(WithStubbedView.stubbed_view('123')).should == :results
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: couch_potato
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Alexander Lang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +02:00
+date: 2011-08-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency