Skip to content

Commit

Permalink
Added save! which raises ResourceInvalid unless valid?
Browse files Browse the repository at this point in the history
Similar to Active Record - it will raise ActiveResouce::ResourceInvalid if
the resource is not valid (ie if <tt>valid?</tt> returns false)

However - does not raise ActiveResource::ResourceNotFound if the callbacks
fail (callbacks have not yet been implemented) - it will just try to save
and raise if the callbacks all fail.

This is not ideal behaviour - but will do until we decide to change the
behaviour of save_with_validations to actually raise (rather than catch) the
ResourceInvalid exception.

Signed-off-by: Joshua Peek <josh@joshpeek.com>
  • Loading branch information
taryn authored and josh committed Aug 19, 2009
1 parent 4dc05bc commit 328ba3b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
17 changes: 17 additions & 0 deletions activeresource/lib/active_resource/base.rb
Expand Up @@ -893,6 +893,23 @@ def dup
def save
new? ? create : update
end

# Saves the resource.
#
# If the resource is new, it is created via +POST+, otherwise the
# existing resource is updated via +PUT+.
#
# With <tt>save!</tt> validations always run. If any of them fail
# ActiveResource::ResourceInvalid gets raised, and nothing is POSTed to
# the remote system.
# See ActiveResource::Validations for more information.
#
# There's a series of callbacks associated with <tt>save!</tt>. If any
# of the <tt>before_*</tt> callbacks return +false+ the action is
# cancelled and <tt>save!</tt> raises ActiveResource::ResourceInvalid.
def save!
save || raise(ResourceInvalid.new(self))
end

# Deletes the resource from the remote service.
#
Expand Down
8 changes: 7 additions & 1 deletion activeresource/test/cases/base_test.rb
Expand Up @@ -654,7 +654,13 @@ def test_custom_header

def test_save
rick = Person.new
assert_equal true, rick.save
assert rick.save
assert_equal '5', rick.id
end

def test_save!
rick = Person.new
assert rick.save!
assert_equal '5', rick.id
end

Expand Down
8 changes: 7 additions & 1 deletion activeresource/test/cases/validations_test.rb
Expand Up @@ -23,9 +23,15 @@ def test_validates_presence_of

assert p.save, "should have saved after fixing the validation, but had: #{p.errors.inspect}"
end

def test_fails_save!
p = new_project(:name => nil)
assert_raise(ActiveResource::ResourceInvalid) { p.save! }
end


def test_validate_callback
# we have a callback ensuring the description is longer thn three letters
# we have a callback ensuring the description is longer than three letters
p = new_project(:description => 'a')
assert !p.valid?, "should not be a valid record when it fails a validation callback"
assert !p.save, "should not have saved an invalid record"
Expand Down

0 comments on commit 328ba3b

Please sign in to comment.