couchrest 0.24 → 0.26

data/README.md

@@ -1,13 +1,15 @@
 # CouchRest: CouchDB, close to the metal
 
 CouchRest is based on [CouchDB's couch.js test
-library](http://svn.apache.org/repos/asf/incubator/couchdb/trunk/share/www/script/couch.js),
+library](http://svn.apache.org/repos/asf/couchdb/trunk/share/www/script/couch.js),
 which I find to be concise, clear, and well designed. CouchRest lightly wraps
 CouchDB's HTTP API, managing JSON serialization, and remembering the URI-paths
 to CouchDB's API endpoints so you don't have to.
 
 CouchRest is designed to make a simple base for application and framework-specific object oriented APIs. CouchRest is Object-Mapper agnostic, the parsed JSON it returns from CouchDB shows up as subclasses of Ruby's Hash. Naked JSON, just as it was mean to be.
 
+Note: CouchRest only support CouchDB 0.9.0 or newer.
+
 ## Easy Install
 
 Easy Install is moving to RubyForge, heads up for the gem.

data/Rakefile

@@ -29,7 +29,6 @@ spec = Gem::Specification.new do |s|
     Dir["spec/tmp"]
   s.extra_rdoc_files = %w( README.md LICENSE THANKS.md )
   s.require_path = "lib"
-  s.add_dependency("json", ">= 1.1.2")
   s.add_dependency("rest-client", ">= 0.5")
   s.add_dependency("mime-types", ">= 1.15")
 end

data/lib/couchrest/core/database.rb

@@ -44,6 +44,12 @@ module CouchRest
       end
     end
   
+    # load a set of documents by passing an array of ids
+    def get_bulk(ids)
+      documents(:keys => ids, :include_docs => true)
+    end
+    alias :bulk_load :get_bulk
+  
     # POST a temporary view function to CouchDB for querying. This is not
     # recommended, as you don't get any performance benefit from CouchDB's
     # materialized views. Can be quite slow on large databases.

data/lib/couchrest/mixins/class_proxy.rb

@@ -81,6 +81,10 @@ module CouchRest
           @klass.all_design_doc_versions(@database)
         end
         
+        def model_design_doc
+          @klass.model_design_doc(@database)
+        end
+        
         def cleanup_design_docs!
           @klass.cleanup_design_docs!(@database)
         end

data/lib/couchrest/mixins/design_doc.rb

@@ -25,8 +25,7 @@ module CouchRest
           design_doc['views'].each do |name, view|
             funcs << "#{name}/#{view['map']}#{view['reduce']}"
           end
-          md5 = Digest::MD5.hexdigest(funcs.sort.join(''))
-          self.design_doc_slug_cache = "#{self.to_s}-#{md5}"
+          self.design_doc_slug_cache = self.to_s
         end
 
         def default_design_doc

data/lib/couchrest/mixins/properties.rb

@@ -23,8 +23,8 @@ module CouchRest
         # TODO: cache the default object
         self.class.properties.each do |property|
           key = property.name.to_s
-          # let's make sure we have a default and we can assign the value
-          if !property.default.nil? && (self.respond_to?("#{key}=") || self.key?(key))
+          # let's make sure we have a default
+          if property.default
               if property.default.class == Proc
                 self[key] = property.default.call
               else

data/lib/couchrest/mixins/validation.rb

@@ -115,7 +115,22 @@ module CouchRest
     # Check if a resource is valid in a given context
     #
     def valid?(context = :default)
-      self.class.validators.execute(context, self)
+      result = self.class.validators.execute(context, self)
+      result && validate_casted_arrays
+    end
+    
+    # checking on casted objects
+    def validate_casted_arrays
+      result = true
+      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?)
+        casted_values.each do |value|
+          result = (result && value.valid?) if value.respond_to?(:valid?)
+        end
+      end
+      result
     end
 
     # Begin a recursive walk of the model checking validity

data/lib/couchrest/mixins/views.rb

@@ -104,26 +104,34 @@ module CouchRest
           fetch_view_with_docs(db, name, query, raw, &block)
         end
 
+        # DEPRECATED
+        # user model_design_doc to retrieve the current design doc
         def all_design_doc_versions(db = database)
-          db.documents :startkey => "_design/#{self.to_s}-", 
+          db.documents :startkey => "_design/#{self.to_s}", 
             :endkey => "_design/#{self.to_s}-\u9999"
         end
+        
+        def model_design_doc(db = database)
+          begin
+            @model_design_doc = db.get("_design/#{self.to_s}")
+          rescue
+            nil
+          end
+        end
 
-        # Deletes any non-current design docs that were created by this class. 
-        # Running this when you're deployed version of your application is steadily 
-        # and consistently using the latest code, is the way to clear out old design 
-        # docs. Running it to early could mean that live code has to regenerate
+        # Deletes the current design doc for the current class.
+        # Running it to early could mean that live code has to regenerate
         # potentially large indexes.
         def cleanup_design_docs!(db = database)
-          ddocs = all_design_doc_versions(db)
-          ddocs["rows"].each do |row|
-            if (row['id'] != design_doc_id)
-              db.delete_doc({
-                "_id" => row['id'],
-                "_rev" => row['value']['rev']
-              })
-            end
-          end
+          save_design_doc_on(db)
+          # db.refresh_design_doc
+          #           db.save_design_doc
+          # design_doc = model_design_doc(db)
+          # if design_doc
+          #   db.delete_doc(design_doc)
+          # else
+          #   false
+          # end
         end
 
         private

data/lib/couchrest.rb

@@ -12,10 +12,12 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require "rubygems"
-gem 'json'
-require 'json'
-gem 'rest-client'
+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")
+end
 require 'rest_client'
 
 $:.unshift File.dirname(__FILE__) unless
@@ -28,7 +30,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.24' unless self.const_defined?("VERSION")
+  VERSION    = '0.26' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'

data/spec/couchrest/core/database_spec.rb

@@ -599,6 +599,11 @@ describe CouchRest::Database do
       ds = @db.documents(:startkey => 'doc0', :endkey => 'doc3', :include_docs => true)
       ds['rows'][0]['doc']['another'].should == "doc"
     end
+    it "should have the bulk_load macro" do
+      rs = @db.bulk_load ["doc0", "doc7"]
+      rs['rows'].length.should == 2
+      rs['rows'][0]['doc']['another'].should == "doc"
+    end
   end
   
 

data/spec/couchrest/more/casted_model_spec.rb

@@ -1,5 +1,10 @@
+# encoding: utf-8
+
 require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 require File.join(FIXTURE_PATH, 'more', 'card')
+require File.join(FIXTURE_PATH, 'more', 'cat')
+require File.join(FIXTURE_PATH, 'more', 'person')
+
 
 class WithCastedModelMixin < Hash
   include CouchRest::CastedModel
@@ -103,5 +108,35 @@ describe CouchRest::CastedModel do
     end
     
   end
+
+  describe "saving document with array of casted models and validation" do
+    before :each do
+      @cat = Cat.new
+      @cat.save
+    end
+
+    it "should save" do
+      toy = CatToy.new :name => "Mouse"
+      @cat.toys.push(toy)
+      @cat.save.should be_true
+    end
+
+    it "should fail because name is not present" do
+      toy = CatToy.new
+      @cat.toys.push(toy)
+      @cat.should_not be_valid
+      @cat.save.should be_false
+    end
+    
+    it "should not fail if the casted model doesn't have validation" do
+      Cat.property :masters, :cast_as => ['Person'], :default => []
+      Cat.validates_present :name
+      cat = Cat.new(:name => 'kitty')
+      cat.should be_valid
+      cat.masters.push Person.new
+      cat.should be_valid
+    end
+    
+  end
   
 end

data/spec/couchrest/more/extended_doc_spec.rb

@@ -10,7 +10,7 @@ describe "ExtendedDocument" do
     property :preset,       :default => {:right => 10, :top_align => false}
     property :set_by_proc,  :default => Proc.new{Time.now},       :cast_as => 'Time'
     property :tags,         :default => []
-    property :false_default, :default => false
+    property :read_only_with_default, :default => 'generic', :read_only => true
     property :name
     timestamps!
   end
@@ -158,10 +158,10 @@ describe "ExtendedDocument" do
       obj = WithDefaultValues.new(:tags => ['spec'])
       obj.tags.should == ['spec']
     end
-
-    it "should work with a default value of false" do
+    
+    it "should set default value of read-only property" do
       obj = WithDefaultValues.new
-      obj.false_default.should == false
+      obj.read_only_with_default.should == 'generic'
     end
   end
   

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -183,14 +183,13 @@ describe "ExtendedDocument views" do
     it "should barf on all_design_doc_versions if no database given" do
       lambda{Unattached.all_design_doc_versions}.should raise_error
     end
-    it "should clean up design docs left around on specific database" do
-      Unattached.by_title :database=>@db
-      Unattached.all_design_doc_versions(@db)["rows"].length.should == 1
+    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.view_by :questions
-      Unattached.by_questions :database=>@db
-      Unattached.all_design_doc_versions(@db)["rows"].length.should == 2
+      Unattached.by_questions(:database => @db)
+      original_revision = Unattached.model_design_doc(@db)['_rev']
       Unattached.cleanup_design_docs!(@db)
-      Unattached.all_design_doc_versions(@db)["rows"].length.should == 1
+      Unattached.model_design_doc(@db)['_rev'].should_not == original_revision
     end
   end
 
@@ -246,12 +245,10 @@ describe "ExtendedDocument views" do
     end
     it "should clean up design docs left around on specific database" do
       @us.by_title
-      @us.all_design_doc_versions["rows"].length.should == 1
+      original_id = @us.model_design_doc['_rev']
       Unattached.view_by :professor
       @us.by_professor
-      @us.all_design_doc_versions["rows"].length.should == 2
-      @us.cleanup_design_docs!
-      @us.all_design_doc_versions["rows"].length.should == 1
+      @us.model_design_doc['_rev'].should_not == original_id
     end
   end
 
@@ -321,6 +318,7 @@ describe "ExtendedDocument views" do
     before(:each) do
       reset_test_db!
       Article.by_date
+      @original_doc_rev = Article.model_design_doc['_rev']
       @design_docs = Article.database.documents :startkey => "_design/", :endkey => "_design/\u9999"
     end
     it "should not create a design doc on view definition" do
@@ -332,24 +330,9 @@ describe "ExtendedDocument views" do
       ddocs = Article.all_design_doc_versions["rows"].length
       Article.view_by :updated_at
       Article.by_updated_at
-      Article.all_design_doc_versions["rows"].length.should == ddocs + 1
+      @original_doc_rev.should_not == Article.model_design_doc['_rev']
       Article.design_doc["views"].keys.should include("by_updated_at")
     end
   end
-
-  describe "with a lot of designs left around" do
-    before(:each) do
-      reset_test_db!
-      Article.by_date
-      Article.view_by :field
-      Article.by_field
-    end
-    it "should clean them up" do
-      Article.view_by :stream
-      Article.by_stream
-      Article.all_design_doc_versions["rows"].length.should > 1
-      Article.cleanup_design_docs!
-      Article.all_design_doc_versions["rows"].length.should == 1
-    end
-  end
+  
 end

data/spec/fixtures/more/cat.rb

@@ -0,0 +1,18 @@
+class Cat < CouchRest::ExtendedDocument
+  include ::CouchRest::Validation
+
+  # Set the default database to use
+  use_database TEST_SERVER.default_database
+
+  property :name
+  property :toys, :cast_as => ['CatToy'], :default => []
+end
+
+class CatToy < Hash
+  include ::CouchRest::CastedModel
+  include ::CouchRest::Validation
+
+  property :name
+
+  validates_present :name
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.24"
+  version: "0.26"
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -13,16 +13,6 @@ cert_chain: []
 date: 2008-11-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.2
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   type: :runtime
@@ -131,6 +121,7 @@ files:
 - spec/fixtures/attachments/test.html
 - spec/fixtures/more/article.rb
 - spec/fixtures/more/card.rb
+- spec/fixtures/more/cat.rb
 - spec/fixtures/more/course.rb
 - spec/fixtures/more/event.rb
 - spec/fixtures/more/invoice.rb