uncle 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336be1f9d0b34f0d33084cf21907b845aaf0428a
-  data.tar.gz: 1937bad55cb10178520575b5782201ff1c249b73
+  metadata.gz: 5b4cacd411915be33e1ecb0e1d76cb0887fe50ff
+  data.tar.gz: 1384c20c13aadad70f1c24442b6ebebd1f83194d
 SHA512:
-  metadata.gz: 4ec38753e03f0d585ae533245fa59f310b9b38849a065d181451ee45cc9a10b854085471d5bb6407fa17ff7a2403e84c3d64f0dc09f63c3ad62700e3aab499f1
-  data.tar.gz: 8baa9240f8661d4b8338737f47e5fa261880746c8cf3a674c9b06cac24e72d8e0ab93fc34466fa404de91883170107e0a99c4f1f38646479c74a9c3a58e04f57
+  metadata.gz: 34a8a5b927803aaf1b61e78dd4f62de74c28c541949f1b42acd3eb653f8d4b81a55a6009d9c6ddfe16fb351e761a1f9cd46ed2cf55ad83a2a1532b82a5dcf016
+  data.tar.gz: fd3870593f469753ca923b044397fcb80274be3606364d3cb8dc83f3602b9e86891f223690c675415c8dd0c16ca253f9c3ae1162822d1f6f44bac01846d47494

data/lib/uncle/request.rb

@@ -43,8 +43,12 @@ module Uncle
 
     def child_resource_nodes
       @child_resource_nodes ||= begin
-        nodes = node_for_path(request.path).siblings
-        node  = nodes.detect { |c| c.key == ":#{resource_name}_id" }
+        node = node_for_path(request.path)
+
+        if node.parent
+          nodes = node.parent.children
+          node  = nodes.detect { |c| c.key == ":#{resource_name}_id" }
+        end
 
         node.children
       end

data/lib/uncle/version.rb

@@ -1,3 +1,3 @@
 module Uncle
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/dummy/config/routes.rb

@@ -1,4 +1,6 @@
 Dummy::Application.routes.draw do
+  root 'widgets#show'
+  
   resources :widgets, except: %i<new edit> do
     resources :gizmos, except: %i<new edit>
     resources :doo_dads, except: %i<new edit>

data/test/dummy/log/test.log

@@ -2895,6 +2895,144 @@ Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
 UncleTest: test_returning_the_parent_resource_from_a_resource_instance
 ----------------------------------------------------------------------
 Started GET "/thingies/1" for 127.0.0.1 at 2014-04-13 21:14:25 +0100
+Processing by ThingiesController#show as HTML
+  Parameters: {"id"=>"1"}
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------
+UncleTest: test_returning_the_child_resources_from_a_resource_instance
+----------------------------------------------------------------------
+Started GET "/widgets/1" for 127.0.0.1 at 2014-04-14 02:20:38 +0100
+Processing by WidgetsController#show as HTML
+  Parameters: {"id"=>"1"}
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------
+UncleTest: test_returning_the_child_resources_from_the_root_path
+----------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2014-04-14 02:20:38 +0100
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------
+UncleTest: test_returning_the_parent_resource_from_a_collection_resource
+------------------------------------------------------------------------
+Started GET "/widgets/1/gizmos" for 127.0.0.1 at 2014-04-14 02:20:38 +0100
+Processing by GizmosController#index as HTML
+  Parameters: {"widget_id"=>"1"}
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------
+UncleTest: test_returning_the_parent_resource_from_a_resource_instance
+----------------------------------------------------------------------
+Started GET "/thingies/1" for 127.0.0.1 at 2014-04-14 02:20:38 +0100
+Processing by ThingiesController#show as HTML
+  Parameters: {"id"=>"1"}
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------
+UncleTest: test_returning_the_child_resources_from_a_resource_instance
+----------------------------------------------------------------------
+Started GET "/widgets/1" for 127.0.0.1 at 2014-04-14 02:21:46 +0100
+Processing by WidgetsController#show as HTML
+  Parameters: {"id"=>"1"}
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+UncleTest: test_returning_the_child_resources_from_the_root_path
+----------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2014-04-14 02:21:46 +0100
+Processing by WidgetsController#show as HTML
+Completed 500 Internal Server Error in 0ms
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------
+UncleTest: test_returning_the_parent_resource_from_a_collection_resource
+------------------------------------------------------------------------
+Started GET "/widgets/1/gizmos" for 127.0.0.1 at 2014-04-14 02:21:46 +0100
+Processing by GizmosController#index as HTML
+  Parameters: {"widget_id"=>"1"}
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------------
+UncleTest: test_returning_the_parent_resource_from_a_resource_instance
+----------------------------------------------------------------------
+Started GET "/thingies/1" for 127.0.0.1 at 2014-04-14 02:21:46 +0100
+Processing by ThingiesController#show as HTML
+  Parameters: {"id"=>"1"}
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------
+UncleTest: test_returning_the_child_resources_from_a_resource_instance
+----------------------------------------------------------------------
+Started GET "/widgets/1" for 127.0.0.1 at 2014-04-14 02:26:20 +0100
+Processing by WidgetsController#show as HTML
+  Parameters: {"id"=>"1"}
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+UncleTest: test_returning_the_child_resources_from_the_root_path
+----------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2014-04-14 02:26:20 +0100
+Processing by WidgetsController#show as HTML
+Completed 500 Internal Server Error in 0ms
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------
+UncleTest: test_returning_the_parent_resource_from_a_collection_resource
+------------------------------------------------------------------------
+Started GET "/widgets/1/gizmos" for 127.0.0.1 at 2014-04-14 02:26:20 +0100
+Processing by GizmosController#index as HTML
+  Parameters: {"widget_id"=>"1"}
+Completed 200 OK in 1ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------
+UncleTest: test_returning_the_parent_resource_from_a_resource_instance
+----------------------------------------------------------------------
+Started GET "/thingies/1" for 127.0.0.1 at 2014-04-14 02:26:20 +0100
+Processing by ThingiesController#show as HTML
+  Parameters: {"id"=>"1"}
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------
+UncleTest: test_returning_the_child_resources_from_a_resource_instance
+----------------------------------------------------------------------
+Started GET "/widgets/1" for 127.0.0.1 at 2014-04-14 02:28:12 +0100
+Processing by WidgetsController#show as HTML
+  Parameters: {"id"=>"1"}
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+UncleTest: test_returning_the_child_resources_from_the_root_path
+----------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2014-04-14 02:28:12 +0100
+Processing by WidgetsController#show as HTML
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------
+UncleTest: test_returning_the_parent_resource_from_a_collection_resource
+------------------------------------------------------------------------
+Started GET "/widgets/1/gizmos" for 127.0.0.1 at 2014-04-14 02:28:12 +0100
+Processing by GizmosController#index as HTML
+  Parameters: {"widget_id"=>"1"}
+Completed 200 OK in 1ms (Views: 0.4ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------------
+UncleTest: test_returning_the_parent_resource_from_a_resource_instance
+----------------------------------------------------------------------
+Started GET "/thingies/1" for 127.0.0.1 at 2014-04-14 02:28:12 +0100
 Processing by ThingiesController#show as HTML
   Parameters: {"id"=>"1"}
 Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)

data/test/uncle_test.rb

@@ -33,4 +33,15 @@ class UncleTest < ActiveSupport::TestCase
 
     assert_equal child_resources, JSON.parse(last_response.body)
   end
+
+  test 'returning the child resources from the root path' do
+    get '/'
+
+    child_resources = {
+      'widgets'  => 'http://example.org/widgets',
+      'thingies' => 'http://example.org/thingies'
+    }
+    
+    assert_equal child_resources, JSON.parse(last_response.body)
+  end
 end

metadata

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