couchrest 0.26 → 0.28

data/lib/couchrest.rb

@@ -16,21 +16,19 @@ require 'rubygems'
 begin
   require 'json'
 rescue LoadError
-  raise "You need install and require your own compatible json library since couchrest rest couldn't load the json/json_pure gem" unless Kernel.const_defined?("JSON")
+  raise "You need install and require your own json compatible library since couchrest rest couldn't load the json/json_pure gem" unless Kernel.const_defined?("JSON")
 end
 require 'rest_client'
 
 $:.unshift File.dirname(__FILE__) unless
   $:.include?(File.dirname(__FILE__)) ||
   $:.include?(File.expand_path(File.dirname(__FILE__)))
-  
-$COUCHREST_DEBUG ||= false
-  
+    
 require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.26' unless self.const_defined?("VERSION")
+  VERSION    = '0.28' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'
@@ -145,7 +143,7 @@ module CouchRest
       begin
         JSON.parse(RestClient.put(uri, payload))
       rescue Exception => e
-        if $COUCHREST_DEBUG == true
+        if $DEBUG
           raise "Error while sending a PUT request #{uri}\npayload: #{payload.inspect}\n#{e}"
         else
           raise e
@@ -157,7 +155,7 @@ module CouchRest
       begin
         JSON.parse(RestClient.get(uri), :max_nesting => false)
       rescue => e
-        if $COUCHREST_DEBUG == true
+        if $DEBUG
           raise "Error while sending a GET request #{uri}\n: #{e}"
         else
           raise e
@@ -170,7 +168,7 @@ module CouchRest
       begin
         JSON.parse(RestClient.post(uri, payload))
       rescue Exception => e
-        if $COUCHREST_DEBUG == true
+        if $DEBUG
           raise "Error while sending a POST request #{uri}\npayload: #{payload.inspect}\n#{e}"
         else
           raise e

data/lib/couchrest/core/database.rb

@@ -142,8 +142,14 @@ module CouchRest
         bulk_save
       end
       result = if doc['_id']
-        slug = escape_docid(doc['_id'])        
-        CouchRest.put "#{@uri}/#{slug}", doc
+        slug = escape_docid(doc['_id'])
+        begin     
+          CouchRest.put "#{@uri}/#{slug}", doc
+        rescue RestClient::ResourceNotFound
+          p "resource not found when saving even tho an id was passed"
+          slug = doc['_id'] = @server.next_uuid
+          CouchRest.put "#{@uri}/#{slug}", doc
+        end
       else
         begin
           slug = doc['_id'] = @server.next_uuid
@@ -265,11 +271,16 @@ module CouchRest
     # DELETE the database itself. This is not undoable and could be rather
     # catastrophic. Use with care!
     def delete!
+      clear_extended_doc_fresh_cache
       CouchRest.delete @uri
     end
 
     private
     
+    def clear_extended_doc_fresh_cache
+      ::CouchRest::ExtendedDocument.subclasses.each{|klass| klass.design_doc_fresh = false if klass.respond_to?(:design_doc_fresh=) }
+    end
+    
     def uri_for_attachment(doc, name)
       if doc.is_a?(String)
         puts "CouchRest::Database#fetch_attachment will eventually require a doc as the first argument, not a doc.id"

data/lib/couchrest/mixins/design_doc.rb

@@ -35,8 +35,11 @@ module CouchRest
               'all' => {
                 'map' => "function(doc) {
                   if (doc['couchrest-type'] == '#{self.to_s}') {
-                    emit(null,null);
+                    emit(null,1);
                   }
+                }",
+                'reduce' => "function(keys, values) {
+                  return sum(values);
                 }"
               }
             }
@@ -44,16 +47,14 @@ module CouchRest
         end
 
         def refresh_design_doc
-          design_doc['_id'] = design_doc_id
-          design_doc.delete('_rev')
-          #design_doc.database = nil
-          self.design_doc_fresh = true
+          reset_design_doc
+          save_design_doc
         end
 
         # Save the design doc onto the default database, and update the
         # design_doc attribute
         def save_design_doc
-          refresh_design_doc unless design_doc_fresh
+          reset_design_doc unless design_doc_fresh
           self.design_doc = update_design_doc(design_doc)
         end
 
@@ -64,6 +65,17 @@ module CouchRest
         end
 
         private
+        
+        def reset_design_doc
+          current = self.database.get(design_doc_id) rescue nil
+          design_doc['_id']  = design_doc_id
+          if current.nil?
+            design_doc.delete('_rev')
+          else
+            design_doc['_rev'] = current['_rev']
+          end
+          self.design_doc_fresh = true
+        end
 
         # Writes out a design_doc to a given database, returning the
         # updated design doc

data/lib/couchrest/mixins/document_queries.rb

@@ -12,9 +12,18 @@ module CouchRest
         # name of the current class. Take the standard set of
         # CouchRest::Database#view options.
         def all(opts = {}, &block)
-          view(:all, opts, &block)
+          view(:all, {:reduce => false}.merge(opts), &block)
         end
-
+        
+        # Returns the number of documents that have the "couchrest-type" field
+        # equal to the name of the current class. Takes the standard set of 
+        # CouchRest::Database#view options
+        def count(opts = {}, &block)
+          result = all({:reduce => true}.merge(opts), &block)['rows']
+          return 0 if result.empty?
+          result.first['value']
+        end
+        
         # Load the first document that have the "couchrest-type" field equal to
         # the name of the current class.
         #

data/lib/couchrest/mixins/properties.rb

@@ -17,7 +17,7 @@ module CouchRest
       end
       
       def apply_defaults
-        return unless self.respond_to?(:new_document?) && new_document?
+        return if self.respond_to?(:new_document?) && (new_document? == false)
         return unless self.class.respond_to?(:properties) 
         return if self.class.properties.empty?
         # TODO: cache the default object
@@ -39,9 +39,10 @@ module CouchRest
         self.class.properties.each do |property|
           next unless property.casted
           key = self.has_key?(property.name) ? property.name : property.name.to_sym
+          # Don't cast the property unless it has a value
+          next unless self[key]
           target = property.type
           if target.is_a?(Array)
-            next unless self[key]
             klass = ::CouchRest.constantize(target[0])
             self[property.name] = self[key].collect do |value|
               # Auto parse Time objects
@@ -56,12 +57,7 @@ module CouchRest
             else
               # Let people use :send as a Time parse arg
               klass = ::CouchRest.constantize(target)
-              # I'm not convince we should or should not create a new instance if we are casting a doc/extended doc without default value and nothing was passed
-              # unless (property.casted && 
-              #   (klass.superclass == CouchRest::ExtendedDocument || klass.superclass == CouchRest::Document) && 
-              #     (self[key].nil? || property.default.nil?))
-              klass.send(property.init_method, self[key])
-              #end
+              klass.send(property.init_method, self[key].dup)
             end
             self[property.name].casted_by = self if self[property.name].respond_to?(:casted_by)
           end

data/lib/couchrest/mixins/validation.rb

@@ -125,7 +125,7 @@ module CouchRest
       array_casted_properties = self.class.properties.select { |property| property.casted && property.type.instance_of?(Array) }
       array_casted_properties.each do |property|
         casted_values = self.send(property.name)
-        next unless casted_values.respond_to?(:each) && casted_values.first.respond_to?(:valid?)
+        next unless casted_values.is_a?(Array) && casted_values.first.respond_to?(:valid?)
         casted_values.each do |value|
           result = (result && value.valid?) if value.respond_to?(:valid?)
         end

data/lib/couchrest/monkeypatches.rb

@@ -92,7 +92,6 @@ module RestClient
 #         establish_connection(uri)
 #         http = Thread.current[:connection]
 #         require 'ruby-debug'
-#         debugger
 #         req.body_stream = nil
 #         
 #         res = http.request(req, payload)

data/lib/couchrest/more/casted_model.rb

@@ -10,12 +10,12 @@ module CouchRest
     
     def initialize(keys={})
       raise StandardError unless self.is_a? Hash
+      apply_defaults # defined in CouchRest::Mixins::Properties
       super()
       keys.each do |k,v|
         self[k.to_s] = v
       end if keys
-      apply_defaults # defined in CouchRest::Mixins::Properties
-      # cast_keys      # defined in CouchRest::Mixins::Properties
+      cast_keys      # defined in CouchRest::Mixins::Properties
     end
     
     def []= key, value

data/lib/couchrest/more/extended_document.rb

@@ -1,6 +1,7 @@
 require 'mime/types'
 require File.join(File.dirname(__FILE__), "property")
 require File.join(File.dirname(__FILE__), '..', 'mixins', 'extended_document_mixins')
+require "enumerator"
 
 module CouchRest
   
@@ -12,6 +13,10 @@ module CouchRest
     include CouchRest::Mixins::DesignDoc
     include CouchRest::Mixins::ExtendedAttachments
     include CouchRest::Mixins::ClassProxy
+
+   def self.subclasses
+     ObjectSpace.enum_for(:each_object, class << self; self; end).to_a.delete_if{|k| k == self}
+   end
     
     def self.inherited(subklass)
       subklass.send(:include, CouchRest::Mixins::Properties)
@@ -45,6 +50,8 @@ module CouchRest
       end
     end
     
+
+    
     
     # Automatically set <tt>updated_at</tt> and <tt>created_at</tt> fields
     # on the document whenever saving occurs. CouchRest uses a pretty

data/lib/couchrest/validation/auto_validate.rb

@@ -16,8 +16,6 @@ module CouchRest
       # # This feature is still not fully ported over,
       # # test are lacking, so please use with caution
       # def auto_validate!
-      #   require 'ruby-debug'
-      #   debugger
       #   auto_validation = true
       # end
       

data/spec/couchrest/more/casted_extended_doc_spec.rb

@@ -18,23 +18,58 @@ end
 
 describe "casting an extended document" do
   
+  before(:each) do
+    @driver = Driver.new(:name => 'Matt')
+    @car    = Car.new(:name => 'Renault 306', :driver => @driver)
+  end
+
+  it "should retain all properties of the casted attribute" do
+    @car.driver.should == @driver
+  end
+  
+  it "should let the casted document know who casted it" do
+    @car.driver.casted_by.should == @car
+  end
+end
+
+describe "assigning a value to casted attribute after initializing an object" do
+
   before(:each) do
     @car    = Car.new(:name => 'Renault 306')
     @driver = Driver.new(:name => 'Matt')
   end
   
-  # it "should not create an empty casted object" do
-  #   @car.driver.should be_nil
-  # end
+  it "should not create an empty casted object" do
+    @car.driver.should be_nil
+  end
   
-  it "should let you assign the casted attribute after instantializing an object" do
+  # Note that this isn't casting the attribute, it's just assigning it a value
+  # (see "should not cast attribute")
+  it "should let you assign the value" do
     @car.driver = @driver
     @car.driver.name.should == 'Matt'
   end
   
-  it "should let the casted document who casted it" do
-    Car.new(:name => 'Renault 306', :driver => @driver)
-    @car.driver.casted_by.should == @car
+  it "should not cast attribute" do
+    @car.driver = JSON.parse(JSON.generate(@driver))
+    @car.driver.should_not be_instance_of(Driver)
+  end
+
+end
+
+describe "casting an extended document from parsed JSON" do
+
+  before(:each) do
+    @driver = Driver.new(:name => 'Matt')
+    @car    = Car.new(:name => 'Renault 306', :driver => @driver)
+    @new_car = Car.new(JSON.parse(JSON.generate(@car)))
+  end
+
+  it "should cast casted attribute" do
+    @new_car.driver.should be_instance_of(Driver)
   end
   
+  it "should retain all properties of the casted attribute" do
+    @new_car.driver.should == @driver
+  end
 end

data/spec/couchrest/more/casted_model_spec.rb

@@ -10,6 +10,8 @@ class WithCastedModelMixin < Hash
   include CouchRest::CastedModel
   property :name
   property :no_value
+  property :details,          :default => {}
+  property :casted_attribute, :cast_as => 'WithCastedModelMixin'
 end
 
 class DummyModel < CouchRest::ExtendedDocument
@@ -41,11 +43,28 @@ describe CouchRest::CastedModel do
       @obj.name = 'Matt'
       @obj.name.should == 'Matt' 
     end
+    
+    it "should allow override of default" do
+      @obj = WithCastedModelMixin.new(:name => 'Eric', :details => {'color' => 'orange'})
+      @obj.name.should == 'Eric'
+      @obj.details['color'].should == 'orange'
+    end
+  end
+  
+  describe "casted as an attribute, but without a value" do
+    before(:each) do
+      @obj = DummyModel.new
+      @casted_obj = @obj.casted_attribute
+    end
+    it "should be nil" do
+      @casted_obj.should == nil
+    end
   end
   
   describe "casted as attribute" do
     before(:each) do
-      @obj = DummyModel.new(:casted_attribute => {:name => 'whatever'})
+      casted = {:name => 'not whatever'}
+      @obj = DummyModel.new(:casted_attribute => {:name => 'whatever', :casted_attribute => casted})
       @casted_obj = @obj.casted_attribute
     end
     
@@ -68,6 +87,14 @@ describe CouchRest::CastedModel do
     it "should return nil for the unknown attribute" do
       @casted_obj["unknown"].should be_nil
     end
+    
+    it "should return {} for the hash attribute" do
+      @casted_obj.details.should == {}
+    end
+    
+    it "should cast its own attributes" do
+      @casted_obj.casted_attribute.should be_instance_of(WithCastedModelMixin)
+    end
   end
   
   describe "casted as an array of a different type" do
@@ -107,6 +134,14 @@ describe CouchRest::CastedModel do
       casted_obj.name.should == "test"
     end
     
+    it "should retain an override of a casted model attribute's default" do
+      casted_obj = @obj.casted_attribute
+      casted_obj.details['color'] = 'orange'
+      @obj.save
+      casted_obj = DummyModel.get(@obj.id).casted_attribute
+      casted_obj.details['color'].should == 'orange'
+    end
+    
   end
 
   describe "saving document with array of casted models and validation" do

data/spec/couchrest/more/extended_doc_spec.rb

@@ -224,6 +224,7 @@ describe "ExtendedDocument" do
   
   describe "finding all instances of a model" do
     before(:all) do
+      WithTemplateAndUniqueID.design_doc_fresh = false
       WithTemplateAndUniqueID.all.map{|o| o.destroy(true)}
       WithTemplateAndUniqueID.database.bulk_delete
       WithTemplateAndUniqueID.new('important-field' => '1').save
@@ -241,10 +242,30 @@ describe "ExtendedDocument" do
       rs.length.should == 4
     end
   end
-
+  
+  describe "counting all instances of a model" do
+    before(:each) do
+      @db = reset_test_db!
+      WithTemplateAndUniqueID.design_doc_fresh = false
+    end
+    
+    it ".count should return 0 if there are no docuemtns" do
+      WithTemplateAndUniqueID.count.should == 0
+    end
+    
+    it ".count should return the number of documents" do
+      WithTemplateAndUniqueID.new('important-field' => '1').save
+      WithTemplateAndUniqueID.new('important-field' => '2').save
+      WithTemplateAndUniqueID.new('important-field' => '3').save
+      
+      WithTemplateAndUniqueID.count.should == 3
+    end
+  end
+  
   describe "finding the first instance of a model" do
     before(:each) do      
       @db = reset_test_db!
+      WithTemplateAndUniqueID.design_doc_fresh = false
       WithTemplateAndUniqueID.new('important-field' => '1').save
       WithTemplateAndUniqueID.new('important-field' => '2').save
       WithTemplateAndUniqueID.new('important-field' => '3').save

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -100,7 +100,8 @@ describe "ExtendedDocument views" do
 
   describe "a ducktype view" do
     before(:all) do
-      @id = TEST_SERVER.default_database.save_doc({:dept => true})['id']
+      reset_test_db!
+      @id = DB.save_doc({:dept => true})['id']
     end
     it "should setup" do
       duck = Course.get(@id) # from a different db
@@ -111,7 +112,7 @@ describe "ExtendedDocument views" do
       @doc = Course.design_doc
       @doc["views"]["by_dept"]["map"].should_not include("couchrest")
     end
-    it "should not look for class" do |variable|
+    it "should not look for class" do
       @as = Course.by_dept
       @as[0]['_id'].should == @id
     end
@@ -120,7 +121,7 @@ describe "ExtendedDocument views" do
   describe "a model class not tied to a database" do
     before(:all) do
       reset_test_db!
-      @db = TEST_SERVER.default_database
+      @db = DB
       %w{aaa bbb ddd eee}.each do |title|
         u = Unattached.new(:title => title)
         u.database = @db
@@ -185,6 +186,7 @@ describe "ExtendedDocument views" do
     end
     it "should be able to cleanup the db/bump the revision number" do
       # if the previous specs were not run, the model_design_doc will be blank
+      Unattached.use_database DB
       Unattached.view_by :questions
       Unattached.by_questions(:database => @db)
       original_revision = Unattached.model_design_doc(@db)['_rev']
@@ -196,7 +198,9 @@ describe "ExtendedDocument views" do
   describe "class proxy" do
     before(:all) do
       reset_test_db!
-      @us = Unattached.on(TEST_SERVER.default_database)
+      # setup the class default doc to save the design doc
+      Unattached.use_database DB
+      @us = Unattached.on(DB)
       %w{aaa bbb ddd eee}.each do |title|
         u = @us.new(:title => title)
         u.save
@@ -254,7 +258,6 @@ describe "ExtendedDocument views" do
 
   describe "a model with a compound key view" do
     before(:all) do
-      Article.design_doc_fresh = false
       Article.by_user_id_and_date.each{|a| a.destroy(true)}
       Article.database.bulk_delete
       written_at = Time.now - 24 * 3600 * 7

data/spec/fixtures/more/article.rb

@@ -1,5 +1,5 @@
 class Article < CouchRest::ExtendedDocument
-  use_database TEST_SERVER.default_database
+  use_database DB
   unique_id :slug
   
   view_by :date, :descending => true

data/spec/fixtures/more/card.rb

@@ -5,7 +5,7 @@ class Card < CouchRest::ExtendedDocument
   auto_validate!
   
   # Set the default database to use
-  use_database TEST_SERVER.default_database
+  use_database DB
   
   # Official Schema
   property :first_name

data/spec/fixtures/more/cat.rb

@@ -2,7 +2,7 @@ class Cat < CouchRest::ExtendedDocument
   include ::CouchRest::Validation
 
   # Set the default database to use
-  use_database TEST_SERVER.default_database
+  use_database DB
 
   property :name
   property :toys, :cast_as => ['CatToy'], :default => []

data/spec/fixtures/more/event.rb

@@ -1,5 +1,5 @@
 class Event < CouchRest::ExtendedDocument
-  use_database TEST_SERVER.default_database
+  use_database DB
   
   property :subject
   property :occurs_at, :cast_as => 'Time', :send => 'parse'

data/spec/fixtures/more/invoice.rb

@@ -3,7 +3,7 @@ class Invoice < CouchRest::ExtendedDocument
   include CouchRest::Validation
   
   # Set the default database to use
-  use_database TEST_SERVER.default_database
+  use_database DB
   
   # Official Schema
   property :client_name

data/spec/fixtures/more/service.rb

@@ -3,7 +3,7 @@ class Service < CouchRest::ExtendedDocument
   include CouchRest::Validation
   auto_validate!
   # Set the default database to use
-  use_database TEST_SERVER.default_database
+  use_database DB
   
   # Official Schema
   property :name, :length => 4...20

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ unless defined?(FIXTURE_PATH)
   TESTDB    = 'couchrest-test'
   TEST_SERVER    = CouchRest.new
   TEST_SERVER.default_database = TESTDB
+  DB = TEST_SERVER.database(TESTDB)
 end
 
 class Basic < CouchRest::ExtendedDocument
@@ -19,10 +20,8 @@ class Basic < CouchRest::ExtendedDocument
 end
 
 def reset_test_db!
-  cr = TEST_SERVER
-  db = cr.database(TESTDB)
-  db.recreate! rescue nil
-  db
+  DB.recreate! rescue nil
+  DB
 end
 
 Spec::Runner.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.26"
+  version: "0.28"
 platform: ruby
 authors: 
 - J. Chris Anderson