lib/compo/mixins/url_referenceable.rb in compo-0.4.0 vs lib/compo/mixins/url_referenceable.rb in compo-0.5.0

@@ -1,5 +1,7 @@
+require 'compo/finders/root'
+
 module Compo
   module Mixins
     # Adds ID-based 'URL's to Compo classes
     #
     # For the purposes of this module, a URL is a string of slash-delimited IDs
@@ -24,44 +26,27 @@
       # @example  Gets the URL of an object with no parent.
       #   orphan.url
       #   #=> ''
       # @example  Gets the URL of an object with a parent.
       #   leaf.url
-      #   #=> 'grandparent_id/parent_id/id'
+      #   #=> '/grandparent_id/parent_id/id'
       #
       # @return [String]  The URL of this object.
       def url
-        parent.child_url(id)
+        Compo::Finders::Root.new(self).reverse_each.map do |item|
+          item.root? ? '' : item.id
+        end.join('/')
       end
 
-      # Returns the URL of a child of this object, with the given ID
-      #
-      # This defaults to joining the ID to this object's URL with a slash.
-      #
-      # @api  public
-      # @example  Gets the URL of the child of an object without a parent.
-      #   orphan.child_url(:id)
-      #   #=> '/id'
-      # @example  Gets the URL of the child of an object with a parent.
-      #   leaf.child_url(:id)
-      #   #=> 'grandparent_id/parent_id/id'
-      #
-      # @param child_id [Object]  The ID of the child whose URL is sought.
-      #
-      # @return [String]  The URL of the child with the given ID.
-      def child_url(child_id)
-        [url, child_id].join('/')
-      end
-
       # Returns the URL of this object's parent
       #
       # @api  public
       # @example  Gets the parent URL of an object with no parent.
       #   orphan.parent_url
-      #   #=> nil
+      #   #=> ''
       # @example  Gets the URL of an object with a parent.
       #   leaf.parent_url
-      #   #=> 'grandparent_id/parent_id'
+      #   #=> '/grandparent_id/parent_id'
       #
       # @return [String]  The URL of this object's parent, or nil if there is no
       #   parent.
       def_delegator :parent, :url, :parent_url
     end