site_map 0.2.6 → 0.2.7

data/lib/site_map/helpers/action_controller.rb

@@ -0,0 +1,15 @@
+module SiteMap
+  module Helpers
+
+    module ActionController
+
+      protected
+
+      def view_node
+        @view_node ||= SiteMap[[self.controller_name, self.action_name].join('__').to_sym]
+      end
+
+    end
+
+  end
+end

data/lib/site_map/helpers/mapping.rb

@@ -32,7 +32,7 @@ module SiteMap
       def collection_view(resource, action, options={})
         options.merge!({:resource => resource.to_sym, :action => action.to_sym})
         view_node = self.add_node([resource, action].join('__').to_sym, :collection, options)
-        DEFAULT_ALIAS[action].each do |action|
+        (DEFAULT_ALIAS[action] || []).each do |action|
           view_node.alias([resource, action].join('__').to_sym, view_node.index)
         end
         block_given? ? (yield view_node) : view_node
@@ -44,7 +44,7 @@ module SiteMap
       def member_view(resource, action, options={})
         options.merge!({:resource => resource.to_sym, :action => action.to_sym})
         view_node = self.add_node([resource, action].join('__').to_sym, :member, options)
-        DEFAULT_ALIAS[action].each do |action|
+        (DEFAULT_ALIAS[action] || []).each do |action|
           view_node.alias([resource, action].join('__').to_sym, view_node.index)
         end
         block_given? ? (yield view_node) : view_node

data/lib/site_map/version.rb

@@ -3,7 +3,7 @@ module SiteMap
 
     MAJOR = 0
     MINOR = 2
-    TINY  = 6
+    TINY  = 7
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/lib/site_map/view_helpers.rb

@@ -23,4 +23,4 @@ module SiteMap
     alias :view_node_visible? :view_node_visible
 
   end
-end
+end

data/lib/site_map/view_node.rb

@@ -7,17 +7,21 @@ module SiteMap
     ATTRIBUTES.each{|attribute| attr_reader attribute }
 
     TYPES = [ :view, :group, :member, :collection ]
+    BASE_LABEL_TEMPLATE = {
+      :collection => ":action :resource",
+      :member => ":action ::resource_name"
+    }
     LABEL_ACTION_TEMPLATES = {
-      :index => ":resource List",
-      :new => "New :resource",
-      :show => "::resource_name",
-      :edit => "Edit ::resource_name"
+      :index => BASE_LABEL_TEMPLATE[:collection].gsub(':action','').strip,
+      :show => BASE_LABEL_TEMPLATE[:member].gsub(':action','').strip
+    }
+    BASE_URL_TEMPLATE = {
+      :collection => [':resource', 'path'],
+      :member => [':resource', 'path(@:resource)']
     }
     URL_ACTION_TEMPLATES = {
-      :index => ":resource_path",
-      :new => "new_:resource_path",
-      :show => ":resource_path(@:resource)",
-      :edit => "edit_:resource_path(@:resource)"
+      :index => BASE_URL_TEMPLATE[:collection],
+      :show => BASE_URL_TEMPLATE[:member]
     }
 
     def initialize(index, map, type, options={})
@@ -109,20 +113,30 @@ module SiteMap
     end
 
     def resource_label(resource_text)
-      LABEL_ACTION_TEMPLATES[@action].gsub(':resource', resource_text)
+      template = (LABEL_ACTION_TEMPLATES[@action] || BASE_LABEL_TEMPLATE[@type])
+      template.gsub(':action', self.title_string(@action.to_s)).gsub(':resource', resource_text)
     end
     def resource_url
       resource_text = if @type == :collection
-        parent_sym = if [:member, :collection].include?(self.parent.type)
+        action_str = unless URL_ACTION_TEMPLATES[@action]
+          @action.to_s
+        end
+        parent_str = if [:member, :collection].include?(self.parent.type)
           self.single_string(self.parent.resource)
         elsif self.parent.type == :group
-          self.parent.index
+          self.parent.index.to_s
         end
-        resource_with_parent = [parent_sym, (@action == :new ? self.single_string : @resource.to_s)].compact.join('_')
-        resourced_url = URL_ACTION_TEMPLATES[@action].gsub(':resource', resource_with_parent)
-        [resourced_url, ("(@#{parent_sym})" if parent_sym)].compact.join
+        template = (URL_ACTION_TEMPLATES[@action] || BASE_URL_TEMPLATE[@type])
+        resourced_url = [action_str, parent_str, template].flatten.compact.join('_')
+        resourced_url = [resourced_url, ("(@#{parent_str})" if parent_str)].compact.join
+        resourced_url.gsub(':resource', (@action == :new ? self.single_string : @resource.to_s))
       else
-        URL_ACTION_TEMPLATES[@action].gsub(':resource', self.single_string)
+        action_str = unless URL_ACTION_TEMPLATES[@action]
+          @action.to_s
+        end
+        template = (URL_ACTION_TEMPLATES[@action] || BASE_URL_TEMPLATE[@type])
+        resourced_url = [action_str, template].flatten.compact.join('_')
+        resourced_url.gsub(':resource', self.single_string)
       end
     end
 

data/lib/site_map.rb

@@ -34,4 +34,7 @@ module SiteMap
   end
 
 end
-SiteMap.setup
+SiteMap.setup
+
+ActionView::Base.send(:include, SiteMap::ViewHelpers) if defined?(ActionView::Base)
+ActionController::Base.send(:include, SiteMap::Helpers::ActionController) if defined?(ActionController::Base)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: site_map
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Collin Redding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 -06:00
+date: 2010-01-19 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/site_map/exceptions.rb
+- lib/site_map/helpers/action_controller.rb
 - lib/site_map/helpers/mapping.rb
 - lib/site_map/helpers.rb
 - lib/site_map/map.rb