couchrest_model 2.0.4 → 2.1.0.beta1

data/spec/unit/designs_spec.rb

@@ -136,7 +136,7 @@ describe CouchRest::Model::Designs do
 
       it "will fail if reduce is not specific in view" do
         @mod.create(:title => 'This is a test')
-        lambda { @mod.by_title_fail.first }.should raise_error(RestClient::ResourceNotFound)
+        lambda { @mod.by_title_fail.first }.should raise_error(CouchRest::NotFound)
       end
 
       it "will perform view request" do
@@ -212,14 +212,16 @@ describe CouchRest::Model::Designs do
           end
         end
         it "should barf on all if no database given" do
-          lambda{Unattached.all.first}.should raise_error
+          expect do 
+            Unattached.all.first
+          end.to raise_error(CouchRest::Model::DatabaseNotDefined)
         end
         it "should query all" do
           rs = Unattached.all.database(@db).all
-          rs.length.should == 4
+          expect(rs.length).to eql(4)
         end
         it "should barf on query if no database given" do
-          lambda{Unattached.by_title.all}.should raise_error /Database must be defined/
+          expect() { Unattached.by_title.all }.to raise_error(CouchRest::Model::DatabaseNotDefined)
         end
         it "should make the design doc upon first query" do
           Unattached.by_title.database(@db)
@@ -230,22 +232,17 @@ describe CouchRest::Model::Designs do
           rs = Unattached.by_title.database(@db).startkey("bbb").endkey("eee")
           rs.length.should == 3
         end
-        it "should return nil on get if no database given" do
-          Unattached.get("aaa").should be_nil
-        end
-        it "should barf on get! if no database given" do
-          lambda{Unattached.get!("aaa")}.should raise_error
-        end
         it "should get from specific database" do
           u = Unattached.get(@first_id, @db)
           u.title.should == "aaa"
         end
         it "should barf on first if no database given" do
-          lambda{Unattached.first}.should raise_error
+          expect{ Unattached.first }.to raise_error(CouchRest::Model::DatabaseNotDefined)
         end
-        it "should get first" do
+        it "should get first with database set" do
           u = Unattached.all.database(@db).first
-          u.title.should =~ /\A...\z/
+          expect(u.title).to match(/\A...\z/)
+          expect(u.database).to eql(@db)
         end
         it "should get last" do
           u = Unattached.all.database(@db).last

data/spec/unit/embeddable_spec.rb

@@ -15,8 +15,7 @@ class OldFashionedMixin < Hash
 end
 
 class DummyModel < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
-  raise "Default DB not set" if TEST_SERVER.default_database.nil?
+  use_database DB 
   property :casted_attribute, WithCastedModelMixin
   property :keywords,         [String]
   property :old_casted_attribute, OldFashionedMixin
@@ -45,8 +44,7 @@ class WithCastedCallBackModel
 end
 
 class CastedCallbackDoc < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
-  raise "Default DB not set" if TEST_SERVER.default_database.nil?
+  use_database DB 
   property :callback_model, WithCastedCallBackModel
 end
 

data/spec/unit/persistence_spec.rb

@@ -262,7 +262,7 @@ describe CouchRest::Model::Persistence do
     end
     it "should make it go away" do
       @dobj.destroy
-      lambda{Basic.get!(@dobj.id)}.should raise_error(CouchRest::Model::DocumentNotFound)
+      expect(Basic.get(@dobj.id)).to be_nil
     end
     it "should freeze the object" do
       @dobj.destroy
@@ -272,7 +272,7 @@ describe CouchRest::Model::Persistence do
     it "trying to save after should fail" do
       @dobj.destroy
       lambda { @dobj.save }.should raise_error(StandardError)
-      lambda{Basic.get!(@dobj.id)}.should raise_error(CouchRest::Model::DocumentNotFound)
+      expect(Basic.get(@dobj.id)).to be_nil
     end
     it "should make destroyed? true" do
       @dobj.destroyed?.should be_false
@@ -303,13 +303,21 @@ describe CouchRest::Model::Persistence do
       Article.get("").should be_nil
     end
     it "should raise an error if `get!` is used and the document doesn't exist" do
-      expect{ Article.get!('matt aimonetti') }.to raise_error
+      expect{ Article.get!('matt aimonetti') }.to raise_error(CouchRest::Model::DocumentNotFound)
     end
     it "should raise an error if `get!` is requested with a blank id" do
-      expect{ Article.get!("") }.to raise_error
+      expect{ Article.get!("") }.to raise_error(CouchRest::Model::DocumentNotFound)
     end
     it "should raise an error if `find!` is used and the document doesn't exist" do
-      expect{ Article.find!('matt aimonetti') }.to raise_error
+      expect{ Article.find!('matt aimonetti') }.to raise_error(CouchRest::Model::DocumentNotFound)
+    end
+    context "without a database" do
+      it "should cause #get to raise an error" do
+        Article.stub(:database).and_return(nil)
+        expect{ Article.get('foo') }.to raise_error(CouchRest::Model::DatabaseNotDefined)
+        expect{ Article.get!('foo') }.to raise_error(CouchRest::Model::DatabaseNotDefined)
+      end
+
     end
   end
 

data/spec/unit/property_protection_spec.rb

@@ -4,7 +4,7 @@ describe "Model Attributes" do
 
   describe "no declarations" do
     class NoProtection < CouchRest::Model::Base
-      use_database TEST_SERVER.default_database
+      use_database DB 
       property :name
       property :phone
     end
@@ -44,7 +44,7 @@ describe "Model Attributes" do
 
   describe "Model Base", "accessible flag" do
     class WithAccessible < CouchRest::Model::Base
-      use_database TEST_SERVER.default_database
+      use_database DB
       property :name, :accessible => true
       property :admin, :default => false
     end
@@ -81,7 +81,7 @@ describe "Model Attributes" do
 
   describe "Model Base", "protected flag" do
     class WithProtected < CouchRest::Model::Base
-      use_database TEST_SERVER.default_database
+      use_database DB
       property :name
       property :admin, :default => false, :protected => true
     end
@@ -127,7 +127,7 @@ describe "Model Attributes" do
 
   describe "Model Base", "mixing protected and accessible flags" do
     class WithBothAndUnspecified < CouchRest::Model::Base
-      use_database TEST_SERVER.default_database
+      use_database DB
       property :name, :accessible => true
       property :admin, :default => false, :protected => true
       property :phone, :default => 'unset phone number'
@@ -147,7 +147,7 @@ describe "Model Attributes" do
 
   describe "from database" do
     class WithProtected < CouchRest::Model::Base
-      use_database TEST_SERVER.default_database
+      use_database DB
       property :name
       property :admin, :default => false, :protected => true
       design do

data/spec/unit/property_spec.rb

@@ -509,26 +509,26 @@ describe "Property Class" do
   describe "casting" do
     it "should cast a value" do
       property = CouchRest::Model::Property.new(:test, :type => Date)
-      parent = mock("FooObject")
+      parent = double("FooObject")
       property.cast(parent, "2010-06-16").should eql(Date.new(2010, 6, 16))
       property.cast_value(parent, "2010-06-16").should eql(Date.new(2010, 6, 16))
     end
 
     it "should cast an array of values" do
       property = CouchRest::Model::Property.new(:test, :type => [Date])
-      parent = mock("FooObject")
+      parent = double("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).should eql([Date.new(2010, 6, 1), Date.new(2010, 6, 2)])
     end
 
     it "should cast an array of values with array option" do
       property = CouchRest::Model::Property.new(:test, :type => Date, :array => true)
-      parent = mock("FooObject")
+      parent = double("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).should eql([Date.new(2010, 6, 1), Date.new(2010, 6, 2)])
     end
 
     context "when allow_blank is false" do
       let :parent do
-        mock("FooObject")
+        double("FooObject")
       end
 
       it "should convert blank to nil" do
@@ -544,13 +544,13 @@ describe "Property Class" do
 
     it "should set a CastedArray on array of Objects" do
       property = CouchRest::Model::Property.new(:test, :type => [Object])
-      parent = mock("FooObject")
+      parent = double("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should eql(CouchRest::Model::CastedArray)
     end
 
     it "should set a CastedArray on array of Strings" do
       property = CouchRest::Model::Property.new(:test, :type => [String])
-      parent = mock("FooObject")
+      parent = double("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should eql(CouchRest::Model::CastedArray)
     end
 
@@ -573,20 +573,20 @@ describe "Property Class" do
         def as_json; ary; end
       end
       property = CouchRest::Model::Property.new(:test, :type => prop)
-      parent = mock("FooClass")
+      parent = double("FooClass")
       cast = property.cast(parent, [1, 2])
       cast.ary.should eql([1, 2])
     end
 
     it "should set parent as casted_by object in CastedArray" do
       property = CouchRest::Model::Property.new(:test, :type => [Object])
-      parent = mock("FooObject")
+      parent = double("FooObject")
       property.cast(parent, ["2010-06-01", "2010-06-02"]).casted_by.should eql(parent)
     end
 
     it "should set casted_by on new value" do
       property = CouchRest::Model::Property.new(:test, :type => CatToy)
-      parent = mock("CatObject")
+      parent = double("CatObject")
       cast = property.cast(parent, {:name => 'catnip'})
       cast.casted_by.should eql(parent)
     end

data/spec/unit/proxyable_spec.rb

@@ -27,9 +27,9 @@ describe CouchRest::Model::Proxyable do
     end
 
     it "should provide proxy database from method" do
-      @class.stub!(:proxy_database_method).twice.and_return(:slug)
-      @obj.proxy_database.should be_a(CouchRest::Database)
-      @obj.proxy_database.name.should eql('couchrest_proxy')
+      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')
     end
 
     it "should raise an error if called and no proxy_database_method set" do
@@ -84,7 +84,7 @@ describe CouchRest::Model::Proxyable do
       end
 
       it "should create a new method" do
-        DummyProxyable.stub!(:method_defined?).and_return(true)
+        DummyProxyable.stub(:method_defined?).and_return(true)
         DummyProxyable.proxy_for(:cats)
         DummyProxyable.new.should respond_to(:cats)
       end
@@ -178,10 +178,10 @@ describe CouchRest::Model::Proxyable do
     end
 
     before :each do
-      @design_doc = mock('Design')
-      @design_doc.stub!(:view_names).and_return(['all', 'by_name'])
-      @model = mock('Cat')
-      @model.stub!(:design_docs).and_return([@design_doc])
+      @design_doc = double('Design')
+      @design_doc.stub(:view_names).and_return(['all', 'by_name'])
+      @model = double('Cat')
+      @model.stub(:design_docs).and_return([@design_doc])
       @obj = @klass.new(@model, 'owner', 'owner_name', 'database')
     end
 
@@ -213,7 +213,7 @@ describe CouchRest::Model::Proxyable do
       end
 
       it "should create 'find_by_name' view that forwards to normal view" do
-        view = mock('view')
+        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)
@@ -221,7 +221,7 @@ describe CouchRest::Model::Proxyable do
       end
 
       it "should create 'find_by_name!' that raises error when there are no results" do
-        view = mock('view')
+        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)
@@ -243,21 +243,21 @@ describe CouchRest::Model::Proxyable do
       end
 
       it "should proxy #count" do
-        view = mock('View')
+        view = double('View')
         view.should_receive(:count).and_return(nil)
         @model.should_receive(:all).and_return(view)
         @obj.count
       end
 
       it "should proxy #first" do
-        view = mock('View')
+        view = double('View')
         view.should_receive(:first).and_return(nil)
         @model.should_receive(:all).and_return(view)
         @obj.first
       end
 
       it "should proxy #last" do
-        view = mock('View')
+        view = double('View')
         view.should_receive(:last).and_return(nil)
         @model.should_receive(:all).and_return(view)
         @obj.last
@@ -279,7 +279,7 @@ describe CouchRest::Model::Proxyable do
 
       describe "#proxy_update" do
         it "should set returned doc fields" do
-          doc = mock(:Document)
+          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)
@@ -288,7 +288,7 @@ describe CouchRest::Model::Proxyable do
         end
 
         it "should not set anything if matching document not provided" do
-          doc = mock(:DocumentFoo)
+          doc = double(:DocumentFoo)
           doc.should_receive(:is_a?).with(@model).and_return(false)
           doc.should_not_receive(:database=)
           doc.should_not_receive(:model_proxy=)

data/spec/unit/subclass_spec.rb

@@ -23,7 +23,7 @@ class OnlineCourse < Course
 end
 
 class Animal < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
+  use_database DB
   property :name
   design do
     view :by_name

data/spec/unit/utils/migrate_spec.rb

@@ -12,10 +12,10 @@ describe CouchRest::Model::Utils::Migrate do
       @module.load_all_models
     end
     it "should detect if Rails is available and require models" do
-      Rails = mock()
-      Rails.stub!(:root).and_return("")
+      Rails = double()
+      Rails.stub(:root).and_return("")
       Dir.should_receive(:[]).with("app/models/**/*.rb").and_return(['failed_require'])
-      # we can't mock require, so just expect an error
+      # we can't double require, so just expect an error
       expect {
         @module.load_all_models
       }.to raise_error(LoadError)

data/spec/unit/validations_spec.rb

@@ -76,9 +76,9 @@ describe CouchRest::Model::Validations do
       it "should allow specific view" do
         @obj = WithUniqueValidationProxy.new(:title => 'test 7')
         @obj.class.should_not_receive('by_title')
-        view = mock('View')
-        view.stub!(:rows).and_return([])
-        proxy = mock('Proxy')
+        view = double('View')
+        view.stub(:rows).and_return([])
+        proxy = double('Proxy')
         proxy.should_receive('by_title').and_return(view)
         proxy.should_receive('respond_to?').with('by_title').and_return(true)
         @obj.should_receive('proxy').and_return(proxy)
@@ -88,12 +88,12 @@ describe CouchRest::Model::Validations do
 
     context "when proxied" do
       it "should lookup the model_proxy" do
-        view = mock('View')
-        view.stub!(:rows).and_return([])
-        mp = mock(:ModelProxy)
+        view = double('View')
+        view.stub(:rows).and_return([])
+        mp = double(:ModelProxy)
         mp.should_receive(:by_title).and_return(view)
         @obj = WithUniqueValidation.new(:title => 'test 8')
-        @obj.stub!(:model_proxy).twice.and_return(mp)
+        @obj.stub(:model_proxy).twice.and_return(mp)
         @obj.valid?
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_model
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -12,56 +12,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -82,70 +62,104 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 0.5.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: CouchRest Model provides aditional features to the standard CouchRest
   Document class such as properties, view designs, associations, callbacks, typecasting
   and validations.
@@ -166,6 +180,8 @@ files:
 - Rakefile
 - THANKS.md
 - VERSION
+- benchmarks/Gemfile
+- benchmarks/connections.rb
 - benchmarks/dirty.rb
 - couchrest_model.gemspec
 - history.md
@@ -293,7 +309,7 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Extends the CouchRest Document for advanced modelling.
+summary: Extends the CouchRest Document class for advanced modelling.
 test_files:
 - spec/fixtures/attachments/README
 - spec/fixtures/attachments/couchdb.png