couchrest_model 2.2.0.beta1 → 2.2.0.beta2

data/spec/unit/designs_spec.rb

@@ -185,72 +185,6 @@ describe CouchRest::Model::Designs do
 
       end
 
-      describe "a model class with database provided manually" do
-
-        class Unattached < CouchRest::Model::Base
-          property :title
-          property :questions
-          property :professor
-          design do
-            view :by_title
-          end
-
-          # Force the database to always be nil
-          def self.database
-            nil
-          end
-        end
-
-        before(:all) do
-          reset_test_db!
-          @db = DB 
-          %w{aaa bbb ddd eee}.each do |title|
-            u = Unattached.new(:title => title)
-            u.database = @db
-            u.save
-            @first_id ||= u.id
-          end
-        end
-        it "should barf on all if no database given" do
-          expect do 
-            Unattached.all.first
-          end.to raise_error(CouchRest::Model::DatabaseNotDefined)
-        end
-        it "should query all" do
-          rs = Unattached.all.database(@db).all
-          expect(rs.length).to eql(4)
-        end
-        it "should barf on query if no database given" do
-          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)
-          doc = Unattached.design_doc
-          expect(doc['views']['all']['map']).to include('Unattached')
-        end
-        it "should merge query params" do
-          rs = Unattached.by_title.database(@db).startkey("bbb").endkey("eee")
-          expect(rs.length).to eq(3)
-        end
-        it "should get from specific database" do
-          u = Unattached.get(@first_id, @db)
-          expect(u.title).to eq("aaa")
-        end
-        it "should barf on first if no database given" do
-          expect{ Unattached.first }.to raise_error(CouchRest::Model::DatabaseNotDefined)
-        end
-        it "should get first with database set" do
-          u = Unattached.all.database(@db).first
-          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
-          expect(u.title).to eq("aaa")
-        end
-
-      end
-
       describe "a model with a compound key view" do
         before(:all) do
           reset_test_db!

data/spec/unit/persistence_spec.rb

@@ -485,6 +485,13 @@ describe CouchRest::Model::Persistence do
       i = Article.create!(:title => "Reload return self")
       expect(i.reload).to be(i)
     end
+
+    it "should raise DocumentNotFound if doc has been deleted" do
+      i = Article.create!(:title => "Reload deleted")
+      dup = Article.find(i.id)
+      dup.destroy
+      expect { i.reload }.to raise_error(CouchRest::Model::DocumentNotFound)
+    end
   end
 
   describe ".model_type_value" do

data/spec/unit/proxyable_spec.rb

@@ -61,6 +61,23 @@ describe CouchRest::Model::Proxyable do
       allow(@class).to receive(:proxy_database_suffixes).and_return({ assoc: 'suffix' })
       expect(@obj.proxy_database(:assoc).name).to eql('couchrest-proxy-suffix')
     end
+
+    context "when use_database is set" do
+      before do
+        @class = Class.new(CouchRest::Model::Base)
+        @class.class_eval do
+          use_database "another_database"
+          def slug; 'proxy'; end
+        end
+        @obj = @class.new
+      end
+
+      it "should provide proxy database from method not considering use database" do
+        expect(@class).to receive(:proxy_database_method).at_least(:twice).and_return(:slug)
+        expect(@obj.proxy_database(:assoc)).to be_a(CouchRest::Database)
+        expect(@obj.proxy_database(:assoc).name).to eql('couchrest_proxy')
+      end
+    end
   end
 
   describe "class methods" do
@@ -312,17 +329,35 @@ describe CouchRest::Model::Proxyable do
       end
 
       it "should proxy #get" do
-        expect(@model).to receive(:get).with(32, 'database')
+        expect(@model).to receive(:fetch_and_build_from_database).with(32, 'database')
         expect(@obj).to receive(:proxy_update)
         @obj.get(32)
       end
 
+      it "should proxy #get and catch missing doc error" do
+        expect(@model).to receive(:fetch_and_build_from_database).with(32, 'database').and_raise(CouchRest::Model::DocumentNotFound)
+        expect(@obj.get(32)).to be_nil
+      end
+
+
       it "should proxy #find" do
-        expect(@model).to receive(:get).with(32, 'database')
+        expect(@model).to receive(:fetch_and_build_from_database).with(32, 'database')
         expect(@obj).to receive(:proxy_update)
         @obj.find(32)
       end
 
+      it "should proxy #get!" do
+        expect(@model).to receive(:fetch_and_build_from_database).with(32, 'database')
+        expect(@obj).to receive(:proxy_update)
+        @obj.get!(32)
+      end
+
+      it "should proxy #find!" do
+        expect(@model).to receive(:fetch_and_build_from_database).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")

data/spec/unit/server_pool_spec.rb

@@ -0,0 +1,31 @@
+
+require "spec_helper"
+
+describe CouchRest::Model::ServerPool do
+
+  subject { CouchRest::Model::ServerPool }
+
+  describe ".instance" do
+
+    it "should provide a singleton" do 
+      expect(subject.instance).to be_a(CouchRest::Model::ServerPool)
+    end
+
+  end
+
+  describe "#[url]" do
+
+    it "should provide a server object" do
+      srv = subject.instance[COUCHHOST]
+      expect(srv).to be_a(CouchRest::Server)
+    end
+
+    it "should always provide same object" do
+      srv = subject.instance[COUCHHOST]
+      srv2 = subject.instance[COUCHHOST]
+      expect(srv.object_id).to eql(srv2.object_id)
+    end
+
+  end
+
+end

data/spec/unit/support/couchrest_database_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe CouchRest::Model::Support::Database do
+
+  describe "#delete!" do
+
+    it "should empty design cache after a database is destroyed" do
+      Thread.current[:couchrest_design_cache] = { :foo => :bar }
+      DB.delete!
+      expect(Thread.current[:couchrest_design_cache]).to be_empty
+    end
+
+  end
+
+end

data/spec/unit/utils/migrate_spec.rb

@@ -1,6 +1,36 @@
-
 require 'spec_helper'
 
+class MigrateModel < CouchRest::Model::Base
+  use_database :migrations
+  proxy_database_method :id
+  proxy_for :migrate_proxy_models
+  property :name
+  property :value
+  design { view :by_name }
+end
+
+class MigrateProxyModel < CouchRest::Model::Base
+  proxied_by :migrate_model
+  proxy_database_method :id
+  proxy_for :migrate_proxy_nested_models
+  property :name
+  property :value
+  design { view :by_name }
+end
+
+class MigrateProxyNestedModel < CouchRest::Model::Base
+  proxied_by :migrate_proxy_model
+  property :name
+  property :value
+  design { view :by_name }
+end
+
+RSpec::Matchers.define :database_matching do |database|
+  match do |actual|
+    actual.server == database.server && actual.name == database.name
+  end
+end
+
 describe CouchRest::Model::Utils::Migrate do
 
   before :each do
@@ -11,6 +41,7 @@ describe CouchRest::Model::Utils::Migrate do
     it "should not do anything if Rails is not available" do
       @module.load_all_models
     end
+
     it "should detect if Rails is available and require models" do
       Rails = double()
       allow(Rails).to receive(:root).and_return("")
@@ -22,4 +53,108 @@ describe CouchRest::Model::Utils::Migrate do
     end
   end
 
+  describe "migrations" do
+    let!(:stdout) { $stdout }
+    before :each do
+      allow(CouchRest::Model::Base).to receive(:subclasses).and_return([MigrateModel, MigrateProxyModel, MigrateProxyNestedModel])
+      $stdout = StringIO.new
+    end
+
+    after :each do
+      $stdout = stdout
+    end
+
+    describe "#all_models" do
+      it "should migrate root subclasses of CouchRest::Model::Base" do
+        expect(MigrateModel.design_docs.first).to receive(:migrate)
+        @module.all_models
+      end
+
+      it "shouldn't migrate proxied subclasses with of CouchRest::Model::Base" do
+        expect(MigrateProxyModel.design_docs.first).not_to receive(:migrate)
+        expect(MigrateProxyNestedModel.design_docs.first).not_to receive(:migrate)
+        @module.all_models
+      end
+
+      context "migration design docs" do
+        before :each do
+          @module.all_models
+          @design_doc = MigrateModel.design_doc
+        end
+
+        it "shouldn't modify the original design doc if activate is false" do
+          @design_doc.create_view(:by_name_and_id)
+          @module.all_models(activate: false)
+
+          fetched_ddoc = MigrateModel.get(@design_doc.id)
+          expect(fetched_ddoc['views']).not_to have_key('by_name_and_id')
+        end
+
+        it "should remove a leftover migration doc" do
+          @design_doc.create_view(:by_name_and_value)
+          @module.all_models(activate: false)
+
+          expect(MigrateModel.get("#{@design_doc.id}_migration")).not_to be_nil
+          @module.all_models
+          expect(MigrateModel.get("#{@design_doc.id}_migration")).to be_nil
+        end
+      end
+    end
+
+    describe "#all_models_and_proxies" do
+      before :each do
+        # clear data from previous test runs
+        MigrateModel.all.each do |mm|
+          next if mm.nil?
+          mm.migrate_proxy_models.all.each do |mpm|
+            mpm.migrate_proxy_nested_models.database.delete! rescue nil
+          end rescue nil
+          mm.migrate_proxy_models.database.delete!
+          mm.destroy rescue nil
+        end
+        MigrateModel.database.recreate!
+      end
+
+      it "should migrate first level proxied subclasses of CouchRest::Model::Base" do
+        mm = MigrateModel.new(name: "Migration").save
+        expect(MigrateProxyModel.design_docs.first).to receive(:migrate).with(database_matching(mm.migrate_proxy_models.database)).and_call_original
+        @module.all_models_and_proxies
+      end
+
+      it "should migrate the second level proxied subclasses of CouchRest::Model::Base" do
+        mm = MigrateModel.new(name: "Migration").save
+        mpm = mm.migrate_proxy_models.new(name: "Migration Proxy").save
+        expect(MigrateProxyNestedModel.design_docs.first).to receive(:migrate).with(database_matching(mpm.migrate_proxy_nested_models.database))
+        @module.all_models_and_proxies
+      end
+
+      context "migration design docs" do
+        before :each do
+          @mm_instance = MigrateModel.new(name: "Migration").save
+          mpm = @mm_instance.migrate_proxy_models.new(name: "Migration Proxy")
+
+          @module.all_models_and_proxies
+
+          @design_doc = MigrateProxyModel.design_doc
+        end
+
+        it "shouldn't modify the original design doc if activate is false" do
+          @design_doc.create_view(:by_name_and_id)
+          @module.all_models_and_proxies(activate: false)
+
+          fetched_ddoc = @mm_instance.migrate_proxy_models.get(@design_doc.id)
+          expect(fetched_ddoc['views']).not_to have_key('by_name_and_id')
+        end
+
+        it "should remove a leftover migration doc" do
+          @design_doc.create_view(:by_name_and_value)
+          @module.all_models_and_proxies(activate: false)
+
+          expect(@mm_instance.migrate_proxy_models.get("#{@design_doc.id}_migration")).not_to be_nil
+          @module.all_models_and_proxies
+          expect(@mm_instance.migrate_proxy_models.get("#{@design_doc.id}_migration")).to be_nil
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_model
 version: !ruby/object:Gem::Version
-  version: 2.2.0.beta1
+  version: 2.2.0.beta2
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,6 +115,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -188,9 +194,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.activesupport-4.x
 - Gemfile.activesupport-5.x
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -200,6 +208,7 @@ files:
 - benchmarks/connections.rb
 - benchmarks/dirty.rb
 - couchrest_model.gemspec
+- docker-compose.yml
 - history.md
 - init.rb
 - lib/couchrest/model.rb
@@ -210,6 +219,7 @@ files:
 - lib/couchrest/model/casted_by.rb
 - lib/couchrest/model/configuration.rb
 - lib/couchrest/model/connection.rb
+- lib/couchrest/model/connection_config.rb
 - lib/couchrest/model/core_extensions/hash.rb
 - lib/couchrest/model/core_extensions/time_parsing.rb
 - lib/couchrest/model/design.rb
@@ -227,6 +237,7 @@ files:
 - lib/couchrest/model/property.rb
 - lib/couchrest/model/property_protection.rb
 - lib/couchrest/model/proxyable.rb
+- lib/couchrest/model/server_pool.rb
 - lib/couchrest/model/support/couchrest_database.rb
 - lib/couchrest/model/translation.rb
 - lib/couchrest/model/typecast.rb
@@ -281,6 +292,7 @@ files:
 - spec/unit/casted_array_spec.rb
 - spec/unit/casted_spec.rb
 - spec/unit/configuration_spec.rb
+- spec/unit/connection_config_spec.rb
 - spec/unit/connection_spec.rb
 - spec/unit/core_extensions/time_parsing_spec.rb
 - spec/unit/design_spec.rb
@@ -296,7 +308,9 @@ files:
 - spec/unit/property_protection_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/proxyable_spec.rb
+- spec/unit/server_pool_spec.rb
 - spec/unit/subclass_spec.rb
+- spec/unit/support/couchrest_database_spec.rb
 - spec/unit/translations_spec.rb
 - spec/unit/typecast_spec.rb
 - spec/unit/utils/migrate_spec.rb
@@ -321,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Extends the CouchRest Document class for advanced modelling.
@@ -363,6 +377,7 @@ test_files:
 - spec/unit/casted_array_spec.rb
 - spec/unit/casted_spec.rb
 - spec/unit/configuration_spec.rb
+- spec/unit/connection_config_spec.rb
 - spec/unit/connection_spec.rb
 - spec/unit/core_extensions/time_parsing_spec.rb
 - spec/unit/design_spec.rb
@@ -378,7 +393,9 @@ test_files:
 - spec/unit/property_protection_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/proxyable_spec.rb
+- spec/unit/server_pool_spec.rb
 - spec/unit/subclass_spec.rb
+- spec/unit/support/couchrest_database_spec.rb
 - spec/unit/translations_spec.rb
 - spec/unit/typecast_spec.rb
 - spec/unit/utils/migrate_spec.rb