rezource 0.0.5 → 0.0.6

data/lib/rezource.rb

@@ -245,7 +245,7 @@ module Rezource
 
   def resource_create(resource)
     before_create resource
-    resource.save if resource.valid?
+    resource.save unless resource.errors.any?
     after_create resource
 
     # respond_with *namespace, resource
@@ -254,11 +254,11 @@ module Rezource
 
   def resource_update(resource, attributes={})
     before_update resource
-    resource.update_attributes attributes if resource.valid?
+    resource.update_attributes attributes unless resource.errors.any?
     after_update resource
 
     if _action = params[:_action]
-      if resource.valid?
+      unless resource.errors.any?
         respond_with *namespace, resource, location: action_resource_path(_action)
       else
         respond_with *namespace, resource, action: _action

data/rezource.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name               = "rezource"
-  s.version            = "0.0.5"
+  s.version            = "0.0.6"
 
   s.authors = ["Jan Zimmek"]
   s.email = %q{jan.zimmek@web.de}

data/test/test_rezource.rb

@@ -521,10 +521,12 @@ class RezourceTest < Test::Unit::TestCase
 
   def test_resource_create__valid
     c = SamplesController.new
+    e = mock()
     m = mock()
 
     c.expects(:before_create).with(m)
-    m.expects(:valid?).returns true
+    m.expects(:errors).returns e
+    e.expects(:any?).returns false
     m.expects(:save)
     c.expects(:after_create).with(m)
     c.expects(:respond_with).with(*(c.namespace + [m]))
@@ -534,10 +536,13 @@ class RezourceTest < Test::Unit::TestCase
 
   def test_resource_create__invalid
     c = SamplesController.new
+
+    e = mock()
     m = mock()
 
     c.expects(:before_create).with(m)
-    m.expects(:valid?).returns false
+    m.expects(:errors).returns e
+    e.expects(:any?).returns true
     c.expects(:after_create).with(m)
     c.expects(:respond_with).with(*(c.namespace + [m]))
 
@@ -547,10 +552,13 @@ class RezourceTest < Test::Unit::TestCase
   def test_resource_update__valid
     c = SamplesController.new
     attributes = {name: "joe"}
+
     m = mock()
+    e = mock()
 
     c.expects(:before_update).with(m)
-    m.expects(:valid?).returns true
+    m.expects(:errors).returns e
+    e.expects(:any?).returns false
     m.expects(:update_attributes).with(attributes)
     c.expects(:after_update).with(m)
     c.expects(:respond_with).with(*(c.namespace + [m]))
@@ -562,9 +570,11 @@ class RezourceTest < Test::Unit::TestCase
     c = SamplesController.new
     attributes = {name: "joe"}
     m = mock()
+    e = mock()
 
     c.expects(:before_update).with(m)
-    m.expects(:valid?).returns false
+    m.expects(:errors).returns e
+    e.expects(:any?).returns true
     c.expects(:after_update).with(m)
     c.expects(:respond_with).with(*(c.namespace + [m]))
 
@@ -575,13 +585,16 @@ class RezourceTest < Test::Unit::TestCase
     c = SamplesController.new
     attributes = {name: "joe"}
     m = mock()
+    e = mock()
 
     c.expects(:before_update).with(m)
-    m.expects(:valid?).returns false
+    m.expects(:errors).returns e
+    e.expects(:any?).returns true
     c.expects(:after_update).with(m)
 
     c.expects(:"params").returns({_action: "custom"})
-    m.expects(:valid?).returns false
+    m.expects(:errors).returns e
+    e.expects(:any?).returns true
 
     c.expects(:respond_with).with(*(c.namespace + [m] + [{action: "custom"}]))
 
@@ -592,14 +605,18 @@ class RezourceTest < Test::Unit::TestCase
     c = SamplesController.new
     attributes = {name: "joe"}
     m = mock()
+    e = mock()
 
     c.expects(:before_update).with(m)
-    m.expects(:valid?).returns true
+
+    m.expects(:errors).returns e
+    e.expects(:any?).returns false
     m.expects(:update_attributes).with(attributes)
     c.expects(:after_update).with(m)
 
     c.expects(:"params").returns({_action: "custom"})
-    m.expects(:valid?).returns true
+    m.expects(:errors).returns e
+    e.expects(:any?).returns false
 
     c.expects(:"custom_sample_path").returns "/sample/XYZ/custom"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rezource
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies: []
 description: Make Rails restful controller even more simple
 email: jan.zimmek@web.de