rezource 0.0.2 → 0.0.3

data/lib/rezource.rb

@@ -55,6 +55,10 @@ module Rezource
     send raw_path("edit").to_sym, *args
   end
 
+  def action_resource_path(action, *args)
+    send raw_path(action).to_sym, *args
+  end
+
   def resources_path(*args)
     send raw_path.to_sym, *args
   end
@@ -63,17 +67,13 @@ module Rezource
     send raw_path(nil, true).to_sym, *args
   end
 
-  # def resource_path(*args)
-  #   send raw_path.to_sym, *args
-  # end
-
   def raw_path(action=nil, singleton=false)
     parts = []
     parts += [action] if action
     parts += namespace
     parts += [parent_ivar] if parent?
     
-    parts += if ["new", "edit"].include?(action)
+    parts += if action
       [resource_ivar]
     elsif singleton
       [resource_ivar]
@@ -204,7 +204,16 @@ module Rezource
     resource.update_attributes attributes if resource.valid?
     after_update resource
 
-    respond_with *namespace, resource
+    if _action = params[:_action]
+      if resource.valid?
+        respond_with *namespace, resource, location: action_resource_path(_action)
+      else
+        respond_with *namespace, resource, action: _action
+      end
+
+    else
+      respond_with *namespace, resource
+    end
   end
 
   def resource_destroy(resource)

data/rezource.gemspec

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

data/test/test_rezource.rb

@@ -9,8 +9,13 @@ class Sample
 end
 
 class SamplesController
-  def self.helper_method(*args)      
+  def self.helper_method(*args)
   end
+
+  def params
+    {}
+  end
+
   include Rezource
 end
 
@@ -18,6 +23,9 @@ module Namespaced
   class SamplesController
     def self.helper_method(*args)      
     end
+    def params
+      {}
+    end
     include Rezource
   end
 end
@@ -41,8 +49,11 @@ class RezourceTest < Test::Unit::TestCase
     assert c.respond_to? :resource
     assert c.respond_to? :resources
     assert c.respond_to? :parent
+
+    assert c.respond_to? :resource_path
     assert c.respond_to? :resources_path
     assert c.respond_to? :new_resource_path
+    assert c.respond_to? :edit_resource_path
   end
 
   def test_resource_options
@@ -113,6 +124,12 @@ class RezourceTest < Test::Unit::TestCase
     assert_equal "/samples/XYZ/edit", c.edit_resource_path
   end
 
+  def test_action_resources_path
+    c = SamplesController.new
+    c.stubs(:custom_sample_path).returns "/samples/XYZ/custom"
+    assert_equal "/samples/XYZ/custom", c.action_resource_path("custom")
+  end
+
 
   def test_default_respond_with
     c = SamplesController.new
@@ -436,6 +453,43 @@ class RezourceTest < Test::Unit::TestCase
     c.resource_update m, attributes
   end
 
+ def test_resource_update__invalid_with_action
+    c = SamplesController.new
+    attributes = {name: "joe"}
+    m = mock()
+
+    c.expects(:before_update).with(m)
+    m.expects(:valid?).returns false
+    c.expects(:after_update).with(m)
+
+    c.expects(:"params").returns({_action: "custom"})
+    m.expects(:valid?).returns false
+
+    c.expects(:respond_with).with(*(c.namespace + [m] + [{action: "custom"}]))
+
+    c.resource_update m, attributes
+  end
+
+ def test_resource_update__valid_with_action
+    c = SamplesController.new
+    attributes = {name: "joe"}
+    m = mock()
+
+    c.expects(:before_update).with(m)
+    m.expects(:valid?).returns true
+    m.expects(:update_attributes).with(attributes)
+    c.expects(:after_update).with(m)
+
+    c.expects(:"params").returns({_action: "custom"})
+    m.expects(:valid?).returns true
+
+    c.expects(:"custom_sample_path").returns "/sample/XYZ/custom"
+
+    c.expects(:respond_with).with(*(c.namespace + [m] + [{location: "/sample/XYZ/custom"}]))
+
+    c.resource_update m, attributes
+  end
+
   def test_resource_destroy
     c = SamplesController.new
     m = mock()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rezource
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: