couchrest_model 2.2.0.beta1 → 2.2.0.beta2

data/lib/couchrest/model/document_queries.rb

@@ -31,9 +31,8 @@ module CouchRest
         # 
         # === Parameters
         # id<String, Integer>:: Document ID
-        # db<Database>:: optional option to pass a custom database to use
-        def get(id, db = database)
-          get!(id, db)
+        def get(id)
+          get!(id)
         rescue CouchRest::Model::DocumentNotFound
           nil
         end
@@ -49,14 +48,28 @@ module CouchRest
         # 
         # === Parameters
         # id<String, Integer>:: Document ID
+        def get!(id)
+          fetch_and_build_from_database(id, database)
+        end
+        alias :find! :get!
+
+
+        # Load the document and build from the provided database.
+        #
+        # ==== Returns
+        # Object:: if the document was found
+        # or
+        # Exception
+        # 
+        # === Parameters
+        # id<String, Integer>:: Document ID
         # db<Database>:: optional option to pass a custom database to use
-        def get!(id, db = database)
+        def fetch_and_build_from_database(id, db)
           raise CouchRest::Model::DocumentNotFound if id.blank?
           raise CouchRest::Model::DatabaseNotDefined if db.nil?
           doc = db.get(id) or raise CouchRest::Model::DocumentNotFound
           build_from_database(doc)
         end
-        alias :find! :get!
 
       end
 

data/lib/couchrest/model/persistence.rb

@@ -93,9 +93,11 @@ module CouchRest
       # Returns self.
       def reload
         write_attributes_for_initialization(
-          database.get(id), :write_all_attributes => true
+          database.get!(id), :write_all_attributes => true
         )
         self
+      rescue CouchRest::NotFound
+        raise CouchRest::Model::DocumentNotFound
       end
 
       protected

data/lib/couchrest/model/proxyable.rb

@@ -8,8 +8,10 @@ module CouchRest
         raise StandardError, "Please set the #proxy_database_method" if self.class.proxy_database_method.nil?
         db_name = self.send(self.class.proxy_database_method)
         db_suffix = self.class.proxy_database_suffixes[assoc_name.to_sym]
-        @proxy_databases ||= {}
-        @proxy_databases[assoc_name.to_sym] ||= self.class.prepare_database([db_name, db_suffix].compact.reject(&:blank?).join(self.class.connection[:join]))
+        @_proxy_databases ||= {}
+        @_proxy_databases[assoc_name.to_sym] ||= begin
+          self.class.prepare_database([db_name, db_suffix].compact.reject(&:blank?).join(self.class.connection[:join]))
+        end
       end
 
       module ClassMethods
@@ -118,10 +120,17 @@ module CouchRest
         end
 
         def get(id)
-          proxy_update(@model.get(id, @database))
+          get!(id)
+        rescue CouchRest::Model::DocumentNotFound
+          nil
         end
         alias :find :get
 
+        def get!(id)
+          proxy_update(@model.fetch_and_build_from_database(id, @database))
+        end
+        alias :find! :get!
+
         protected
 
         def create_view_methods

data/lib/couchrest/model/server_pool.rb

@@ -0,0 +1,22 @@
+module CouchRest
+  module Model
+
+    # Simple Server Pool with thread safety so that a single server
+    # instance can be shared with multiple classes.
+    class ServerPool
+      include Singleton
+
+      def initialize
+        @servers = {}
+        @mutex = Mutex.new
+      end
+
+      def [](url)
+        @mutex.synchronize do
+          @servers[url] ||= CouchRest::Server.new(url)
+        end
+      end
+
+    end
+  end
+end

data/lib/couchrest/model/support/couchrest_database.rb

@@ -17,5 +17,5 @@ module CouchRest::Model
 end
 
 class CouchRest::Database
-  include(CouchRest::Model::Support::Database)
+  prepend CouchRest::Model::Support::Database
 end

data/lib/couchrest/model/utils/migrate.rb

@@ -59,7 +59,7 @@ module CouchRest
         def all_models(opts = {})
           opts.reverse_merge!(activate: true, with_proxies: false)
           callbacks = migrate_each_model(find_models)
-          callbacks += migrate_each_proxying_model(find_proxying_models) if opts[:with_proxies]
+          callbacks += migrate_each_proxying_model(find_proxying_base_models) if opts[:with_proxies]
           activate_designs(callbacks) if opts[:activate]
         end
 
@@ -74,8 +74,8 @@ module CouchRest
           CouchRest::Model::Base.subclasses.reject{|m| m.proxy_owner_method.present?}
         end
 
-        def find_proxying_models
-          CouchRest::Model::Base.subclasses.reject{|m| m.proxy_method_names.empty?}
+        def find_proxying_base_models
+          CouchRest::Model::Base.subclasses.reject{|m| m.proxy_method_names.empty? || m.proxy_owner_method.present?}
         end
 
         def migrate_each_model(models, db = nil)
@@ -91,12 +91,15 @@ module CouchRest
         def migrate_each_proxying_model(models)
           callbacks = [ ]
           models.each do |model|
-            methods = model.proxy_method_names
+            model_class = model.is_a?(CouchRest::Model::Proxyable::ModelProxy) ? model.model : model
+            methods = model_class.proxy_method_names
             methods.each do |method|
-              puts "Finding proxied models for #{model}##{method}"
+              puts "Finding proxied models for #{model_class}##{method}"
+              model_class.design_doc.auto_update = false
               model.all.each do |obj|
                 proxy = obj.send(method)
                 callbacks += migrate_each_model([proxy.model], proxy.database)
+                callbacks += migrate_each_proxying_model([proxy]) unless model_class.proxy_method_names.empty?
               end
             end
           end

data/lib/couchrest_model.rb

@@ -26,6 +26,8 @@ require "couchrest"
 
 require "couchrest/model"
 require "couchrest/model/errors"
+require "couchrest/model/server_pool"
+require "couchrest/model/connection_config"
 require "couchrest/model/configuration"
 require "couchrest/model/translation"
 require "couchrest/model/persistence"

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ unless defined?(FIXTURE_PATH)
   FIXTURE_PATH = File.join(File.dirname(__FILE__), '/fixtures')
   SCRATCH_PATH = File.join(File.dirname(__FILE__), '/tmp')
 
-  COUCHHOST = "http://127.0.0.1:5984"
+  COUCHHOST = ENV["COUCH_HOST"] || "http://127.0.0.1:5984"
   TESTDB    = 'couchrest-model-test'
   TEST_SERVER    = CouchRest.new COUCHHOST
   # TEST_SERVER.default_database = TESTDB
@@ -23,6 +23,21 @@ unless defined?(FIXTURE_PATH)
 end
 
 RSpec.configure do |config|
+  config.before(:suite) do
+    couch_uri = URI.parse(ENV['COUCH_HOST'] || "http://127.0.0.1:5984")
+    CouchRest::Model::Base.configure do |config|
+      config.connection  = {
+        :protocol => couch_uri.scheme,
+        :host     => couch_uri.host,
+        :port     => couch_uri.port,
+        :username => couch_uri.user,
+        :password => couch_uri.password,
+        :prefix   => "couchrest",
+        :join     => "_"
+      }
+    end
+  end
+
   config.before(:all) { reset_test_db! }
 
   config.after(:all) do

data/spec/unit/connection_config_spec.rb

@@ -0,0 +1,41 @@
+
+require "spec_helper"
+
+describe CouchRest::Model::ConnectionConfig do
+
+  subject { CouchRest::Model::ConnectionConfig }
+
+  describe ".instance" do
+
+    it "should provide a singleton" do 
+      expect(subject.instance).to be_a(CouchRest::Model::ConnectionConfig)
+    end
+
+  end
+
+  describe "#[file]" do
+
+    let :file do
+      File.join(FIXTURE_PATH, "config", "couchdb.yml")
+    end
+
+    it "should provide a config file hash" do
+      conf = subject.instance[file]
+      expect(conf).to be_a(Hash)
+    end
+
+    it "should provide a config file hash with symbolized keys" do
+      conf = subject.instance[file]
+      expect(conf[:development]).to be_a(Hash)
+      expect(conf[:development]['host']).to be_a(String)
+    end
+
+    it "should always provide same hash" do
+      f1 = subject.instance[file]
+      f2 = subject.instance[file]
+      expect(f1.object_id).to eql(f2.object_id)
+    end
+
+  end
+
+end

data/spec/unit/connection_spec.rb

@@ -58,12 +58,6 @@ describe CouchRest::Model::Connection do
         @class.use_database(db)
         expect(@class.database).to eql(db)
       end
-      it "should never prepare the database before it is needed" do
-        db = @class.server.database('test')
-        expect(@class).not_to receive(:prepare_database)
-        @class.use_database('test')
-        @class.use_database(db)
-      end
       it "should use the database specified" do
         @class.use_database(:test)
         expect(@class.database.name).to eql('couchrest_test')
@@ -90,7 +84,7 @@ describe CouchRest::Model::Connection do
         expect(@class.server).to be_a(CouchRest::Server)
       end
       it "should provide a server with default config" do
-        expect(@class.server.uri.to_s).to eql("http://localhost:5984")
+        expect(@class.server.uri.to_s).to eql(CouchRest::Model::Base.server.uri.to_s)
       end
       it "should allow the configuration to be overwritten" do
         @class.connection = {
@@ -131,9 +125,10 @@ describe CouchRest::Model::Connection do
 
       it "should use the .use_database value" do
         @class.use_database('testing')
-        db = @class.prepare_database
+        db = @class.database
         expect(db.name).to eql('couchrest_testing')
       end
+
     end
 
     describe "protected methods" do

data/spec/unit/designs/migrations_spec.rb

@@ -42,6 +42,7 @@ describe CouchRest::Model::Designs::Migrations do
           end
           doc = @db.get(@doc['_id'])
           expect(doc['views']['all']).to eql(@doc['views']['all'])
+          expect(doc['couchrest-hash']).not_to be_nil
           expect(callback).to be_nil
         end
 

data/spec/unit/designs/view_spec.rb

@@ -65,20 +65,23 @@ describe "Design View" do
       end
 
       describe "with proxy in query for first initialization" do
-        it "should set model to proxy object and remove from query" do
+        it "should set owner to proxy object and remove from query" do
           proxy = double("Proxy")
           @obj = @klass.new(@mod.design_doc, @mod, {:proxy => proxy}, 'test_view')
-          expect(@obj.model).to eql(proxy)
+          expect(@obj.owner).to eql(proxy)
+          expect(@obj.model).to eql(@mod)
         end
       end
 
       describe "with proxy in query for chained instance" do
-        it "should set the model to proxy object instead of parents model" do
+        it "should set the owner to proxy object instead of parents model" do
           proxy = double("Proxy")
           @obj = @klass.new(@mod.design_doc, @mod, {}, 'test_view')
+          expect(@obj.owner).to eql(@mod)
           expect(@obj.model).to eql(@mod)
           @obj = @obj.proxy(proxy)
-          expect(@obj.model).to eql(proxy)
+          expect(@obj.owner).to eql(proxy)
+          expect(@obj.model).to eql(@mod)
         end
       end
 
@@ -175,6 +178,31 @@ describe "Design View" do
           str = @design_doc['views']['by_title']['map']
           expect(str).to include("emit(doc['title'], [1, doc['name']]);")
         end
+
+        it "should guard against nulls when emitting properties" do
+          @klass.define(@design_doc, 'by_title', :emit => :name)
+          str = @design_doc['views']['by_title']['map']
+          expect(str).to include("doc['name'] != null")
+        end
+
+        it "should guard against nulls when emitting multiple properties" do
+          @klass.define(@design_doc, 'by_title', :emit => [:name, :another_property])
+          str = @design_doc['views']['by_title']['map']
+          expect(str).to include("doc['name'] != null")
+          expect(str).to include("doc['another_property'] != null")
+        end
+
+        it "should not guard against nulls for non-symbol emits" do
+          @klass.define(@design_doc, 'by_title', :emit => [:name, 3])
+          str = @design_doc['views']['by_title']['map']
+          expect(str).not_to include("( != null)")
+        end
+
+        it "should not provide a default reduce function the emit value is overridden" do
+          @klass.define(@design_doc, 'by_title', :emit => :name)
+          str = @design_doc['views']['by_title']['reduce']
+          expect(str).to be_nil
+        end
       end
 
       describe ".create_model_methods" do
@@ -239,7 +267,7 @@ describe "Design View" do
         it "should wrap rows in ViewRow class" do
           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)
+          expect(CouchRest::Model::Designs::ViewRow).to receive(:new).with({:foo => :bar}, @obj.owner)
           @obj.rows
         end
 
@@ -447,13 +475,6 @@ describe "Design View" do
         end
       end
 
-      describe "#database" do
-        it "should update query with value" do
-          expect(@obj).to receive(:update_query).with({:database => 'foo'})
-          @obj.database('foo')
-        end
-      end
-
       describe "#key" do
         it "should update query with value" do
           expect(@obj).to receive(:update_query).with({:key => 'foo'})
@@ -739,6 +760,12 @@ describe "Design View" do
         end
       end
 
+      describe "#database" do
+        it "should reference the owners database" do
+          expect(@obj.database).to eql(@mod.database)
+        end
+      end
+
       describe "#execute" do
         before :each do
           # disable real execution!
@@ -754,10 +781,7 @@ describe "Design View" do
         end
 
         it "should raise issue if no database" do
-          expect(@obj).to receive(:query).and_return({:database => nil})
-          model = double("SomeModel")
-          expect(model).to receive(:database).and_return(nil)
-          expect(@obj).to receive(:model).and_return(model)
+          expect(@obj).to receive(:database).and_return(nil)
           expect { @obj.send(:execute) }.to raise_error(CouchRest::Model::DatabaseNotDefined)
         end
 
@@ -859,6 +883,14 @@ describe "Design View" do
           end
         end
       end
+
+      describe "ActiveRecord compatibility methods" do
+        describe "#model_name" do
+          it "should use the #model class" do
+            expect(@obj.model_name.to_s).to eql DesignViewModel.to_s
+          end
+        end
+      end
     end
   end
 
@@ -868,19 +900,19 @@ describe "Design View" do
       @klass = CouchRest::Model::Designs::ViewRow
     end
 
-    let :model do
+    let :owner do
       m = double()
       allow(m).to receive(:database).and_return(DB)
       m
     end
 
     describe "intialize" do
-      it "should store reference to model" do
-        obj = @klass.new({}, model)
-        expect(obj.model).to eql(model)
+      it "should store reference to owner" do
+        obj = @klass.new({}, owner)
+        expect(obj.owner).to eql(owner)
       end
       it "should copy details from hash" do
-        obj = @klass.new({:foo => :bar, :test => :example}, model)
+        obj = @klass.new({:foo => :bar, :test => :example}, owner)
         expect(obj[:foo]).to eql(:bar)
         expect(obj[:test]).to eql(:example)
       end
@@ -891,32 +923,22 @@ describe "Design View" do
       end
 
       it "should provide id" do
-        obj = @klass.new({'id' => '123456'}, model)
+        obj = @klass.new({'id' => '123456'}, owner)
         expect(obj.id).to eql('123456')
       end
 
-      it "may be instantiated with a database" do
-        obj = @klass.new({'id' => '123456'}, model, 'foo')
-        expect(obj.db).to eql('foo')
-      end
-
-      it "may use model's database" do
-        obj = @klass.new({'id' => '123456'}, model)
-        expect(obj.db).to eql(DB)
-      end
-
       it "should provide key" do
-        obj = @klass.new({'key' => 'thekey'}, model)
+        obj = @klass.new({'key' => 'thekey'}, owner)
         expect(obj.key).to eql('thekey')
       end
 
       it "should provide the value" do
-        obj = @klass.new({'value' => 'thevalue'}, model)
+        obj = @klass.new({'value' => 'thevalue'}, owner)
         expect(obj.value).to eql('thevalue')
       end
 
       it "should provide the raw document" do
-        obj = @klass.new({'doc' => 'thedoc'}, model)
+        obj = @klass.new({'doc' => 'thedoc'}, owner)
         expect(obj.raw_doc).to eql('thedoc')
       end
 
@@ -924,8 +946,7 @@ describe "Design View" do
         hash = {'doc' => {'_id' => '12345', 'name' => 'sam'}}
         obj = @klass.new(hash, DesignViewModel)
         doc = double('DesignViewDoc')
-        allow(doc).to receive(:database).and_return(DB)
-        expect(obj.model).to receive(:build_from_database).with(hash['doc']).and_return(doc)
+        expect(obj.owner).to receive(:build_from_database).with(hash['doc']).and_return(doc)
         expect(obj.doc).to eql(doc)
       end
 
@@ -933,8 +954,7 @@ describe "Design View" do
         hash = {'id' => '12345', 'value' => 5}
         obj = @klass.new(hash, DesignViewModel)
         doc = double('DesignViewModel')
-        allow(doc).to receive(:database).and_return(DB)
-        expect(obj.model).to receive(:get).with('12345', DB).and_return(doc)
+        expect(obj.owner).to receive(:get).with('12345').and_return(doc)
         expect(obj.doc).to eql(doc)
       end
 
@@ -942,16 +962,14 @@ describe "Design View" do
         hash = {'id' => '12345', 'value' => {'_id' => '54321'}}
         obj = @klass.new(hash, DesignViewModel)
         doc = double('DesignViewModel')
-        allow(doc).to receive(:database).and_return(DB)
-        expect(obj.model).to receive(:get).with('54321', DB).and_return(doc)
+        expect(obj.owner).to receive(:get).with('54321').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')
-        expect(obj.model).not_to receive(:get)
+        expect(obj.owner).not_to receive(:get)
         expect(obj.doc).to be_nil
       end