couchrest_model 2.1.0.rc1 → 2.2.0.beta1

data/spec/unit/design_spec.rb

@@ -31,11 +31,11 @@ describe CouchRest::Model::Design do
 
     describe ".method_name" do
       it "should return standard method name" do
-        @klass.method_name.should eql('design_doc')
+        expect(@klass.method_name).to eql('design_doc')
       end
 
       it "should add prefix to standard method name" do
-        @klass.method_name('stats').should eql('stats_design_doc')
+        expect(@klass.method_name('stats')).to eql('stats_design_doc')
       end
     end
 
@@ -45,23 +45,23 @@ describe CouchRest::Model::Design do
 
     before :each do
       @model = double("ModelExample")
-      @model.stub(:to_s).and_return("ModelExample")
+      allow(@model).to receive(:to_s).and_return("ModelExample")
       @obj = CouchRest::Model::Design.new(@model)
     end
 
 
     describe "initialisation without prefix" do
       it "should associate model and set method name" do
-        @obj.model.should eql(@model)
-        @obj.method_name.should eql("design_doc")
+        expect(@obj.model).to eql(@model)
+        expect(@obj.method_name).to eql("design_doc")
       end
 
       it "should generate correct id" do
-        @obj['_id'].should eql("_design/ModelExample")
+        expect(@obj['_id']).to eql("_design/ModelExample")
       end
 
       it "should apply defaults" do
-        @obj['language'].should eql('javascript')
+        expect(@obj['language']).to eql('javascript')
       end
     end
 
@@ -69,13 +69,13 @@ describe CouchRest::Model::Design do
 
       it "should associate model and set method name" do
         @obj = CouchRest::Model::Design.new(@model, 'stats')
-        @obj.model.should eql(@model)
-        @obj.method_name.should eql("stats_design_doc")
+        expect(@obj.model).to eql(@model)
+        expect(@obj.method_name).to eql("stats_design_doc")
       end
 
       it "should generate correct id with prefix" do
         @obj = CouchRest::Model::Design.new(@model, 'stats')
-        @obj['_id'].should eql("_design/ModelExample_stats")
+        expect(@obj['_id']).to eql("_design/ModelExample_stats")
       end
 
     end
@@ -86,7 +86,7 @@ describe CouchRest::Model::Design do
 
       it "should skip if auto update disabled" do
         @obj.auto_update = false
-        @obj.should_not_receive(:sync!)
+        expect(@obj).not_to receive(:sync!)
         @obj.sync
       end
 
@@ -110,28 +110,28 @@ describe CouchRest::Model::Design do
           # This would fail if changes were not detected!
           @doc.sync
           doc = @db.get(@doc['_id'])
-          doc['views']['all']['map'].should eql(@doc['views']['all']['map'])
+          expect(doc['views']['all']['map']).to eql(@doc['views']['all']['map'])
         end
 
         it "should not save a design that is not in cache and has not changed" do
           @doc.sync # put doc in cache
           @doc.send(:set_cache_checksum, @doc.database, nil)
 
-          @db.should_not_receive(:save_doc)
-          @doc.should_receive(:set_cache_checksum)
+          expect(@db).not_to receive(:save_doc)
+          expect(@doc).to receive(:set_cache_checksum)
           @doc.sync
         end
 
         it "should not reload a design that is in cache and has not changed" do
           @doc.sync
-          @doc.should_not_receive(:load_from_database)
+          expect(@doc).not_to receive(:load_from_database)
           @doc.sync
         end
 
         it "should be re-created if database destroyed" do
           @doc.sync  # saved
           reset_test_db!
-          @db.should_receive(:save_doc).with(@doc)
+          expect(@db).to receive(:save_doc).with(@doc)
           @doc.sync
         end
 
@@ -142,8 +142,8 @@ describe CouchRest::Model::Design do
           @db.save_doc(doc)
           @doc.send(:set_cache_checksum, @doc.database, nil)
           @doc.sync
-          @doc['views'].should_not have_key('test')
-          @doc['_rev'].should be_nil
+          expect(@doc['views']).not_to have_key('test')
+          expect(@doc['_rev']).to be_nil
         end
 
         it "should save a non existant design" do
@@ -155,8 +155,8 @@ describe CouchRest::Model::Design do
           @db.delete_doc(doc) if doc
           @doc.sync!
           doc = @db.get(@doc['_id'])
-          doc.should_not be_nil
-          doc['views']['all'].should eql(@doc['views']['all'])
+          expect(doc).not_to be_nil
+          expect(doc['views']['all']).to eql(@doc['views']['all'])
         end
 
       end
@@ -172,19 +172,19 @@ describe CouchRest::Model::Design do
       end
 
       it "should return fresh checksum when not calculated earlier" do
-        @doc.checksum.should_not be_blank
+        expect(@doc.checksum).not_to be_blank
       end
 
       it "should provide same checksum without refresh on re-request" do
         chk = @doc.checksum
-        @doc.should_not_receive(:checksum!)
-        @doc.checksum.should eql(chk)
+        expect(@doc).not_to receive(:checksum!)
+        expect(@doc.checksum).to eql(chk)
       end
 
       it "should provide new checksum if the design has changed" do
         chk = @doc.checksum
         @doc['views']['all']['map'] += '// comment'
-        @doc.checksum.should_not eql(chk)
+        expect(@doc.checksum).not_to eql(chk)
       end
 
     end
@@ -193,7 +193,7 @@ describe CouchRest::Model::Design do
       it "should provide model's database" do
         @mod = DesignSampleModel
         @doc = @mod.design_doc
-        @mod.should_receive(:database)
+        expect(@mod).to receive(:database)
         @doc.database
       end
     end
@@ -202,13 +202,13 @@ describe CouchRest::Model::Design do
     describe "#uri" do
       it "should provide complete url" do
         @doc = DesignSampleModel.design_doc
-        @doc.uri.should eql("#{DesignSampleModel.database.root}/_design/DesignSampleModel")
+        expect(@doc.uri).to eql("#{DesignSampleModel.database.root}/_design/DesignSampleModel")
       end
     end
 
     describe "#view" do
       it "should instantiate a new view and pass options" do
-        CouchRest::Model::Designs::View.should_receive(:new).with(@obj, @model, {}, 'by_test')
+        expect(CouchRest::Model::Designs::View).to receive(:new).with(@obj, @model, {}, 'by_test')
         @obj.view('by_test', {})
       end
     end
@@ -216,7 +216,7 @@ describe CouchRest::Model::Design do
     describe "#view_names" do
       it "should provide a list of all the views available" do
         @doc = DesignSampleModel.design_doc
-        @doc.view_names.should eql(['by_name', 'all'])
+        expect(@doc.view_names).to eql(['by_name', 'all'])
       end
     end
 
@@ -226,15 +226,15 @@ describe CouchRest::Model::Design do
       end
 
       it "should tell us if a view exists" do
-        @doc.has_view?('by_name').should be_true
+        expect(@doc.has_view?('by_name')).to be_truthy
       end
 
       it "should tell us if a view exists as symbol" do
-        @doc.has_view?(:by_name).should be_true
+        expect(@doc.has_view?(:by_name)).to be_truthy
       end
 
       it "should tell us if a view does not exist" do
-        @doc.has_view?(:by_foobar).should be_false
+        expect(@doc.has_view?(:by_foobar)).to be_falsey
       end
     end
 
@@ -245,12 +245,12 @@ describe CouchRest::Model::Design do
       end
 
       it "should forward view creation to View model" do
-        CouchRest::Model::Designs::View.should_receive(:define_and_create).with(@doc, 'by_other_name', {})
+        expect(CouchRest::Model::Designs::View).to receive(:define_and_create).with(@doc, 'by_other_name', {})
         @doc.create_view('by_other_name')
       end
 
       it "should forward view creation to View model with opts" do
-        CouchRest::Model::Designs::View.should_receive(:define_and_create).with(@doc, 'by_other_name', {:by => 'name'})
+        expect(CouchRest::Model::Designs::View).to receive(:define_and_create).with(@doc, 'by_other_name', {:by => 'name'})
         @doc.create_view('by_other_name', :by => 'name')
       end
     end
@@ -263,7 +263,7 @@ describe CouchRest::Model::Design do
 
       it "should add simple filter" do
         @doc.create_filter('test', 'foobar')
-        @doc['filters']['test'].should eql('foobar')
+        expect(@doc['filters']['test']).to eql('foobar')
         @doc['filters'] = nil # cleanup
       end
     end
@@ -275,7 +275,7 @@ describe CouchRest::Model::Design do
 
       it "should add simple view lib" do
         @doc.create_view_lib('test', 'foobar')
-        @doc['views']['lib']['test'].should eql('foobar')
+        expect(@doc['views']['lib']['test']).to eql('foobar')
         @doc['views']['lib'] = nil # cleanup
       end
     end
@@ -286,17 +286,17 @@ describe CouchRest::Model::Design do
 
     it "should calculate a consistent checksum for model" do
       #WithTemplateAndUniqueID.design_doc.checksum.should eql('caa2b4c27abb82b4e37421de76d96ffc')
-      WithTemplateAndUniqueID.design_doc.checksum.should eql('7f44e88afbce06204010c49b76f31bcf')
+      expect(WithTemplateAndUniqueID.design_doc.checksum).to eql('7f44e88afbce06204010c49b76f31bcf')
     end
 
     it "should calculate checksum for complex model" do
       #Article.design_doc.checksum.should eql('70dff8caea143bf40fad09adf0701104')
-      Article.design_doc.checksum.should eql('81f6553c44ecc3fe12a39331b0cdee46')
+      expect(Article.design_doc.checksum).to eql('81f6553c44ecc3fe12a39331b0cdee46')
     end
 
     it "should cache the generated checksum value" do
       Article.design_doc.checksum
-      Article.design_doc['couchrest-hash'].should_not be_blank
+      expect(Article.design_doc['couchrest-hash']).not_to be_blank
       Article.first
     end
 

data/spec/unit/designs/design_mapper_spec.rb

@@ -15,22 +15,22 @@ describe CouchRest::Model::Designs::DesignMapper do
     end
 
     it "should set basic variables" do
-      @object.send(:model).should eql(DesignModel)
-      @object.send(:prefix).should be_nil
-      @object.send(:method).should eql('design_doc')
+      expect(@object.send(:model)).to eql(DesignModel)
+      expect(@object.send(:prefix)).to be_nil
+      expect(@object.send(:method)).to eql('design_doc')
     end
 
     it "should add design doc to list" do
-      @object.model.design_docs.should include(@object.model.design_doc)
+      expect(@object.model.design_docs).to include(@object.model.design_doc)
     end
 
     it "should create a design doc method" do
-      @object.model.should respond_to('design_doc')
-      @object.design_doc.should eql(@object.model.design_doc)
+      expect(@object.model).to respond_to('design_doc')
+      expect(@object.design_doc).to eql(@object.model.design_doc)
     end
 
     it "should use default for autoupdate" do
-      @object.design_doc.auto_update.should be_true
+      expect(@object.design_doc.auto_update).to be_truthy
     end
 
   end
@@ -41,22 +41,22 @@ describe CouchRest::Model::Designs::DesignMapper do
     end
 
     it "should set basics" do
-      @object.send(:model).should eql(DesignModel)
-      @object.send(:prefix).should eql('stats')
-      @object.send(:method).should eql('stats_design_doc')
+      expect(@object.send(:model)).to eql(DesignModel)
+      expect(@object.send(:prefix)).to eql('stats')
+      expect(@object.send(:method)).to eql('stats_design_doc')
     end
 
     it "should add design doc to list" do
-      @object.model.design_docs.should include(@object.model.stats_design_doc)
+      expect(@object.model.design_docs).to include(@object.model.stats_design_doc)
     end
 
     it "should not create an all method" do
-      @object.model.should_not respond_to('all')
+      expect(@object.model).not_to respond_to('all')
     end
 
     it "should create a design doc method" do
-      @object.model.should respond_to('stats_design_doc')
-      @object.design_doc.should eql(@object.model.stats_design_doc)
+      expect(@object.model).to respond_to('stats_design_doc')
+      expect(@object.design_doc).to eql(@object.model.stats_design_doc)
     end
 
   end
@@ -65,7 +65,7 @@ describe CouchRest::Model::Designs::DesignMapper do
     it "should disable auto updates" do
       @object = @klass.new(DesignModel)
       @object.disable_auto_update
-      @object.design_doc.auto_update.should be_false
+      expect(@object.design_doc.auto_update).to be_falsey
     end
   end
 
@@ -73,14 +73,14 @@ describe CouchRest::Model::Designs::DesignMapper do
     it "should enable auto updates" do
       @object = @klass.new(DesignModel)
       @object.enable_auto_update
-      @object.design_doc.auto_update.should be_true
+      expect(@object.design_doc.auto_update).to be_truthy
     end
   end
 
   describe "#model_type_key" do
     it "should return models type key" do
       @object = @klass.new(DesignModel)
-      @object.model_type_key.should eql(@object.model.model_type_key)
+      expect(@object.model_type_key).to eql(@object.model.model_type_key)
     end
   end
 
@@ -91,18 +91,18 @@ describe CouchRest::Model::Designs::DesignMapper do
     end
 
     it "should call create method on view" do
-      CouchRest::Model::Designs::View.should_receive(:define).with(@object.design_doc, 'test', {})
+      expect(CouchRest::Model::Designs::View).to receive(:define).with(@object.design_doc, 'test', {})
       @object.view('test')
     end
 
     it "should create a method on parent model" do
-      CouchRest::Model::Designs::View.stub(:define)
+      allow(CouchRest::Model::Designs::View).to receive(:define)
       @object.view('test_view')
-      DesignModel.should respond_to(:test_view)
+      expect(DesignModel).to respond_to(:test_view)
     end
 
     it "should create a method for view instance" do
-      @object.design_doc.should_receive(:create_view).with('test', {})
+      expect(@object.design_doc).to receive(:create_view).with('test', {})
       @object.view('test')
     end
   end
@@ -115,8 +115,8 @@ describe CouchRest::Model::Designs::DesignMapper do
 
     it "should add the provided function to the design doc" do
       @object.filter(:important, "function(doc, req) { return doc.priority == 'high'; }")
-      DesignModel.design_doc['filters'].should_not be_empty
-      DesignModel.design_doc['filters']['important'].should_not be_blank
+      expect(DesignModel.design_doc['filters']).not_to be_empty
+      expect(DesignModel.design_doc['filters']['important']).not_to be_blank
     end
   end
 
@@ -128,9 +128,9 @@ describe CouchRest::Model::Designs::DesignMapper do
     it "should add the #view_lib function to the design doc" do
       val = "exports.bar = 42;"
       @object.view_lib(:foo, val)
-      DesignModel.design_doc['views']['lib'].should_not be_empty
-      DesignModel.design_doc['views']['lib'].should_not be_blank
-      DesignModel.design_doc['views']['lib']['foo'].should eql(val)
+      expect(DesignModel.design_doc['views']['lib']).not_to be_empty
+      expect(DesignModel.design_doc['views']['lib']).not_to be_blank
+      expect(DesignModel.design_doc['views']['lib']['foo']).to eql(val)
     end
   end
 

data/spec/unit/designs/migrations_spec.rb

@@ -34,24 +34,24 @@ describe CouchRest::Model::Designs::Migrations do
         end
 
         it "should create new design if non exists" do
-          @db.should_receive(:view).with("#{@doc.name}/#{@doc['views'].keys.first}", {
+          expect(@db).to receive(:view).with("#{@doc.name}/#{@doc['views'].keys.first}", {
             :limit => 1, :stale => 'update_after', :reduce => false
           })
           callback = @doc.migrate do |res|
-            res.should eql(:created)
+            expect(res).to eql(:created)
           end
           doc = @db.get(@doc['_id'])
-          doc['views']['all'].should eql(@doc['views']['all'])
-          callback.should be_nil
+          expect(doc['views']['all']).to eql(@doc['views']['all'])
+          expect(callback).to be_nil
         end
 
         it "should not change anything if design is up to date" do
           @doc.sync
-          @db.should_not_receive(:view)
+          expect(@db).not_to receive(:view)
           callback = @doc.migrate do |res|
-            res.should eql(:no_change)
+            expect(res).to eql(:no_change)
           end
-          callback.should be_nil
+          expect(callback).to be_nil
         end
 
       end
@@ -72,28 +72,28 @@ describe CouchRest::Model::Designs::Migrations do
         end
 
         it "should save new migration design doc" do
-          @db.should_receive(:view).with("#{@doc.name}_migration/by_name", {
+          expect(@db).to receive(:view).with("#{@doc.name}_migration/by_name", {
             :limit => 1, :reduce => false, :stale => 'update_after'
           })
           @callback = @doc.migrate do |res|
-            res.should eql(:migrated)
+            expect(res).to eql(:migrated)
           end
-          @callback.should_not be_nil
+          expect(@callback).not_to be_nil
 
           # should not have updated original view until cleanup
           doc = @db.get(@doc['_id'])
-          doc['views'].should_not have_key('by_name_and_surname')
+          expect(doc['views']).not_to have_key('by_name_and_surname')
 
           # Should have created the migration
           new_doc = @db.get(@doc_id)
-          new_doc.should_not be_nil
+          expect(new_doc).not_to be_nil
 
           # should be possible to perform cleanup
           @callback.call
           expect(@db.get(@doc_id)).to be_nil
 
           doc = @db.get(@doc['_id'])
-          doc['views'].should have_key('by_name_and_surname')
+          expect(doc['views']).to have_key('by_name_and_surname')
         end
 
       end

data/spec/unit/designs/view_spec.rb

@@ -24,7 +24,7 @@ describe "Design View" do
 
       describe "with invalid parent model" do
         it "should burn" do
-          lambda { @klass.new(String) }.should raise_exception
+          expect { @klass.new(String, nil) }.to raise_error(/View cannot be initialized without a parent Model/)
         end
       end
 
@@ -32,14 +32,14 @@ describe "Design View" do
 
         it "should setup attributes" do
           @obj = @klass.new(@mod.design_doc, @mod, {}, 'test_view')
-          @obj.design_doc.should eql(@mod.design_doc)
-          @obj.model.should eql(@mod)
-          @obj.name.should eql('test_view')
-          @obj.query.should be_empty
+          expect(@obj.design_doc).to eql(@mod.design_doc)
+          expect(@obj.model).to eql(@mod)
+          expect(@obj.name).to eql('test_view')
+          expect(@obj.query).to be_empty
         end
 
         it "should complain if there is no name" do
-          lambda { @klass.new(@mod.design_doc, @mod, {}, nil) }.should raise_error(/Name must be provided/)
+          expect { @klass.new(@mod.design_doc, @mod, {}, nil) }.to raise_error(/Name must be provided/)
         end
 
       end
@@ -52,14 +52,14 @@ describe "Design View" do
         end
 
         it "should copy attributes" do
-          @obj.model.should eql(@mod)
-          @obj.name.should eql('test_view')
-          @obj.query.should eql({:foo => :bar})
+          expect(@obj.model).to eql(@mod)
+          expect(@obj.name).to eql('test_view')
+          expect(@obj.query).to eql({:foo => :bar})
         end
 
         it "should delete query keys if :delete defined" do
           @obj2 = @klass.new(@mod.design_doc, @obj, {:delete => [:foo]})
-          @obj2.query.should_not include(:foo)
+          expect(@obj2.query).not_to include(:foo)
         end
 
       end
@@ -68,7 +68,7 @@ describe "Design View" do
         it "should set model to proxy object and remove from query" do
           proxy = double("Proxy")
           @obj = @klass.new(@mod.design_doc, @mod, {:proxy => proxy}, 'test_view')
-          @obj.model.should eql(proxy)
+          expect(@obj.model).to eql(proxy)
         end
       end
 
@@ -76,9 +76,9 @@ describe "Design View" do
         it "should set the model to proxy object instead of parents model" do
           proxy = double("Proxy")
           @obj = @klass.new(@mod.design_doc, @mod, {}, 'test_view')
-          @obj.model.should eql(@mod)
+          expect(@obj.model).to eql(@mod)
           @obj = @obj.proxy(proxy)
-          @obj.model.should eql(proxy)
+          expect(@obj.model).to eql(proxy)
         end
       end
 
@@ -90,14 +90,14 @@ describe "Design View" do
       end
 
       it "should call define and create_model_methods method" do
-        @klass.should_receive(:define).with(@design_doc, 'test', {}).and_return(nil)
-        @klass.should_receive(:create_model_methods).with(@design_doc, 'test', {}).and_return(nil)
+        expect(@klass).to receive(:define).with(@design_doc, 'test', {}).and_return(nil)
+        expect(@klass).to receive(:create_model_methods).with(@design_doc, 'test', {}).and_return(nil)
         @klass.define_and_create(@design_doc, 'test')
       end
 
       it "should call define and create_model_methods method with opts" do
-        @klass.should_receive(:define).with(@design_doc, 'test', {:foo => :bar}).and_return(nil)
-        @klass.should_receive(:create_model_methods).with(@design_doc, 'test', {:foo => :bar}).and_return(nil)
+        expect(@klass).to receive(:define).with(@design_doc, 'test', {:foo => :bar}).and_return(nil)
+        expect(@klass).to receive(:create_model_methods).with(@design_doc, 'test', {:foo => :bar}).and_return(nil)
         @klass.define_and_create(@design_doc, 'test', {:foo => :bar})
       end
 
@@ -109,53 +109,71 @@ describe "Design View" do
 
         before :each do
           @design_doc = { }
-          @design_doc.stub(:model).and_return(DesignViewModel)
+          allow(@design_doc).to receive(:model).and_return(DesignViewModel)
         end
 
         it "should add a basic view" do
           @klass.define(@design_doc, 'test_view', :map => 'foo')
-          @design_doc['views']['test_view'].should_not be_nil
+          expect(@design_doc['views']['test_view']).not_to be_nil
         end
 
         it "should not overwrite reduce if set" do
           @klass.define(@design_doc, 'by_title', :reduce => true)
-          @design_doc['views']['by_title']['map'].should_not be_blank
-          @design_doc['views']['by_title']['reduce'].should eql(true)
+          expect(@design_doc['views']['by_title']['map']).not_to be_blank
+          expect(@design_doc['views']['by_title']['reduce']).to eql(true)
         end
 
         it "should replace reduce symbol with string name" do
           @klass.define(@design_doc, 'by_title', :reduce => :sum)
-          @design_doc['views']['by_title']['map'].should_not be_blank
-          @design_doc['views']['by_title']['reduce'].should eql('_sum')
+          expect(@design_doc['views']['by_title']['map']).not_to be_blank
+          expect(@design_doc['views']['by_title']['reduce']).to eql('_sum')
         end
 
         it "should replace reduce symbol with string if map function present" do
           @klass.define(@design_doc, 'by_title', :map => "function(d) { }", :reduce => :sum)
-          @design_doc['views']['by_title']['map'].should_not be_blank
-          @design_doc['views']['by_title']['reduce'].should eql('_sum')
+          expect(@design_doc['views']['by_title']['map']).not_to be_blank
+          expect(@design_doc['views']['by_title']['reduce']).to eql('_sum')
         end
 
         it "should auto generate mapping from name" do
-          lambda { @klass.define(@design_doc, 'by_title') }.should_not raise_error
+          expect { @klass.define(@design_doc, 'by_title') }.not_to raise_error
           str = @design_doc['views']['by_title']['map']
-          str.should include("((doc['#{DesignViewModel.model_type_key}'] == 'DesignViewModel') && (doc['title'] != null))")
-          str.should include("emit(doc['title'], 1);")
+          expect(str).to include("((doc['#{DesignViewModel.model_type_key}'] == 'DesignViewModel') && (doc['title'] != null))")
+          expect(str).to include("emit(doc['title'], 1);")
           str = @design_doc['views']['by_title']['reduce']
-          str.should include("_sum")
+          expect(str).to include("_sum")
         end
 
         it "should auto generate mapping from name with and" do
           @klass.define(@design_doc, 'by_title_and_name')
           str = @design_doc['views']['by_title_and_name']['map']
-          str.should include("(doc['title'] != null) && (doc['name'] != null)")
-          str.should include("emit([doc['title'], doc['name']], 1);")
+          expect(str).to include("(doc['title'] != null) && (doc['name'] != null)")
+          expect(str).to include("emit([doc['title'], doc['name']], 1);")
           str = @design_doc['views']['by_title_and_name']['reduce']
-          str.should include("_sum")
+          expect(str).to include("_sum")
         end
 
         it "should allow reduce methods as symbols" do
           @klass.define(@design_doc, 'by_title', :reduce => :stats)
-          @design_doc['views']['by_title']['reduce'].should eql('_stats')
+          expect(@design_doc['views']['by_title']['reduce']).to eql('_stats')
+        end
+
+        it "should allow the emit value to be overridden" do
+          @klass.define(@design_doc, 'by_title', :emit => :name)
+          str = @design_doc['views']['by_title']['map']
+          expect(str).to include("emit(doc['title'], doc['name']);")
+        end
+
+        it "should forward a non-symbol emit value straight into the view" do
+          @klass.define(@design_doc, 'by_title', :emit => 3)
+          str = @design_doc['views']['by_title']['map']
+          expect(str).to include("emit(doc['title'], 3);")
+        end
+
+        it "should support emitting an array" do
+          @klass.define(@design_doc, 'by_title', :emit => [1, :name])
+          str = @design_doc['views']['by_title']['map']
+          expect(str).to include("emit(doc['title'], [1, doc['name']]);")
         end
       end
 
@@ -163,42 +181,42 @@ describe "Design View" do
         before :each do
           @model = DesignViewModel
           @design_doc = { }
-          @design_doc.stub(:model).and_return(@model)
-          @design_doc.stub(:method_name).and_return("design_doc")
-          @model.stub('design_doc').and_return(@design_doc)
+          allow(@design_doc).to receive(:model).and_return(@model)
+          allow(@design_doc).to receive(:method_name).and_return("design_doc")
+          allow(@model).to receive('design_doc').and_return(@design_doc)
         end
         it "should create standard view method" do
           @klass.create_model_methods(@design_doc, 'by_name')
-          @model.should respond_to('by_name')
-          @design_doc.should_receive('view').with('by_name', {})
+          expect(@model).to respond_to('by_name')
+          expect(@design_doc).to receive('view').with('by_name', {})
           @model.by_name
         end
         it "should create find_ view method" do
           @klass.create_model_methods(@design_doc, 'by_name')
-          @model.should respond_to('find_by_name')
+          expect(@model).to respond_to('find_by_name')
           view = double("View")
-          view.should_receive('key').with('fred').and_return(view)
-          view.should_receive('first').and_return(nil)
-          @design_doc.should_receive('view').and_return(view)
+          expect(view).to receive('key').with('fred').and_return(view)
+          expect(view).to receive('first').and_return(nil)
+          expect(@design_doc).to receive('view').and_return(view)
           @model.find_by_name('fred')
         end
         it "should create find_! view method" do
           @klass.create_model_methods(@design_doc, 'by_name')
-          @model.should respond_to('find_by_name!')
+          expect(@model).to respond_to('find_by_name!')
           obj = double("SomeKlass")
           view = double("View")
-          view.should_receive('key').with('fred').and_return(view)
-          view.should_receive('first').and_return(obj)
-          @design_doc.should_receive('view').and_return(view)
-          @model.find_by_name!('fred').should eql(obj)
+          expect(view).to receive('key').with('fred').and_return(view)
+          expect(view).to receive('first').and_return(obj)
+          expect(@design_doc).to receive('view').and_return(view)
+          expect(@model.find_by_name!('fred')).to eql(obj)
         end
         it "should create find_! view method and raise error when nil" do
           @klass.create_model_methods(@design_doc, 'by_name')
           view = double("View")
-          view.should_receive('key').with('fred').and_return(view)
-          view.should_receive('first').and_return(nil)
-          @design_doc.should_receive('view').and_return(view)
-          lambda { @model.find_by_name!('fred') }.should raise_error(CouchRest::Model::DocumentNotFound)
+          expect(view).to receive('key').with('fred').and_return(view)
+          expect(view).to receive('first').and_return(nil)
+          expect(@design_doc).to receive('view').and_return(view)
+          expect { @model.find_by_name!('fred') }.to raise_error(CouchRest::Model::DocumentNotFound)
         end
 
       end
@@ -213,15 +231,15 @@ describe "Design View" do
 
       describe "#rows" do
         it "should execute query" do
-          @obj.should_receive(:execute).and_return(true)
-          @obj.should_receive(:result).twice.and_return({'rows' => []})
-          @obj.rows.should be_empty
+          expect(@obj).to receive(:execute).and_return(true)
+          expect(@obj).to receive(:result).twice.and_return({'rows' => []})
+          expect(@obj.rows).to be_empty
         end
 
         it "should wrap rows in ViewRow class" do
-          @obj.should_receive(:execute).and_return(true)
-          @obj.should_receive(:result).twice.and_return({'rows' => [{:foo => :bar}]})
-          CouchRest::Model::Designs::ViewRow.should_receive(:new).with({:foo => :bar}, @obj.model, DB)
+          expect(@obj).to receive(:execute).and_return(true)
+          expect(@obj).to receive(:result).twice.and_return({'rows' => [{:foo => :bar}]})
+          expect(CouchRest::Model::Designs::ViewRow).to receive(:new).with({:foo => :bar}, @obj.model, DB)
           @obj.rows
         end
 
@@ -250,24 +268,24 @@ describe "Design View" do
 
       describe "#all" do
         it "should ensure docs included and call docs" do
-          @obj.should_receive(:include_docs!)
-          @obj.should_receive(:docs)
+          expect(@obj).to receive(:include_docs!)
+          expect(@obj).to receive(:docs)
           @obj.all
         end
         it "should pass on a block" do
-          block = lambda { }
-          expect(@obj).to receive(:docs).with(&block)
-          @obj.all(&block)
+          block = lambda { 'ok' }
+          expect(@obj).to receive(:docs) { block.call() }
+          expect(@obj.all(&block)).to eql('ok')
         end
       end
 
       describe "#docs" do
         it "should provide docs from rows" do
-          @obj.should_receive(:rows).and_return([])
+          expect(@obj).to receive(:rows).and_return([])
           @obj.docs
         end
         it "should cache the results" do
-          @obj.should_receive(:rows).once.and_return([])
+          expect(@obj).to receive(:rows).once.and_return([])
           @obj.docs
           @obj.docs
         end
@@ -296,369 +314,369 @@ describe "Design View" do
 
       describe "#first" do
         it "should provide the first result of loaded query" do
-          @obj.should_receive(:result).and_return(true)
-          @obj.should_receive(:all).and_return([:foo])
-          @obj.first.should eql(:foo)
+          expect(@obj).to receive(:result).and_return(true)
+          expect(@obj).to receive(:all).and_return([:foo])
+          expect(@obj.first).to eql(:foo)
         end
         it "should perform a query if no results cached" do
           view = double('SubView')
-          @obj.should_receive(:result).and_return(nil)
-          @obj.should_receive(:limit).with(1).and_return(view)
-          view.should_receive(:all).and_return([:foo])
-          @obj.first.should eql(:foo)
+          expect(@obj).to receive(:result).and_return(nil)
+          expect(@obj).to receive(:limit).with(1).and_return(view)
+          expect(view).to receive(:all).and_return([:foo])
+          expect(@obj.first).to eql(:foo)
         end
       end
 
       describe "#last" do
         it "should provide the last result of loaded query" do
-          @obj.should_receive(:result).and_return(true)
-          @obj.should_receive(:all).and_return([:foo, :bar])
-          @obj.first.should eql(:foo)
+          expect(@obj).to receive(:result).and_return(true)
+          expect(@obj).to receive(:all).and_return([:foo, :bar])
+          expect(@obj.first).to eql(:foo)
         end
         it "should perform a query if no results cached" do
           view = double('SubView')
-          @obj.should_receive(:result).and_return(nil)
-          @obj.should_receive(:limit).with(1).and_return(view)
-          view.should_receive(:descending).and_return(view)
-          view.should_receive(:all).and_return([:foo, :bar])
-          @obj.last.should eql(:bar)
+          expect(@obj).to receive(:result).and_return(nil)
+          expect(@obj).to receive(:limit).with(1).and_return(view)
+          expect(view).to receive(:descending).and_return(view)
+          expect(view).to receive(:all).and_return([:foo, :bar])
+          expect(@obj.last).to eql(:bar)
         end
       end
 
       describe "#length" do
         it "should provide a length from the docs array" do
-          @obj.should_receive(:docs).and_return([1, 2, 3])
-          @obj.length.should eql(3)
+          expect(@obj).to receive(:docs).and_return([1, 2, 3])
+          expect(@obj.length).to eql(3)
         end
       end
 
       describe "#count" do
         it "should raise an error if view prepared for group" do
-          @obj.should_receive(:query).and_return({:group => true})
-          lambda { @obj.count }.should raise_error(/group/)
+          expect(@obj).to receive(:query).and_return({:group => true})
+          expect { @obj.count }.to raise_error(/group/)
         end
 
         it "should return first row value if reduce possible" do
           view = double("SubView")
           row = double("Row")
-          @obj.should_receive(:can_reduce?).and_return(true)
-          @obj.should_receive(:reduce).and_return(view)
-          view.should_receive(:skip).with(0).and_return(view)
-          view.should_receive(:limit).with(1).and_return(view)
-          view.should_receive(:rows).and_return([row])
-          row.should_receive(:value).and_return(2)
-          @obj.count.should eql(2)
+          expect(@obj).to receive(:can_reduce?).and_return(true)
+          expect(@obj).to receive(:reduce).and_return(view)
+          expect(view).to receive(:skip).with(0).and_return(view)
+          expect(view).to receive(:limit).with(1).and_return(view)
+          expect(view).to receive(:rows).and_return([row])
+          expect(row).to receive(:value).and_return(2)
+          expect(@obj.count).to eql(2)
         end
         it "should return 0 if no rows and reduce possible" do
           view = double("SubView")
-          @obj.should_receive(:can_reduce?).and_return(true)
-          @obj.should_receive(:reduce).and_return(view)
-          view.should_receive(:skip).with(0).and_return(view)
-          view.should_receive(:limit).with(1).and_return(view)
-          view.should_receive(:rows).and_return([])
-          @obj.count.should eql(0)
+          expect(@obj).to receive(:can_reduce?).and_return(true)
+          expect(@obj).to receive(:reduce).and_return(view)
+          expect(view).to receive(:skip).with(0).and_return(view)
+          expect(view).to receive(:limit).with(1).and_return(view)
+          expect(view).to receive(:rows).and_return([])
+          expect(@obj.count).to eql(0)
         end
 
         it "should perform limit request for total_rows" do
           view = double("SubView")
-          @obj.should_receive(:limit).with(0).and_return(view)
-          view.should_receive(:total_rows).and_return(4)
-          @obj.should_receive(:can_reduce?).and_return(false)
-          @obj.count.should eql(4)
+          expect(@obj).to receive(:limit).with(0).and_return(view)
+          expect(view).to receive(:total_rows).and_return(4)
+          expect(@obj).to receive(:can_reduce?).and_return(false)
+          expect(@obj.count).to eql(4)
         end
       end
 
       describe "#empty?" do
         it "should check the #all method for any results" do
           all = double("All")
-          all.should_receive(:empty?).and_return('win')
-          @obj.should_receive(:all).and_return(all)
-          @obj.empty?.should eql('win')
+          expect(all).to receive(:empty?).and_return('win')
+          expect(@obj).to receive(:all).and_return(all)
+          expect(@obj.empty?).to eql('win')
         end
       end
 
       describe "#each" do
         it "should call each method on all" do
-          @obj.should_receive(:all).and_return([])
+          expect(@obj).to receive(:all).and_return([])
           @obj.each
         end
         it "should call each and pass block" do
           set = [:foo, :bar]
-          @obj.should_receive(:all).and_return(set)
+          expect(@obj).to receive(:all).and_return(set)
           result = []
           @obj.each do |s|
             result << s
           end
-          result.should eql(set)
+          expect(result).to eql(set)
         end
       end
 
       describe "#offset" do
         it "should excute" do
-          @obj.should_receive(:execute).and_return({'offset' => 3})
-          @obj.offset.should eql(3)
+          expect(@obj).to receive(:execute).and_return({'offset' => 3})
+          expect(@obj.offset).to eql(3)
         end
       end
 
       describe "#total_rows" do
         it "should excute" do
-          @obj.should_receive(:execute).and_return({'total_rows' => 3})
-          @obj.total_rows.should eql(3)
+          expect(@obj).to receive(:execute).and_return({'total_rows' => 3})
+          expect(@obj.total_rows).to eql(3)
         end
       end
 
       describe "#values" do
         it "should request each row and provide value" do
           row = double("Row")
-          row.should_receive(:value).twice.and_return('foo')
-          @obj.should_receive(:rows).and_return([row, row])
-          @obj.values.should eql(['foo', 'foo'])
+          expect(row).to receive(:value).twice.and_return('foo')
+          expect(@obj).to receive(:rows).and_return([row, row])
+          expect(@obj.values).to eql(['foo', 'foo'])
         end
       end
 
       describe "#[]" do
         it "should execute and provide requested field" do
-          @obj.should_receive(:execute).and_return({'total_rows' => 2})
-          @obj['total_rows'].should eql(2)
+          expect(@obj).to receive(:execute).and_return({'total_rows' => 2})
+          expect(@obj['total_rows']).to eql(2)
         end
       end
 
       describe "#info" do
         it "should raise error" do
-          lambda { @obj.info }.should raise_error
+          expect { @obj.info }.to raise_error(/Not yet implemented/)
         end
       end
 
       describe "#database" do
         it "should update query with value" do
-          @obj.should_receive(:update_query).with({:database => 'foo'})
+          expect(@obj).to receive(:update_query).with({:database => 'foo'})
           @obj.database('foo')
         end
       end
 
       describe "#key" do
         it "should update query with value" do
-          @obj.should_receive(:update_query).with({:key => 'foo'})
+          expect(@obj).to receive(:update_query).with({:key => 'foo'})
           @obj.key('foo')
         end
         it "should raise error if startkey set" do
           @obj.query[:startkey] = 'bar'
-          lambda { @obj.key('foo') }.should raise_error
+          expect { @obj.key('foo') }.to raise_error(/View#key cannot be used/)
         end
         it "should raise error if endkey set" do
           @obj.query[:endkey] = 'bar'
-          lambda { @obj.key('foo') }.should raise_error
+          expect { @obj.key('foo') }.to raise_error(/View#key cannot be used/)
         end
         it "should raise error if both startkey and endkey set" do
           @obj.query[:startkey] = 'bar'
           @obj.query[:endkey] = 'bar'
-          lambda { @obj.key('foo') }.should raise_error
+          expect { @obj.key('foo') }.to raise_error(/View#key cannot be used/)
         end
         it "should raise error if keys set" do
           @obj.query[:keys] = 'bar'
-          lambda { @obj.key('foo') }.should raise_error
+          expect { @obj.key('foo') }.to raise_error(/View#key cannot be used/)
         end
       end
 
       describe "#startkey" do
         it "should update query with value" do
-          @obj.should_receive(:update_query).with({:startkey => 'foo'})
+          expect(@obj).to receive(:update_query).with({:startkey => 'foo'})
           @obj.startkey('foo')
         end
         it "should raise and error if key set" do
           @obj.query[:key] = 'bar'
-          lambda { @obj.startkey('foo') }.should raise_error(/View#startkey/)
+          expect { @obj.startkey('foo') }.to raise_error(/View#startkey/)
         end
         it "should raise and error if keys set" do
           @obj.query[:keys] = 'bar'
-          lambda { @obj.startkey('foo') }.should raise_error(/View#startkey/)
+          expect { @obj.startkey('foo') }.to raise_error(/View#startkey/)
         end
       end
 
       describe "#startkey_doc" do
         it "should update query with value" do
-          @obj.should_receive(:update_query).with({:startkey_docid => 'foo'})
+          expect(@obj).to receive(:update_query).with({:startkey_docid => 'foo'})
           @obj.startkey_doc('foo')
         end
         it "should update query with object id if available" do
           doc = double("Document")
-          doc.should_receive(:id).and_return(44)
-          @obj.should_receive(:update_query).with({:startkey_docid => 44})
+          expect(doc).to receive(:id).and_return(44)
+          expect(@obj).to receive(:update_query).with({:startkey_docid => 44})
           @obj.startkey_doc(doc)
         end
       end
 
       describe "#endkey" do
         it "should update query with value" do
-          @obj.should_receive(:update_query).with({:endkey => 'foo'})
+          expect(@obj).to receive(:update_query).with({:endkey => 'foo'})
           @obj.endkey('foo')
         end
         it "should raise and error if key set" do
           @obj.query[:key] = 'bar'
-          lambda { @obj.endkey('foo') }.should raise_error(/View#endkey/)
+          expect { @obj.endkey('foo') }.to raise_error(/View#endkey/)
         end
         it "should raise and error if keys set" do
           @obj.query[:keys] = 'bar'
-          lambda { @obj.endkey('foo') }.should raise_error(/View#endkey/)
+          expect { @obj.endkey('foo') }.to raise_error(/View#endkey/)
         end
       end
 
       describe "#endkey_doc" do
         it "should update query with value" do
-          @obj.should_receive(:update_query).with({:endkey_docid => 'foo'})
+          expect(@obj).to receive(:update_query).with({:endkey_docid => 'foo'})
           @obj.endkey_doc('foo')
         end
         it "should update query with object id if available" do
           doc = double("Document")
-          doc.should_receive(:id).and_return(44)
-          @obj.should_receive(:update_query).with({:endkey_docid => 44})
+          expect(doc).to receive(:id).and_return(44)
+          expect(@obj).to receive(:update_query).with({:endkey_docid => 44})
           @obj.endkey_doc(doc)
         end
       end
 
       describe "#keys" do
         it "should update the query" do
-          @obj.should_receive(:update_query).with({:keys => ['foo', 'bar']})
+          expect(@obj).to receive(:update_query).with({:keys => ['foo', 'bar']})
           @obj.keys(['foo', 'bar'])
         end
         it "should raise and error if key set" do
           @obj.query[:key] = 'bar'
-          lambda { @obj.keys('foo') }.should raise_error(/View#keys/)
+          expect { @obj.keys('foo') }.to raise_error(/View#keys/)
         end
         it "should raise and error if startkey or endkey set" do
           @obj.query[:startkey] = 'bar'
-          lambda { @obj.keys('foo') }.should raise_error(/View#keys/)
+          expect { @obj.keys('foo') }.to raise_error(/View#keys/)
           @obj.query.delete(:startkey)
           @obj.query[:endkey] = 'bar'
-          lambda { @obj.keys('foo') }.should raise_error(/View#keys/)
+          expect { @obj.keys('foo') }.to raise_error(/View#keys/)
         end
       end
 
       describe "#keys (without parameters)" do
         it "should request each row and provide key value" do
           row = double("Row")
-          row.should_receive(:key).twice.and_return('foo')
-          @obj.should_receive(:rows).and_return([row, row])
-          @obj.keys.should eql(['foo', 'foo'])
+          expect(row).to receive(:key).twice.and_return('foo')
+          expect(@obj).to receive(:rows).and_return([row, row])
+          expect(@obj.keys).to eql(['foo', 'foo'])
         end
       end
 
       describe "#descending" do
         it "should update query" do
-          @obj.should_receive(:update_query).with({:descending => true})
+          expect(@obj).to receive(:update_query).with({:descending => true})
           @obj.descending
         end
         it "should reverse start and end keys if given" do
           @obj = @obj.startkey('a').endkey('z')
           @obj = @obj.descending
-          @obj.query[:endkey].should eql('a')
-          @obj.query[:startkey].should eql('z')
+          expect(@obj.query[:endkey]).to eql('a')
+          expect(@obj.query[:startkey]).to eql('z')
         end
         it "should reverse even if start or end nil" do
           @obj = @obj.startkey('a')
           @obj = @obj.descending
-          @obj.query[:endkey].should eql('a')
-          @obj.query[:startkey].should be_nil
+          expect(@obj.query[:endkey]).to eql('a')
+          expect(@obj.query[:startkey]).to be_nil
         end
         it "should reverse start_doc and end_doc keys if given" do
           @obj = @obj.startkey_doc('a').endkey_doc('z')
           @obj = @obj.descending
-          @obj.query[:endkey_docid].should eql('a')
-          @obj.query[:startkey_docid].should eql('z')
+          expect(@obj.query[:endkey_docid]).to eql('a')
+          expect(@obj.query[:startkey_docid]).to eql('z')
         end
       end
 
       describe "#limit" do
         it "should update query with value" do
-          @obj.should_receive(:update_query).with({:limit => 3})
+          expect(@obj).to receive(:update_query).with({:limit => 3})
           @obj.limit(3)
         end
       end
 
       describe "#skip" do
-        it "should update query with value" do 
-          @obj.should_receive(:update_query).with({:skip => 3})
+        it "should update query with value" do
+          expect(@obj).to receive(:update_query).with({:skip => 3})
           @obj.skip(3)
         end
-        it "should update query with default value" do 
-          @obj.should_receive(:update_query).with({:skip => 0})
+        it "should update query with default value" do
+          expect(@obj).to receive(:update_query).with({:skip => 0})
           @obj.skip
         end
       end
 
       describe "#reduce" do
         it "should update query" do
-          @obj.should_receive(:can_reduce?).and_return(true)
-          @obj.should_receive(:update_query).with({:reduce => true, :delete => [:include_docs]})
+          expect(@obj).to receive(:can_reduce?).and_return(true)
+          expect(@obj).to receive(:update_query).with({:reduce => true, :delete => [:include_docs]})
           @obj.reduce
         end
         it "should raise error if query cannot be reduced" do
-          @obj.should_receive(:can_reduce?).and_return(false)
-          lambda { @obj.reduce }.should raise_error
+          expect(@obj).to receive(:can_reduce?).and_return(false)
+          expect { @obj.reduce }.to raise_error(/Cannot reduce a view without a reduce method/)
         end
       end
 
       describe "#group" do
         it "should update query" do
-          @obj.should_receive(:query).and_return({:reduce => true})
-          @obj.should_receive(:update_query).with({:group => true})
+          expect(@obj).to receive(:query).and_return({:reduce => true})
+          expect(@obj).to receive(:update_query).with({:group => true})
           @obj.group
         end
         it "should raise error if query not prepared for reduce" do
-          @obj.should_receive(:query).and_return({:reduce => false})
-          lambda { @obj.group }.should raise_error
+          expect(@obj).to receive(:query).and_return({:reduce => false})
+          expect { @obj.group }.to raise_error(/View#reduce must have been set before grouping is permitted/)
         end
       end
 
       describe "#group" do
         it "should update query" do
-          @obj.should_receive(:query).and_return({:reduce => true})
-          @obj.should_receive(:update_query).with({:group => true})
+          expect(@obj).to receive(:query).and_return({:reduce => true})
+          expect(@obj).to receive(:update_query).with({:group => true})
           @obj.group
         end
         it "should raise error if query not prepared for reduce" do
-          @obj.should_receive(:query).and_return({:reduce => false})
-          lambda { @obj.group }.should raise_error
+          expect(@obj).to receive(:query).and_return({:reduce => false})
+          expect { @obj.group }.to raise_error(/View#reduce must have been set before grouping is permitted/)
         end
       end
 
       describe "#group_level" do
         it "should update query" do
-          @obj.should_receive(:group).and_return(@obj)
-          @obj.should_receive(:update_query).with({:group_level => 3})
+          expect(@obj).to receive(:group).and_return(@obj)
+          expect(@obj).to receive(:update_query).with({:group_level => 3})
           @obj.group_level(3)
         end
       end
 
       describe "#stale" do
         it "should update query with ok" do
-          @obj.should_receive(:update_query).with(:stale => 'ok')
+          expect(@obj).to receive(:update_query).with(:stale => 'ok')
           @obj.stale('ok')
         end
         it "should update query with update_after" do
-          @obj.should_receive(:update_query).with(:stale => 'update_after')
+          expect(@obj).to receive(:update_query).with(:stale => 'update_after')
           @obj.stale('update_after')
         end
         it "should fail if anything else is provided" do
-          lambda { @obj.stale('yes') }.should raise_error(/can only be set with/)
+          expect { @obj.stale('yes') }.to raise_error(/can only be set with/)
         end
       end
 
       describe "#include_docs" do
         it "should call include_docs! on new view" do
-          @obj.should_receive(:update_query).and_return(@obj)
-          @obj.should_receive(:include_docs!)
+          expect(@obj).to receive(:update_query).and_return(@obj)
+          expect(@obj).to receive(:include_docs!)
           @obj.include_docs
         end
       end
 
       describe "#reset!" do
         it "should empty all cached data" do
-          @obj.should_receive(:result=).with(nil)
+          expect(@obj).to receive(:result=).with(nil)
           @obj.instance_exec { @rows = 'foo'; @docs = 'foo' }
           @obj.reset!
-          @obj.instance_exec { @rows }.should be_nil
-          @obj.instance_exec { @docs }.should be_nil
+          expect(@obj.instance_exec { @rows }).to be_nil
+          expect(@obj.instance_exec { @docs }).to be_nil
         end
       end
 
@@ -666,58 +684,58 @@ describe "Design View" do
 
       describe "#include_docs!" do
         it "should set query value" do
-          @obj.should_receive(:result).and_return(false)
-          @obj.should_not_receive(:reset!)
+          expect(@obj).to receive(:result).and_return(false)
+          expect(@obj).not_to receive(:reset!)
           @obj.send(:include_docs!)
-          @obj.query[:include_docs].should be_true
+          expect(@obj.query[:include_docs]).to be_truthy
         end
         it "should reset if result and no docs" do
-          @obj.should_receive(:result).and_return(true)
-          @obj.should_receive(:include_docs?).and_return(false)
-          @obj.should_receive(:reset!)
+          expect(@obj).to receive(:result).and_return(true)
+          expect(@obj).to receive(:include_docs?).and_return(false)
+          expect(@obj).to receive(:reset!)
           @obj.send(:include_docs!)
-          @obj.query[:include_docs].should be_true
+          expect(@obj.query[:include_docs]).to be_truthy
         end
         it "should raise an error if view is reduced" do
           @obj.query[:reduce] = true
-          lambda { @obj.send(:include_docs!) }.should raise_error
+          expect { @obj.send(:include_docs!) }.to raise_error(/Cannot include documents in view that has been reduced/)
         end
       end
 
       describe "#include_docs?" do
         it "should return true if set" do
-          @obj.should_receive(:query).and_return({:include_docs => true})
-          @obj.send(:include_docs?).should be_true
+          expect(@obj).to receive(:query).and_return({:include_docs => true})
+          expect(@obj.send(:include_docs?)).to be_truthy
         end
         it "should return false if not set" do
-          @obj.should_receive(:query).and_return({})
-          @obj.send(:include_docs?).should be_false
-          @obj.should_receive(:query).and_return({:include_docs => false})
-          @obj.send(:include_docs?).should be_false
+          expect(@obj).to receive(:query).and_return({})
+          expect(@obj.send(:include_docs?)).to be_falsey
+          expect(@obj).to receive(:query).and_return({:include_docs => false})
+          expect(@obj.send(:include_docs?)).to be_falsey
         end
       end
 
       describe "#update_query" do
         it "returns a new instance of view" do
-          @obj.send(:update_query).object_id.should_not eql(@obj.object_id)
+          expect(@obj.send(:update_query).object_id).not_to eql(@obj.object_id)
         end
 
         it "returns a new instance of view with extra parameters" do
           new_obj = @obj.send(:update_query, {:foo => :bar})
-          new_obj.query[:foo].should eql(:bar)
+          expect(new_obj.query[:foo]).to eql(:bar)
         end
       end
 
       describe "#can_reduce?" do
         it "should check and prove true" do
-          @obj.should_receive(:name).and_return('test_view')
-          @obj.should_receive(:design_doc).and_return({'views' => {'test_view' => {'reduce' => 'foo'}}})
-          @obj.send(:can_reduce?).should be_true
+          expect(@obj).to receive(:name).and_return('test_view')
+          expect(@obj).to receive(:design_doc).and_return({'views' => {'test_view' => {'reduce' => 'foo'}}})
+          expect(@obj.send(:can_reduce?)).to be_truthy
         end
         it "should check and prove false" do
-          @obj.should_receive(:name).and_return('test_view')
-          @obj.should_receive(:design_doc).and_return({'views' => {'test_view' => {'reduce' => nil}}})
-          @obj.send(:can_reduce?).should be_false
+          expect(@obj).to receive(:name).and_return('test_view')
+          expect(@obj).to receive(:design_doc).and_return({'views' => {'test_view' => {'reduce' => nil}}})
+          expect(@obj.send(:can_reduce?)).to be_falsey
         end
       end
 
@@ -725,48 +743,48 @@ describe "Design View" do
         before :each do
           # disable real execution!
           @design_doc = double("DesignDoc")
-          @design_doc.stub(:view_on)
-          @design_doc.stub(:sync)
-          @obj.stub(:design_doc).and_return(@design_doc)
+          allow(@design_doc).to receive(:view_on)
+          allow(@design_doc).to receive(:sync)
+          allow(@obj).to receive(:design_doc).and_return(@design_doc)
         end
 
         it "should return previous result if set" do
           @obj.result = "foo"
-          @obj.send(:execute).should eql('foo')
+          expect(@obj.send(:execute)).to eql('foo')
         end
 
         it "should raise issue if no database" do
-          @obj.should_receive(:query).and_return({:database => nil})
+          expect(@obj).to receive(:query).and_return({:database => nil})
           model = double("SomeModel")
-          model.should_receive(:database).and_return(nil)
-          @obj.should_receive(:model).and_return(model)
-          lambda { @obj.send(:execute) }.should raise_error
+          expect(model).to receive(:database).and_return(nil)
+          expect(@obj).to receive(:model).and_return(model)
+          expect { @obj.send(:execute) }.to raise_error(CouchRest::Model::DatabaseNotDefined)
         end
 
         it "should delete the reduce option if not going to be used" do
-          @obj.should_receive(:can_reduce?).and_return(false)
-          @obj.query.should_receive(:delete).with(:reduce)
+          expect(@obj).to receive(:can_reduce?).and_return(false)
+          expect(@obj.query).to receive(:delete).with(:reduce)
           @obj.send(:execute)
         end
 
         it "should call to save the design document" do
-          @obj.should_receive(:can_reduce?).and_return(false)
-          @design_doc.should_receive(:sync).with(DB)
+          expect(@obj).to receive(:can_reduce?).and_return(false)
+          expect(@design_doc).to receive(:sync).with(DB)
           @obj.send(:execute)
         end
 
         it "should populate the results" do
-          @obj.should_receive(:can_reduce?).and_return(true)
-          @design_doc.should_receive(:view_on).and_return('foos')
+          expect(@obj).to receive(:can_reduce?).and_return(true)
+          expect(@design_doc).to receive(:view_on).and_return('foos')
           @obj.send(:execute)
-          @obj.result.should eql('foos')
+          expect(@obj.result).to eql('foos')
         end
 
         it "should not remove nil values from query" do
-          @obj.should_receive(:can_reduce?).and_return(true)
-          @obj.stub(:use_database).and_return(@mod.database)
+          expect(@obj).to receive(:can_reduce?).and_return(true)
+          allow(@obj).to receive(:use_database).and_return(@mod.database)
           @obj.query = {:reduce => true, :limit => nil, :skip => nil}
-          @design_doc.should_receive(:view_on).with(@mod.database, 'test_view', {:reduce => true, :limit => nil, :skip => nil})
+          expect(@design_doc).to receive(:view_on).with(@mod.database, 'test_view', {:reduce => true, :limit => nil, :skip => nil})
           @obj.send(:execute)
         end
 
@@ -785,59 +803,59 @@ describe "Design View" do
 
         describe "#page" do
           it "should call limit and skip" do
-            @obj.should_receive(:limit).with(25).and_return(@obj)
-            @obj.should_receive(:skip).with(25).and_return(@obj)
+            expect(@obj).to receive(:limit).with(25).and_return(@obj)
+            expect(@obj).to receive(:skip).with(25).and_return(@obj)
             @obj.page(2)
           end
         end
 
         describe "#per" do
           it "should raise an error if page not called before hand" do
-            lambda { @obj.per(12) }.should raise_error
+            expect { @obj.per(12) }.to raise_error(/View#page must be called before #per/)
           end
           it "should not do anything if number less than or eql 0" do
             view = @obj.page(1)
-            view.per(0).should eql(view)
+            expect(view.per(0)).to eql(view)
           end
           it "should set limit and update skip" do
             view = @obj.page(2).per(10)
-            view.query[:skip].should eql(10)
-            view.query[:limit].should eql(10)
+            expect(view.query[:skip]).to eql(10)
+            expect(view.query[:limit]).to eql(10)
           end
         end
 
         describe "#total_count" do
           it "set limit and skip to nill and perform count" do
-            @obj.should_receive(:limit).with(nil).and_return(@obj)
-            @obj.should_receive(:skip).with(nil).and_return(@obj)
-            @obj.should_receive(:count).and_return(5)
-            @obj.total_count.should eql(5)
-            @obj.total_count.should eql(5) # Second to test caching
+            expect(@obj).to receive(:limit).with(nil).and_return(@obj)
+            expect(@obj).to receive(:skip).with(nil).and_return(@obj)
+            expect(@obj).to receive(:count).and_return(5)
+            expect(@obj.total_count).to eql(5)
+            expect(@obj.total_count).to eql(5) # Second to test caching
           end
         end
 
         describe "#total_pages" do
           it "should use total_count and limit_value" do
-            @obj.should_receive(:total_count).and_return(200)
-            @obj.should_receive(:limit_value).and_return(25)
-            @obj.total_pages.should eql(8)
+            expect(@obj).to receive(:total_count).and_return(200)
+            expect(@obj).to receive(:limit_value).and_return(25)
+            expect(@obj.total_pages).to eql(8)
           end
         end
 
         # `num_pages` aliases to `total_pages` for compatibility for Kaminari '< 0.14'
         describe "#num_pages" do
           it "should use total_count and limit_value" do
-            @obj.should_receive(:total_count).and_return(200)
-            @obj.should_receive(:limit_value).and_return(25)
-            @obj.num_pages.should eql(8)
+            expect(@obj).to receive(:total_count).and_return(200)
+            expect(@obj).to receive(:limit_value).and_return(25)
+            expect(@obj.num_pages).to eql(8)
           end
         end
 
         describe "#current_page" do
           it "should use offset and limit" do
-            @obj.should_receive(:offset_value).and_return(25)
-            @obj.should_receive(:limit_value).and_return(25)
-            @obj.current_page.should eql(2)
+            expect(@obj).to receive(:offset_value).and_return(25)
+            expect(@obj).to receive(:limit_value).and_return(25)
+            expect(@obj.current_page).to eql(2)
           end
         end
       end
@@ -852,19 +870,19 @@ describe "Design View" do
 
     let :model do
       m = double()
-      m.stub(:database).and_return(DB)
+      allow(m).to receive(:database).and_return(DB)
       m
     end
 
     describe "intialize" do
       it "should store reference to model" do
         obj = @klass.new({}, model)
-        obj.model.should eql(model)
+        expect(obj.model).to eql(model)
       end
       it "should copy details from hash" do
         obj = @klass.new({:foo => :bar, :test => :example}, model)
-        obj[:foo].should eql(:bar)
-        obj[:test].should eql(:example)
+        expect(obj[:foo]).to eql(:bar)
+        expect(obj[:test]).to eql(:example)
       end
     end
 
@@ -874,7 +892,7 @@ describe "Design View" do
 
       it "should provide id" do
         obj = @klass.new({'id' => '123456'}, model)
-        obj.id.should eql('123456')
+        expect(obj.id).to eql('123456')
       end
 
       it "may be instantiated with a database" do
@@ -889,24 +907,24 @@ describe "Design View" do
 
       it "should provide key" do
         obj = @klass.new({'key' => 'thekey'}, model)
-        obj.key.should eql('thekey')
+        expect(obj.key).to eql('thekey')
       end
 
       it "should provide the value" do
         obj = @klass.new({'value' => 'thevalue'}, model)
-        obj.value.should eql('thevalue')
+        expect(obj.value).to eql('thevalue')
       end
 
       it "should provide the raw document" do
         obj = @klass.new({'doc' => 'thedoc'}, model)
-        obj.raw_doc.should eql('thedoc')
+        expect(obj.raw_doc).to eql('thedoc')
       end
 
       it "should instantiate a new document" do
         hash = {'doc' => {'_id' => '12345', 'name' => 'sam'}}
         obj = @klass.new(hash, DesignViewModel)
         doc = double('DesignViewDoc')
-        doc.stub(:database).and_return(DB)
+        allow(doc).to receive(:database).and_return(DB)
         expect(obj.model).to receive(:build_from_database).with(hash['doc']).and_return(doc)
         expect(obj.doc).to eql(doc)
       end
@@ -915,31 +933,31 @@ describe "Design View" do
         hash = {'id' => '12345', 'value' => 5}
         obj = @klass.new(hash, DesignViewModel)
         doc = double('DesignViewModel')
-        doc.stub(:database).and_return(DB)
-        obj.model.should_receive(:get).with('12345', DB).and_return(doc)
-        obj.doc.should eql(doc)
+        allow(doc).to receive(:database).and_return(DB)
+        expect(obj.model).to receive(:get).with('12345', DB).and_return(doc)
+        expect(obj.doc).to eql(doc)
       end
 
       it "should try to load linked document if available" do
         hash = {'id' => '12345', 'value' => {'_id' => '54321'}}
         obj = @klass.new(hash, DesignViewModel)
         doc = double('DesignViewModel')
-        doc.stub(:database).and_return(DB)
-        obj.model.should_receive(:get).with('54321', DB).and_return(doc)
-        obj.doc.should eql(doc)
+        allow(doc).to receive(:database).and_return(DB)
+        expect(obj.model).to receive(:get).with('54321', DB).and_return(doc)
+        expect(obj.doc).to eql(doc)
       end
 
       it "should try to return nil for document if none available" do
         hash = {'value' => 23} # simulate reduce
         obj = @klass.new(hash, DesignViewModel)
         doc = double('DesignViewModel')
-        obj.model.should_not_receive(:get)
-        obj.doc.should be_nil
+        expect(obj.model).not_to receive(:get)
+        expect(obj.doc).to be_nil
       end
 
 
     end
-   
+
   end
 
 
@@ -957,53 +975,53 @@ describe "Design View" do
 
     describe "loading documents" do
       it "should return first" do
-        DesignViewModel.by_name.first.name.should eql("Judith")
+        expect(DesignViewModel.by_name.first.name).to eql("Judith")
       end
 
       it "should return last" do
-        DesignViewModel.by_name.last.name.should eql("Vilma")
+        expect(DesignViewModel.by_name.last.name).to eql("Vilma")
       end
 
       it "should allow multiple results" do
         view = DesignViewModel.by_name.limit(3)
-        view.total_rows.should eql(5)
-        view.last.name.should eql("Peter")
-        view.all.length.should eql(3)
+        expect(view.total_rows).to eql(5)
+        expect(view.last.name).to eql("Peter")
+        expect(view.all.length).to eql(3)
       end
 
       it "should not return document if nil key provided" do
-        DesignViewModel.by_name.key(nil).first.should be_nil
+        expect(DesignViewModel.by_name.key(nil).first).to be_nil
       end
     end
 
     describe "index information" do
       it "should provide total_rows" do
-        DesignViewModel.by_name.total_rows.should eql(5)
+        expect(DesignViewModel.by_name.total_rows).to eql(5)
       end
       it "should provide total_rows" do
-        DesignViewModel.by_name.total_rows.should eql(5)
+        expect(DesignViewModel.by_name.total_rows).to eql(5)
       end
       it "should provide an offset" do
-        DesignViewModel.by_name.offset.should eql(0)
+        expect(DesignViewModel.by_name.offset).to eql(0)
       end
       it "should provide a set of keys" do
-        DesignViewModel.by_name.limit(2).keys.should eql(["Judith", "Lorena"])
+        expect(DesignViewModel.by_name.limit(2).keys).to eql(["Judith", "Lorena"])
       end
     end
 
     describe "viewing" do
       it "should load views with no reduce method" do
         docs = DesignViewModel.by_just_name.all
-        docs.length.should eql(5)
+        expect(docs.length).to eql(5)
       end
       it "should load documents by specific keys" do
         docs = DesignViewModel.by_name.keys(["Judith", "Peter"]).all
-        docs[0].name.should eql("Judith")
-        docs[1].name.should eql("Peter")
+        expect(docs[0].name).to eql("Judith")
+        expect(docs[1].name).to eql("Peter")
       end
       it "should provide count even if limit or skip set" do
         docs = DesignViewModel.by_name.limit(20).skip(2)
-        docs.count.should eql(5)
+        expect(docs.count).to eql(5)
       end
     end
 
@@ -1016,24 +1034,51 @@ describe "Design View" do
       end
 
       it "should calculate number of pages" do
-        @view.total_pages.should eql(2)
+        expect(@view.total_pages).to eql(2)
       end
       it "should return results from first page" do
-        @view.all.first.name.should eql('Judith')
-        @view.all.last.name.should eql('Peter')
+        expect(@view.all.first.name).to eql('Judith')
+        expect(@view.all.last.name).to eql('Peter')
       end
       it "should return results from second page" do
-        @view.page(2).all.first.name.should eql('Sam')
-        @view.page(2).all.last.name.should eql('Vilma')
+        expect(@view.page(2).all.first.name).to eql('Sam')
+        expect(@view.page(2).all.last.name).to eql('Vilma')
       end
 
       it "should allow overriding per page count" do
         @view = @view.per(10)
-        @view.total_pages.should eql(1)
-        @view.all.last.name.should eql('Vilma')
+        expect(@view.total_pages).to eql(1)
+        expect(@view.all.last.name).to eql('Vilma')
       end
     end
 
+    describe "concurrent view accesses" do
+
+      # NOTE: must use `DesignViewModel2` instead of `DesignViewModel` to mimic
+      # a "cold" start of a multi-threaded application (as the checksum is
+      # stored at the class level)
+      class DesignViewModel2 < CouchRest::Model::Base
+        use_database DB
+        property :name
+
+        design do
+          view :by_name
+        end
+      end
+
+      it "should not conflict" do
+        expect {
+          threads = 2.times.map {
+            Thread.new {
+              DesignViewModel2.by_name.page(1).to_a
+            }
+          }
+          threads.each(&:join)
+        }.to_not raise_error
+      end
+
+    end
+
   end