rezource 0.0.4 → 0.0.5

data/lib/rezource.rb

@@ -82,49 +82,62 @@ module Rezource
   # -----------
 
   def new_resource_path(*args)
-    send raw_path("new").to_sym, *args
+    parts = ["new"] + namespace + (parent? ? [parent_ivar] : []) + [resource_ivar] + ["path"]
+    send parts.join("_").to_sym, *args
+
+    # send raw_path("new").to_sym, *args
   end
 
   def edit_resource_path(*args)
-    send raw_path("edit").to_sym, *args
+    action_resource_path "edit", *args
+    # parts = ["edit"] + namespace + [resource_ivar] + ["path"]
+    # send parts.join("_").to_sym, *args
+    # send raw_path("edit").to_sym, *args
   end
 
   def action_resource_path(action, *args)
-    send raw_path(action).to_sym, *args
+    parts = [action] + namespace + [resource_ivar] + ["path"]
+    send parts.join("_").to_sym, *args
+    # send raw_path(action).to_sym, *args
   end
 
   def resources_path(*args)
-    send raw_path.to_sym, *args
+    parts = namespace + (parent? ? [parent_ivar] : []) + [resource_options[:singleton] ? resource_ivar : resources_ivar] + ["path"]
+    send parts.join("_").to_sym, *args
+    # send raw_path.to_sym, *args
   end
 
   def resource_path(*args)
-    send raw_path(nil, true).to_sym, *args
+    parts = namespace + [resource_ivar] + ["path"]
+    send parts.join("_").to_sym, *args
+    # send raw_path(nil, true).to_sym, *args
   end
 
-  def raw_path(action=nil, singleton=false)
-    parts = []
-    parts += [action] if action
-    parts += namespace
+  # def raw_path(action=nil, singleton=false)
+  #   parts = []
+  #   parts += [action] if action
 
-    if parent? 
-      if !action || action != "edit"
-        parts += [parent_ivar]
-      end
-    end
-    
-    parts += if action
-      [resource_ivar]
-    elsif singleton
-      [resource_ivar]
-    elsif resource_options[:singleton]
-      [resource_ivar]
-    else
-      [resources_ivar]
-    end
+  #   parts += namespace
 
-    parts += ["path"]
-    parts.join("_")
-  end
+  #   if parent? 
+  #     if !action || action != "edit"
+  #       parts += [parent_ivar]
+  #     end
+  #   end
+    
+  #   parts += if action
+  #     [resource_ivar]
+  #   elsif singleton
+  #     [resource_ivar]
+  #   elsif resource_options[:singleton]
+  #     [resource_ivar]
+  #   else
+  #     [resources_ivar]
+  #   end
+
+  #   parts += ["path"]
+  #   parts.join("_")
+  # end
 
   # -----------
 

data/rezource.gemspec

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

data/test/test_rezource.rb

@@ -130,76 +130,124 @@ class RezourceTest < Test::Unit::TestCase
   # ----- url resources
 
 
-  def test_raw_path
+  # def test_raw_path
+  #   c = SamplesController.new
+  #   assert_equal "samples_path", c.raw_path
+  # end
+
+  # def test_raw_path__with_singleton
+  #   c = SamplesController.new
+  #   assert_equal "sample_path", c.raw_path(nil, true)
+  # end
+
+  # def test_raw_path__with_new_action
+  #   c = SamplesController.new
+  #   assert_equal "new_sample_path", c.raw_path("new")
+  # end
+
+  # def test_raw_path__with_edit_action
+  #   c = SamplesController.new
+  #   assert_equal "edit_sample_path", c.raw_path("edit")
+  # end
+
+  # def test_raw_path__with_namespace
+  #   c = Namespaced::SamplesController.new
+  #   assert_equal "namespaced_samples_path", c.raw_path
+  # end
+
+  # def test_raw_path__with_parent
+  #   c = SamplesController.resource(belongs_to: SampleParent).new
+  #   assert_equal "sample_parent_samples_path", c.raw_path
+  # end
+
+  # def test_raw_path__with_parent_and_namespace
+  #   c = Namespaced::SamplesController.resource(belongs_to: SampleParent).new
+  #   assert_equal "namespaced_sample_parent_samples_path", c.raw_path
+  # end
+
+  # def test_raw_path__with_parent_and_namespace_and_action
+  #   c = Namespaced::SamplesController.resource(belongs_to: SampleParent).new
+  #   assert_equal "edit_namespaced_sample_path", c.raw_path("edit")
+  # end
+
+  def test_resources_path
     c = SamplesController.new
-    assert_equal "samples_path", c.raw_path
+    c.stubs(:samples_path).returns "xyz"
+    assert_equal "xyz", c.resources_path
   end
 
-  def test_raw_path__with_singleton
-    c = SamplesController.new
-    assert_equal "sample_path", c.raw_path(nil, true)
+  def test_resources_path__with_singleton
+    c = SamplesController.resource(singleton: true).new
+    c.stubs(:sample_path).returns "xyz"
+    assert_equal "xyz", c.resources_path
   end
 
-  def test_raw_path__with_new_action
-    c = SamplesController.new
-    assert_equal "new_sample_path", c.raw_path("new")
+  def test_resources_path__with_namespace
+    c = Namespaced::SamplesController.new
+    c.stubs(:namespaced_samples_path).returns "xyz"
+    assert_equal "xyz", c.resources_path
   end
 
-  def test_raw_path__with_edit_action
+
+
+
+  def test_resource_path
     c = SamplesController.new
-    assert_equal "edit_sample_path", c.raw_path("edit")
+    c.stubs(:sample_path).returns "xyz"
+    assert_equal "xyz", c.resource_path
   end
 
-  def test_raw_path__with_namespace
-    c = Namespaced::SamplesController.new
-    assert_equal "namespaced_samples_path", c.raw_path
+  def test_resource_path__with_singleton
+    c = SamplesController.resource(singleton: true).new
+    c.stubs(:sample_path).returns "xyz"
+    assert_equal "xyz", c.resource_path
   end
 
-  def test_raw_path__with_parent
-    c = SamplesController.resource(belongs_to: SampleParent).new
-    assert_equal "sample_parent_samples_path", c.raw_path
+  def test_resource_path__with_namespace
+    c = Namespaced::SamplesController.new
+    c.stubs(:namespaced_sample_path).returns "xyz"
+    assert_equal "xyz", c.resource_path
   end
 
-  def test_raw_path__with_parent_and_namespace
-    c = Namespaced::SamplesController.resource(belongs_to: SampleParent).new
-    assert_equal "namespaced_sample_parent_samples_path", c.raw_path
-  end
 
-  def test_raw_path__with_parent_and_namespace_and_action
-    c = Namespaced::SamplesController.resource(belongs_to: SampleParent).new
-    assert_equal "edit_namespaced_sample_path", c.raw_path("edit")
-  end
 
-  def test_resources_path
+  def test_new_resources_path
     c = SamplesController.new
-    c.stubs(:samples_path).returns "/samples"
-    assert_equal "/samples", c.resources_path
+    c.stubs(:new_sample_path).returns "xyz"
+    assert_equal "xyz", c.new_resource_path
   end
 
-  def test_resource_path
-    c = SamplesController.new
-    c.stubs(:sample_path).returns "/sample/XYZ"
-    assert_equal "/sample/XYZ", c.resource_path
+  def test_new_resources_path__with_namespace
+    c = Namespaced::SamplesController.new
+    c.stubs(:new_namespaced_sample_path).returns "xyz"
+    assert_equal "xyz", c.new_resource_path
   end
 
-  def test_new_resources_path
+  def test_edit_resources_path
     c = SamplesController.new
-    c.stubs(:new_sample_path).returns "/samples/new"
-    assert_equal "/samples/new", c.new_resource_path
+    c.stubs(:edit_sample_path).returns "xyz"
+    assert_equal "xyz", c.edit_resource_path
   end
 
-  def test_edit_resources_path
-    c = SamplesController.new
-    c.stubs(:edit_sample_path).returns "/samples/XYZ/edit"
-    assert_equal "/samples/XYZ/edit", c.edit_resource_path
+  def test_edit_resources_path__with_namespace
+    c = Namespaced::SamplesController.new
+    c.stubs(:edit_namespaced_sample_path).returns "xyz"
+    assert_equal "xyz", 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")
+    c.stubs(:custom_sample_path).returns "xyz"
+    assert_equal "xyz", c.action_resource_path("custom")
+  end
+
+  def test_action_resources_path__with_namespace
+    c = Namespaced::SamplesController.new
+    c.stubs(:custom_namespaced_sample_path).returns "xyz"
+    assert_equal "xyz", c.action_resource_path("custom")
   end
 
+  # ------
 
   def test_default_respond_with
     c = SamplesController.new

metadata

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