deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

last touch up before merging all the 0.4 changes

Browse source
This commit is contained in:
Matt Aimonetti 2009-08-24 17:12:13 -07:00
parent 64a51b73ae
commit a3cc649616
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
couchrest.gemspec
View file

@ -2,7 +2,7 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = %q{couchrest} s.name = %q{couchrest}
s.version = "0.34" s.version = "0.33"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["J. Chris Anderson", "Matt Aimonetti"] s.authors = ["J. Chris Anderson", "Matt Aimonetti"]

11
lib/couchrest/more/extended_document.rb
View file

@ -168,7 +168,8 @@ module CouchRest
end end
# for compatibility with old-school frameworks # for compatibility with old-school frameworks
alias :new_record? :new_document? alias :new_record? :new?
alias :new_document? :new?
# Trigger the callbacks (before, after, around) # Trigger the callbacks (before, after, around)
# and create the document # and create the document
@ -189,7 +190,7 @@ module CouchRest
# unlike save, create returns the newly created document # unlike save, create returns the newly created document
def create_without_callbacks(bulk =false) def create_without_callbacks(bulk =false)
raise ArgumentError, "a document requires a database to be created to (The document or the #{self.class} default database were not set)" unless database raise ArgumentError, "a document requires a database to be created to (The document or the #{self.class} default database were not set)" unless database
set_unique_id if new_document? && self.respond_to?(:set_unique_id) set_unique_id if new? && self.respond_to?(:set_unique_id)
result = database.save_doc(self, bulk) result = database.save_doc(self, bulk)
(result["ok"] == true) ? self : false (result["ok"] == true) ? self : false
end end
@ -204,7 +205,7 @@ module CouchRest
# only if the document isn't new # only if the document isn't new
def update(bulk = false) def update(bulk = false)
caught = catch(:halt) do caught = catch(:halt) do
if self.new_document? if self.new?
save(bulk) save(bulk)
else else
_run_update_callbacks do _run_update_callbacks do
@ -220,7 +221,7 @@ module CouchRest
# and save the document # and save the document
def save(bulk = false) def save(bulk = false)
caught = catch(:halt) do caught = catch(:halt) do
if self.new_document? if self.new?
_run_save_callbacks do _run_save_callbacks do
save_without_callbacks(bulk) save_without_callbacks(bulk)
end end
@ -234,7 +235,7 @@ module CouchRest
# Returns a boolean value # Returns a boolean value
def save_without_callbacks(bulk = false) def save_without_callbacks(bulk = false)
raise ArgumentError, "a document requires a database to be saved to (The document or the #{self.class} default database were not set)" unless database raise ArgumentError, "a document requires a database to be saved to (The document or the #{self.class} default database were not set)" unless database
set_unique_id if new_document? && self.respond_to?(:set_unique_id) set_unique_id if new? && self.respond_to?(:set_unique_id)
result = database.save_doc(self, bulk) result = database.save_doc(self, bulk)
mark_as_saved mark_as_saved
true true