mattetti-couchrest 0.24 → 0.25

data/README.md

@@ -8,6 +8,8 @@ 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.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.25' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'

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/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/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/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: mattetti-couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.24"
+  version: "0.25"
 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
@@ -154,6 +144,7 @@ files:
 - spec/fixtures/more
 - 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