crumbs 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2257e21c1a564cd87a4eb18980f6d6b9eadd18
-  data.tar.gz: e4aeceb5449fa41acb0283bfdee6c420fc7f92c5
+  metadata.gz: 65c23c3a5031cc7aee4ea4f9345d356a920ae45a
+  data.tar.gz: 1eac4ee8c700f05faaa1686802121c7d4a6099c7
 SHA512:
-  metadata.gz: 025e40e97ae86d03704cadf453dde0ee292ba0efee694f6ab1160d99ca743e621dc359c1cb6ab95f4ae11ebb213d99a3e477da83654574037a9f52d61226bf7e
-  data.tar.gz: a5db02148cd3aadfda87f14e4327cebccd9ca580284f71d8ad0c8416d5399040e9965babe8fa15a03a81b9ecd03aff31ddfb509e311c55c3be66b5bbf87f8c35
+  metadata.gz: 11c1db3e6708873d5b70bdb8c852626e8db9ec0348b5e75d0e9c730fe5654fbd96f2037304451826bf63664f67eec1b1133c438d243f3c9530487e38908e9487
+  data.tar.gz: 15c226389376609305b7d1a26890df5788a67d4af6fbec7ad9e1a5e97b1e003072b5e3e6cd883594dfd2b0540d43c883b61e3918b42dd0a4b28e333b86a1dba0

data/README.rdoc

@@ -17,7 +17,7 @@ Then bundle:
 In your controllers add crumbs to the actions you want to have a crumb:
   crumb :home, 'Home'
 
-You can use a proc if you want, will receive the corresponding url parameters:
+You can use a lambda, proc or block too, will receive the corresponding url parameters:
   crumb :product, proc { |params| Product.find(params[:id]).name }
   
 Then in your views would be available a crumbs variable:

data/lib/crumbs/action_controller/base.rb

@@ -63,7 +63,7 @@ module Crumbs
       
       def join_parts(parts)
         path = parts.join('/')
-        (path[0] != '/' ? "/#{path}" : path)
+        path[0] != '/' ? "/#{path}" : path
       end
     
       def is_last_referer?
@@ -109,8 +109,9 @@ module Crumbs
         
         protected
         
-        def crumb(action, name)
+        def crumb(action, name = nil, &block)
           controller = self.name.gsub('::', '/').gsub('Controller', '').underscore
+          name = block_given? ? block : name
           History.add(controller, action, name)
         end
         

data/lib/crumbs/history.rb

@@ -7,21 +7,24 @@ module Crumbs
       end
     
       def add(controller, action, name)
-        unless all.has_key? controller.to_sym
-          all[controller.to_sym] = { action.to_sym => name }
+        controller = controller.to_sym
+        action = action.to_sym
+        unless all.has_key? controller
+          all[controller] = { action => name }
         else 
-          all[controller.to_sym][action.to_sym] = name
+          all[controller][action] = name
         end
       end
   
       def get_name(controller, action, params)
-        return false unless all.has_key? controller.to_sym and all[controller.to_sym].has_key? action.to_sym
-        name = all[controller.to_sym][action.to_sym]
-        case name
-        when String
-          value = name
-        when Proc
+        controller = controller.to_sym
+        action = action.to_sym
+        return false unless all.has_key? controller and all[controller].has_key? action
+        name = all[controller][action]
+        if name.respond_to? :call
           value = name.call(params)
+        elsif
+          value = name
         end
         value ? value : ''
       end

data/lib/crumbs/version.rb

@@ -1,5 +1,5 @@
 module Crumbs
 
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 
 end

data/test/dummy/app/controllers/pages_controller.rb

@@ -1,9 +1,9 @@
 class PagesController < ApplicationController
 
   crumb :home, 'Home'
-  crumb :static, 'Static'
-  crumb :i18n, I18n.t('hello')
-  crumb :nested, proc { |params| 'Nested' }
+  crumb(:static) { 'Static' }
+  crumb :i18n do I18n.t('hello') end
+  crumb :nested, ->(params) { 'Nested' }
   crumb :param, proc { |params| params[:param] }
 
   def home