couchrest_model 2.1.0.rc1 → 2.2.0.beta1

data/spec/unit/proxyable_spec.rb

@@ -23,17 +23,43 @@ describe CouchRest::Model::Proxyable do
     end
 
     it "should respond to method" do
-      @obj.should respond_to(:proxy_database)
+      expect(@obj).to respond_to(:proxy_database)
     end
 
     it "should provide proxy database from method" do
       expect(@class).to receive(:proxy_database_method).at_least(:twice).and_return(:slug)
-      expect(@obj.proxy_database).to be_a(CouchRest::Database)
-      expect(@obj.proxy_database.name).to eql('couchrest_proxy')
+      expect(@obj.proxy_database(:assoc)).to be_a(CouchRest::Database)
+      expect(@obj.proxy_database(:assoc).name).to eql('couchrest_proxy')
     end
 
     it "should raise an error if called and no proxy_database_method set" do
-      lambda { @obj.proxy_database }.should raise_error(StandardError, /Please set/)
+      expect { @obj.proxy_database(:assoc) }.to raise_error(StandardError, /Please set/)
+    end
+
+    it "should support passing a suffix" do
+      allow(@class).to receive(:proxy_database_method).and_return(:slug)
+      allow(@class).to receive(:proxy_database_suffixes).and_return({ assoc: 'suffix' })
+      expect { @obj.proxy_database(:assoc) }.not_to raise_error
+    end
+
+    it "should join the suffix to the database name" do
+      allow(@class).to receive(:proxy_database_method).and_return(:slug)
+      allow(@class).to receive(:proxy_database_suffixes).and_return({ assoc: 'suffix' })
+      expect(@obj.proxy_database(:assoc).name).to eql('couchrest_proxy_suffix')
+    end
+
+    it "should support multiple databases" do
+      allow(@class).to receive(:proxy_database_method).and_return(:slug)
+      allow(@class).to receive(:proxy_database_suffixes).and_return({ assoc: 'suffix', another_assoc: "another_suffix" })
+      expect(@obj.proxy_database(:assoc).name).to eql('couchrest_proxy_suffix')
+      expect(@obj.proxy_database(:another_assoc).name).to eql('couchrest_proxy_another_suffix')
+    end
+
+    it "should use the configuration's join character to add the suffix" do
+      @class.connection.update(:join => '-')
+      allow(@class).to receive(:proxy_database_method).and_return(:slug)
+      allow(@class).to receive(:proxy_database_suffixes).and_return({ assoc: 'suffix' })
+      expect(@obj.proxy_database(:assoc).name).to eql('couchrest-proxy-suffix')
     end
   end
 
@@ -45,12 +71,12 @@ describe CouchRest::Model::Proxyable do
         @class = DummyProxyable.clone
       end
       it "should provide proxy_owner_method accessors" do
-        @class.should respond_to(:proxy_owner_method)
-        @class.should respond_to(:proxy_owner_method=)
+        expect(@class).to respond_to(:proxy_owner_method)
+        expect(@class).to respond_to(:proxy_owner_method=)
       end
       it "should work as expected" do
         @class.proxy_owner_method = "foo"
-        @class.proxy_owner_method.should eql("foo")
+        expect(@class.proxy_owner_method).to eql("foo")
       end
     end
 
@@ -60,7 +86,7 @@ describe CouchRest::Model::Proxyable do
       end
       it "should be possible to set the proxy database method" do
         @class.proxy_database_method :db
-        @class.proxy_database_method.should eql(:db)
+        expect(@class.proxy_database_method).to eql(:db)
       end
     end
 
@@ -70,31 +96,54 @@ describe CouchRest::Model::Proxyable do
       end
 
       it "should be provided" do
-        @class.should respond_to(:proxy_for)
+        expect(@class).to respond_to(:proxy_for)
       end
 
       it "should add model name to proxied model name array" do
         @class.proxy_for(:cats)
-        @class.proxied_model_names.should eql(['Cat'])
+        expect(@class.proxied_model_names).to eql(['Cat'])
       end
 
       it "should add method names to proxied method name array" do
         @class.proxy_for(:cats)
-        @class.proxy_method_names.should eql([:cats])
+        expect(@class.proxy_method_names).to eql([:cats])
+      end
+
+      it "should accept a class_name override" do
+        @class.proxy_for(:felines, class_name: "Cat")
+        expect(@class.proxy_method_names).to eql([:felines])
+        expect(@class.proxied_model_names).to eql(['Cat'])
+      end
+
+      describe "proxy database suffix" do
+        it "should support not passing a suffix" do
+          @class.proxy_for(:cats)
+          expect(@class.proxy_database_suffixes).to eql({ cats: nil })
+        end
+
+        it "should set the database suffix if provided" do
+          @class.proxy_for(:cats, use_suffix: true)
+          expect(@class.proxy_database_suffixes).to eql({ cats: 'cats' })
+        end
+
+        it "should accept a database suffix override" do
+          @class.proxy_for(:cats, database_suffix: 'felines')
+          expect(@class.proxy_database_suffixes).to eql({ cats: 'felines' })
+        end
       end
 
       it "should create a new method" do
-        DummyProxyable.stub(:method_defined?).and_return(true)
+        allow(DummyProxyable).to receive(:method_defined?).and_return(true)
         DummyProxyable.proxy_for(:cats)
-        DummyProxyable.new.should respond_to(:cats)
+        expect(DummyProxyable.new).to respond_to(:cats)
       end
 
       describe "generated method" do
         it "should call ModelProxy" do
           DummyProxyable.proxy_for(:cats)
           @obj = DummyProxyable.new
-          CouchRest::Model::Proxyable::ModelProxy.should_receive(:new).with(Cat, @obj, 'dummy_proxyable', 'db').and_return(true)
-          @obj.should_receive(:proxy_database).and_return('db')
+          expect(CouchRest::Model::Proxyable::ModelProxy).to receive(:new).with(Cat, @obj, 'dummy_proxyable', 'db').and_return(true)
+          expect(@obj).to receive(:proxy_database).and_return('db')
           @obj.cats
         end
 
@@ -104,8 +153,8 @@ describe CouchRest::Model::Proxyable do
           end
           DummyProxyable.proxy_for(:documents)
           @obj = DummyProxyable.new
-          CouchRest::Model::Proxyable::ModelProxy.should_receive(:new).with(::Document, @obj, 'dummy_proxyable', 'db').and_return(true)
-          @obj.should_receive('proxy_database').and_return('db')
+          expect(CouchRest::Model::Proxyable::ModelProxy).to receive(:new).with(::Document, @obj, 'dummy_proxyable', 'db').and_return(true)
+          expect(@obj).to receive('proxy_database').and_return('db')
           @obj.documents
         end
       end
@@ -117,36 +166,36 @@ describe CouchRest::Model::Proxyable do
       end
 
       it "should be provided" do
-        @class.should respond_to(:proxied_by)
+        expect(@class).to respond_to(:proxied_by)
       end
 
       it "should add an attribute accessor" do
         @class.proxied_by(:foobar)
-        @class.new.should respond_to(:foobar)
+        expect(@class.new).to respond_to(:foobar)
       end
 
       it "should provide #model_proxy method" do
         @class.proxied_by(:foobar)
-        @class.new.should respond_to(:model_proxy)
+        expect(@class.new).to respond_to(:model_proxy)
       end
 
       it "should set the proxy_owner_method" do
         @class.proxied_by(:foobar)
-        @class.proxy_owner_method.should eql(:foobar)
+        expect(@class.proxy_owner_method).to eql(:foobar)
       end
 
       it "should raise an error if model name pre-defined" do
-        lambda { @class.proxied_by(:object_id) }.should raise_error
+        expect { @class.proxied_by(:object_id) }.to raise_error(/Model can only be proxied once/)
       end
 
       it "should raise an error if object already has a proxy" do
         @class.proxied_by(:department)
-        lambda { @class.proxied_by(:company) }.should raise_error
+        expect { @class.proxied_by(:company) }.to raise_error(/Model can only be proxied once/)
       end
 
       it "should overwrite the database method to provide an error" do
         @class.proxied_by(:company)
-        lambda { @class.database }.should raise_error(StandardError, /database must be accessed via/)
+        expect { @class.database }.to raise_error(StandardError, /database must be accessed via/)
       end
     end
 
@@ -156,16 +205,16 @@ describe CouchRest::Model::Proxyable do
       end
 
       it "should respond to proxied_model_names" do
-        @class.should respond_to(:proxied_model_names)
+        expect(@class).to respond_to(:proxied_model_names)
       end
 
       it "should provide an empty array" do
-        @class.proxied_model_names.should be_empty
+        expect(@class.proxied_model_names).to be_empty
       end
 
       it "should accept new entries" do
         @class.proxied_model_names << 'Cat'
-        @class.proxied_model_names.first.should eql('Cat')
+        expect(@class.proxied_model_names.first).to eql('Cat')
       end
     end
 
@@ -179,139 +228,148 @@ describe CouchRest::Model::Proxyable do
 
     before :each do
       @design_doc = double('Design')
-      @design_doc.stub(:view_names).and_return(['all', 'by_name'])
+      allow(@design_doc).to receive(:view_names).and_return(['all', 'by_name'])
       @model = double('Cat')
-      @model.stub(:design_docs).and_return([@design_doc])
+      allow(@model).to receive(:design_docs).and_return([@design_doc])
       @obj = @klass.new(@model, 'owner', 'owner_name', 'database')
     end
 
     describe "initialization" do
 
       it "should set base attributes" do
-        @obj.model.should eql(@model)
-        @obj.owner.should eql('owner')
-        @obj.owner_name.should eql('owner_name')
-        @obj.database.should eql('database')
+        expect(@obj.model).to eql(@model)
+        expect(@obj.owner).to eql('owner')
+        expect(@obj.owner_name).to eql('owner_name')
+        expect(@obj.database).to eql('database')
       end
 
       it "should create view methods" do
-        @obj.should respond_to('all')
-        @obj.should respond_to('by_name')
-        @obj.should respond_to('find_all')
-        @obj.should respond_to('find_by_name')
-        @obj.should respond_to('find_by_name!')
+        expect(@obj).to respond_to('all')
+        expect(@obj).to respond_to('by_name')
+        expect(@obj).to respond_to('find_all')
+        expect(@obj).to respond_to('find_by_name')
+        expect(@obj).to respond_to('find_by_name!')
       end
 
       it "should create 'all' view method that forward to model's view with proxy" do
-        @model.should_receive(:all).with(:proxy => @obj).and_return(nil)
+        expect(@model).to receive(:all).with(:proxy => @obj).and_return(nil)
         @obj.all
       end
 
       it "should create 'by_name' view method that forward to model's view with proxy" do
-        @model.should_receive(:by_name).with(:proxy => @obj).and_return(nil)
+        expect(@model).to receive(:by_name).with(:proxy => @obj).and_return(nil)
         @obj.by_name
       end
 
       it "should create 'find_by_name' view that forwards to normal view" do
         view = double('view')
-        view.should_receive('key').with('name').and_return(view)
-        view.should_receive('first').and_return(nil)
-        @obj.should_receive(:by_name).and_return(view)
+        expect(view).to receive('key').with('name').and_return(view)
+        expect(view).to receive('first').and_return(nil)
+        expect(@obj).to receive(:by_name).and_return(view)
         @obj.find_by_name('name')
       end
 
       it "should create 'find_by_name!' that raises error when there are no results" do
         view = double('view')
-        view.should_receive('key').with('name').and_return(view)
-        view.should_receive('first').and_return(nil)
-        @obj.should_receive(:by_name).and_return(view)
-        lambda { @obj.find_by_name!('name') }.should raise_error(CouchRest::Model::DocumentNotFound)
+        expect(view).to receive('key').with('name').and_return(view)
+        expect(view).to receive('first').and_return(nil)
+        expect(@obj).to receive(:by_name).and_return(view)
+        expect { @obj.find_by_name!('name') }.to raise_error(CouchRest::Model::DocumentNotFound)
       end
-
     end
 
     describe "instance" do
 
       it "should proxy new call" do
-        @obj.should_receive(:proxy_block_update).with(:new, 'attrs', 'opts')
+        expect(@obj).to receive(:proxy_block_update).with(:new, 'attrs', 'opts')
         @obj.new('attrs', 'opts')
       end
 
       it "should proxy build_from_database" do
-        @obj.should_receive(:proxy_block_update).with(:build_from_database, 'attrs', 'opts')
+        expect(@obj).to receive(:proxy_block_update).with(:build_from_database, 'attrs', 'opts')
         @obj.build_from_database('attrs', 'opts')
       end
 
       it "should proxy #count" do
         view = double('View')
-        view.should_receive(:count).and_return(nil)
-        @model.should_receive(:all).and_return(view)
+        expect(view).to receive(:count).and_return(nil)
+        expect(@model).to receive(:all).and_return(view)
         @obj.count
       end
 
       it "should proxy #first" do
         view = double('View')
-        view.should_receive(:first).and_return(nil)
-        @model.should_receive(:all).and_return(view)
+        expect(view).to receive(:first).and_return(nil)
+        expect(@model).to receive(:all).and_return(view)
         @obj.first
       end
 
       it "should proxy #last" do
         view = double('View')
-        view.should_receive(:last).and_return(nil)
-        @model.should_receive(:all).and_return(view)
+        expect(view).to receive(:last).and_return(nil)
+        expect(@model).to receive(:all).and_return(view)
         @obj.last
       end
 
       it "should proxy #get" do
-        @model.should_receive(:get).with(32, 'database')
-        @obj.should_receive(:proxy_update)
+        expect(@model).to receive(:get).with(32, 'database')
+        expect(@obj).to receive(:proxy_update)
         @obj.get(32)
       end
+
       it "should proxy #find" do
-        @model.should_receive(:get).with(32, 'database')
-        @obj.should_receive(:proxy_update)
+        expect(@model).to receive(:get).with(32, 'database')
+        expect(@obj).to receive(:proxy_update)
         @obj.find(32)
       end
 
+      it "should proxy factory methods" do
+        expect(@model).to receive(:factory_method).with(@obj, "arg_1", "arg_2")
+        @obj.factory_method("arg_1", "arg_2")
+      end
+
+      it "shouldn't forward undefined model methods" do
+        expect { @obj.undefined_factory_method("arg_1", "arg_2") }.to raise_error(NoMethodError, /CouchRest::Model::Proxy/)
+      end
+
 
       ### Updating methods
 
       describe "#proxy_update" do
         it "should set returned doc fields" do
           doc = double(:Document)
-          doc.should_receive(:is_a?).with(@model).and_return(true)
-          doc.should_receive(:database=).with('database')
-          doc.should_receive(:model_proxy=).with(@obj)
-          doc.should_receive(:send).with('owner_name=', 'owner')
-          @obj.send(:proxy_update, doc).should eql(doc)
+          expect(doc).to receive(:is_a?).with(@model).and_return(true)
+          expect(doc).to receive(:database=).with('database')
+          expect(doc).to receive(:model_proxy=).with(@obj)
+          expect(doc).to receive(:send).with('owner_name=', 'owner')
+          expect(@obj.send(:proxy_update, doc)).to eql(doc)
         end
 
         it "should not set anything if matching document not provided" do
           doc = double(:DocumentFoo)
-          doc.should_receive(:is_a?).with(@model).and_return(false)
-          doc.should_not_receive(:database=)
-          doc.should_not_receive(:model_proxy=)
-          doc.should_not_receive(:owner_name=)
-          @obj.send(:proxy_update, doc).should eql(doc)
+          expect(doc).to receive(:is_a?).with(@model).and_return(false)
+          expect(doc).not_to receive(:database=)
+          expect(doc).not_to receive(:model_proxy=)
+          expect(doc).not_to receive(:owner_name=)
+          expect(@obj.send(:proxy_update, doc)).to eql(doc)
         end
 
         it "should pass nil straight through without errors" do
-          lambda { @obj.send(:proxy_update, nil).should eql(nil) }.should_not raise_error
+          expect { expect(@obj.send(:proxy_update, nil)).to eql(nil) }.not_to raise_error
         end
       end
 
       it "#proxy_update_all should update array of docs" do
         docs = [{}, {}]
-        @obj.should_receive(:proxy_update).twice.with({})
+        expect(@obj).to receive(:proxy_update).twice.with({})
         @obj.send(:proxy_update_all, docs)
       end
 
       describe "#proxy_block_update" do
         it "should proxy block updates" do
           doc = { }
-          @obj.model.should_receive(:new).and_yield(doc)
-          @obj.should_receive(:proxy_update).with(doc)
+          expect(@obj.model).to receive(:new).and_yield(doc)
+          expect(@obj).to receive(:proxy_update).with(doc)
           @obj.send(:proxy_block_update, :new)
         end
       end
@@ -327,7 +385,7 @@ describe CouchRest::Model::Proxyable do
         use_database DB
         property :slug
         proxy_for :proxyable_invoices
-        def proxy_database
+        def proxy_database(assoc)
           @db ||= TEST_SERVER.database!(TESTDB + "-#{slug}")
         end
       end
@@ -346,26 +404,26 @@ describe CouchRest::Model::Proxyable do
 
     it "should create the new database" do
       view = @company.proxyable_invoices.all
-      view.should be_empty
-      TEST_SERVER.databases.find{|db| db =~ /#{TESTDB}-samco/}.should_not be_nil
+      expect(view).to be_empty
+      expect(TEST_SERVER.databases.find{|db| db =~ /#{TESTDB}-samco/}).not_to be_nil
     end
 
     it "should allow creation of new entries" do
       inv = @company.proxyable_invoices.new(:client => "Lorena", :total => 35)
       # inv.database.should_not be_nil
-      inv.save.should be_true
-      @company.proxyable_invoices.count.should eql(1)
-      @company.proxyable_invoices.first.client.should eql("Lorena")
+      expect(inv.save).to be_truthy
+      expect(@company.proxyable_invoices.count).to eql(1)
+      expect(@company.proxyable_invoices.first.client).to eql("Lorena")
     end
 
     it "should validate uniqueness" do
       inv = @company.proxyable_invoices.new(:client => "Lorena", :total => 40)
-      inv.save.should be_false
+      expect(inv.save).to be_falsey
     end
 
     it "should allow design views" do
       item = @company.proxyable_invoices.by_total.key(35).first
-      item.client.should eql('Lorena')
+      expect(item.client).to eql('Lorena')
     end
 
   end

data/spec/unit/subclass_spec.rb

@@ -39,55 +39,55 @@ describe "Subclassing a Model" do
   end
   
   it "shouldn't messup the parent's properties" do
-    Card.properties.should_not == BusinessCard.properties
+    expect(Card.properties).not_to eq(BusinessCard.properties)
   end
   
   it "should share the same db default" do
-    @card.database.uri.should == Card.database.uri
+    expect(@card.database.uri).to eq(Card.database.uri)
   end
   
   it "should have kept the validation details" do
-    @card.should_not be_valid
+    expect(@card).not_to be_valid
   end
   
   it "should have added the new validation details" do
     validated_fields = @card.class.validators.map{|v| v.attributes}.flatten
-    validated_fields.should include(:extension_code)
-    validated_fields.should include(:job_title)
+    expect(validated_fields).to include(:extension_code)
+    expect(validated_fields).to include(:job_title)
   end
   
   it "should not add to the parent's validations" do
     validated_fields = Card.validators.map{|v| v.attributes}.flatten
-    validated_fields.should_not include(:extension_code)
-    validated_fields.should_not include(:job_title) 
+    expect(validated_fields).not_to include(:extension_code)
+    expect(validated_fields).not_to include(:job_title) 
   end
 
   it "should inherit default property values" do
-    @card.bg_color.should == '#ccc'
+    expect(@card.bg_color).to eq('#ccc')
   end
 
   it "should be able to overwrite a default property" do
-    DesignBusinessCard.new.bg_color.should == '#eee'
+    expect(DesignBusinessCard.new.bg_color).to eq('#eee')
   end
 
   it "should have a design doc slug based on the subclass name" do
-    OnlineCourse.design_doc['_id'].should =~ /OnlineCourse$/
+    expect(OnlineCourse.design_doc['_id']).to match(/OnlineCourse$/)
   end
 
   it "should not add views to the parent's design_doc" do
-    Course.design_doc['views'].keys.should_not include('by_url')
+    expect(Course.design_doc['views'].keys).not_to include('by_url')
   end
 
   it "should add the parent's views to its design doc" do
-    OnlineCourse.design_doc['views'].keys.should include('by_title')
+    expect(OnlineCourse.design_doc['views'].keys).to include('by_title')
   end
 
   it "should add the parent's views but alter the model names in map function" do
-    OnlineCourse.design_doc['views']['by_title']['map'].should =~ /doc\['#{OnlineCourse.model_type_key}'\] == 'OnlineCourse'/
+    expect(OnlineCourse.design_doc['views']['by_title']['map']).to match(/doc\['#{OnlineCourse.model_type_key}'\] == 'OnlineCourse'/)
   end
 
   it "should have an all view with a guard clause for model == subclass name in the map function" do
-    OnlineCourse.design_doc['views']['all']['map'].should =~ /if \(doc\['#{OnlineCourse.model_type_key}'\] == 'OnlineCourse'\)/
+    expect(OnlineCourse.design_doc['views']['all']['map']).to match(/if \(doc\['#{OnlineCourse.model_type_key}'\] == 'OnlineCourse'\)/)
   end
 
 end