couchrest 0.23 → 0.24

data/lib/couchrest.rb

@@ -28,7 +28,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.23' unless self.const_defined?("VERSION")
+  VERSION    = '0.24' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'

data/lib/couchrest/mixins/properties.rb

@@ -24,7 +24,7 @@ module CouchRest
         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 && (self.respond_to?("#{key}=") || self.key?(key))
+          if !property.default.nil? && (self.respond_to?("#{key}=") || self.key?(key))
               if property.default.class == Proc
                 self[key] = property.default.call
               else
@@ -126,4 +126,4 @@ module CouchRest
       
     end
   end
-end
+end

data/lib/couchrest/more/casted_model.rb

@@ -9,7 +9,8 @@ module CouchRest
     end
     
     def initialize(keys={})
-      super
+      raise StandardError unless self.is_a? Hash
+      super()
       keys.each do |k,v|
         self[k.to_s] = v
       end if keys

data/lib/couchrest/more/extended_document.rb

@@ -33,6 +33,11 @@ module CouchRest
     
     def initialize(passed_keys={})
       apply_defaults # defined in CouchRest::Mixins::Properties
+      passed_keys.each do |k,v|
+        if self.respond_to?("#{k}=")
+          self.send("#{k}=", passed_keys.delete(k))
+        end
+      end if passed_keys
       super
       cast_keys      # defined in CouchRest::Mixins::Properties
       unless self['_id'] && self['_rev']
@@ -212,4 +217,4 @@ module CouchRest
     end
     
   end
-end
+end

data/lib/couchrest/more/property.rb

@@ -30,11 +30,11 @@ module CouchRest
         @validation_format  = options.delete(:format)     if options[:format]
         @read_only          = options.delete(:read_only)  if options[:read_only]
         @alias              = options.delete(:alias)      if options[:alias]
-        @default            = options.delete(:default)    if options[:default]
+        @default            = options.delete(:default)    unless options[:default].nil?
         @casted             = options[:casted] ? true : false
         @init_method        = options[:send] ? options.delete(:send) : 'new'
         @options            = options
       end
     
   end
-end
+end

data/lib/couchrest/support/rails.rb

@@ -0,0 +1,35 @@
+# This file contains various hacks for Rails compatibility.
+# To use, just require in environment.rb, like so:
+#
+#   require 'couchrest/support/rails'
+
+class Hash
+  # Hack so that CouchRest::Document, which descends from Hash,
+  # doesn't appear to Rails routing as a Hash of options
+  def self.===(other)
+    return false if self == Hash && other.is_a?(CouchRest::Document)
+    super
+  end
+end
+
+
+CouchRest::Document.class_eval do
+  # Hack so that CouchRest::Document, which descends from Hash,
+  # doesn't appear to Rails routing as a Hash of options
+  def is_a?(o)
+    return false if o == Hash
+    super
+  end
+  alias_method :kind_of?, :is_a?
+end
+
+
+require Pathname.new(File.dirname(__FILE__)).join('..', 'validation', 'validation_errors')
+
+CouchRest::Validation::ValidationErrors.class_eval do
+  # Returns the total number of errors added. Two errors added to the same attribute will be counted as such.
+  # This method is called by error_messages_for
+  def count
+    errors.values.inject(0) { |error_count, errors_for_attribute| error_count + errors_for_attribute.size }
+  end
+end

data/spec/couchrest/more/casted_model_spec.rb

@@ -4,6 +4,7 @@ require File.join(FIXTURE_PATH, 'more', 'card')
 class WithCastedModelMixin < Hash
   include CouchRest::CastedModel
   property :name
+  property :no_value
 end
 
 class DummyModel < CouchRest::ExtendedDocument
@@ -54,6 +55,14 @@ describe CouchRest::CastedModel do
     it "should know who casted it" do
       @casted_obj.casted_by.should == @obj
     end
+
+    it "should return nil for the 'no_value' attribute" do
+      @casted_obj.no_value.should be_nil
+    end
+
+    it "should return nil for the unknown attribute" do
+      @casted_obj["unknown"].should be_nil
+    end
   end
   
   describe "casted as an array of a different type" do

data/spec/couchrest/more/extended_doc_spec.rb

@@ -10,6 +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 :name
     timestamps!
   end
@@ -52,6 +53,19 @@ describe "ExtendedDocument" do
     property :preset, :default => 'value'
     property :has_no_default
   end
+
+  class WithGetterAndSetterMethods < CouchRest::ExtendedDocument
+    use_database TEST_SERVER.default_database
+    
+    property :other_arg
+    def arg
+      other_arg
+    end
+
+    def arg=(value)
+      self.other_arg = "foo-#{value}"
+    end
+  end
   
   before(:each) do
     @obj = WithDefaultValues.new
@@ -144,6 +158,11 @@ describe "ExtendedDocument" do
       obj = WithDefaultValues.new(:tags => ['spec'])
       obj.tags.should == ['spec']
     end
+
+    it "should work with a default value of false" do
+      obj = WithDefaultValues.new
+      obj.false_default.should == false
+    end
   end
   
   describe "a doc with template values (CR::Model spec)" do
@@ -506,4 +525,13 @@ describe "ExtendedDocument" do
       
     end
   end
-end
+
+  describe "getter and setter methods" do
+    it "should try to call the arg= method before setting :arg in the hash" do
+      @doc = WithGetterAndSetterMethods.new(:arg => "foo")
+      @doc['arg'].should be_nil
+      @doc[:arg].should be_nil
+      @doc.other_arg.should == "foo-foo"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,4 +23,16 @@ def reset_test_db!
   db = cr.database(TESTDB)
   db.recreate! rescue nil
   db
+end
+
+Spec::Runner.configure do |config|
+  config.before(:all) { reset_test_db! }
+  
+  config.after(:all) do
+    cr = TEST_SERVER
+    test_dbs = cr.databases.select { |db| db =~ /^#{TESTDB}/ }
+    test_dbs.each do |db|
+      cr.database(db).delete! rescue nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.23"
+  version: "0.24"
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -58,39 +58,28 @@ files:
 - README.md
 - Rakefile
 - THANKS.md
-- examples/model
 - examples/model/example.rb
-- examples/word_count
 - examples/word_count/markov
-- examples/word_count/views
-- examples/word_count/views/books
 - examples/word_count/views/books/chunked-map.js
 - examples/word_count/views/books/united-map.js
-- examples/word_count/views/markov
 - examples/word_count/views/markov/chain-map.js
 - examples/word_count/views/markov/chain-reduce.js
-- examples/word_count/views/word_count
 - examples/word_count/views/word_count/count-map.js
 - examples/word_count/views/word_count/count-reduce.js
 - examples/word_count/word_count.rb
 - examples/word_count/word_count_query.rb
 - examples/word_count/word_count_views.rb
-- lib/couchrest
-- lib/couchrest/commands
 - lib/couchrest/commands/generate.rb
 - lib/couchrest/commands/push.rb
-- lib/couchrest/core
 - lib/couchrest/core/database.rb
 - lib/couchrest/core/design.rb
 - lib/couchrest/core/document.rb
 - lib/couchrest/core/response.rb
 - lib/couchrest/core/server.rb
 - lib/couchrest/core/view.rb
-- lib/couchrest/helper
 - lib/couchrest/helper/pager.rb
 - lib/couchrest/helper/streamer.rb
 - lib/couchrest/helper/upgrade.rb
-- lib/couchrest/mixins
 - lib/couchrest/mixins/attachments.rb
 - lib/couchrest/mixins/callbacks.rb
 - lib/couchrest/mixins/class_proxy.rb
@@ -103,22 +92,18 @@ files:
 - lib/couchrest/mixins/views.rb
 - lib/couchrest/mixins.rb
 - lib/couchrest/monkeypatches.rb
-- lib/couchrest/more
 - lib/couchrest/more/casted_model.rb
 - lib/couchrest/more/extended_document.rb
 - lib/couchrest/more/property.rb
-- lib/couchrest/support
 - lib/couchrest/support/blank.rb
 - lib/couchrest/support/class.rb
-- lib/couchrest/validation
+- lib/couchrest/support/rails.rb
 - lib/couchrest/validation/auto_validate.rb
 - lib/couchrest/validation/contextual_validators.rb
 - lib/couchrest/validation/validation_errors.rb
-- lib/couchrest/validation/validators
 - lib/couchrest/validation/validators/absent_field_validator.rb
 - lib/couchrest/validation/validators/confirmation_validator.rb
 - lib/couchrest/validation/validators/format_validator.rb
-- lib/couchrest/validation/validators/formats
 - lib/couchrest/validation/validators/formats/email.rb
 - lib/couchrest/validation/validators/formats/url.rb
 - lib/couchrest/validation/validators/generic_validator.rb
@@ -127,17 +112,13 @@ files:
 - lib/couchrest/validation/validators/numeric_validator.rb
 - lib/couchrest/validation/validators/required_field_validator.rb
 - lib/couchrest.rb
-- spec/couchrest
-- spec/couchrest/core
 - spec/couchrest/core/couchrest_spec.rb
 - spec/couchrest/core/database_spec.rb
 - spec/couchrest/core/design_spec.rb
 - spec/couchrest/core/document_spec.rb
 - spec/couchrest/core/server_spec.rb
-- spec/couchrest/helpers
 - spec/couchrest/helpers/pager_spec.rb
 - spec/couchrest/helpers/streamer_spec.rb
-- spec/couchrest/more
 - spec/couchrest/more/casted_extended_doc_spec.rb
 - spec/couchrest/more/casted_model_spec.rb
 - spec/couchrest/more/extended_doc_attachment_spec.rb
@@ -145,12 +126,9 @@ files:
 - spec/couchrest/more/extended_doc_subclass_spec.rb
 - spec/couchrest/more/extended_doc_view_spec.rb
 - spec/couchrest/more/property_spec.rb
-- spec/fixtures
-- spec/fixtures/attachments
 - spec/fixtures/attachments/couchdb.png
 - spec/fixtures/attachments/README
 - spec/fixtures/attachments/test.html
-- spec/fixtures/more
 - spec/fixtures/more/article.rb
 - spec/fixtures/more/card.rb
 - spec/fixtures/more/course.rb
@@ -159,9 +137,7 @@ files:
 - spec/fixtures/more/person.rb
 - spec/fixtures/more/question.rb
 - spec/fixtures/more/service.rb
-- spec/fixtures/views
 - spec/fixtures/views/lib.js
-- spec/fixtures/views/test_view
 - spec/fixtures/views/test_view/lib.js
 - spec/fixtures/views/test_view/only-map.js
 - spec/fixtures/views/test_view/test-map.js
@@ -172,6 +148,8 @@ files:
 - utils/subset.rb
 has_rdoc: true
 homepage: http://github.com/jchris/couchrest
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -192,9 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Lean and RESTful interface to CouchDB.
 test_files: []