crummy 1.2 → 1.3

data/README.textile

@@ -6,29 +6,21 @@ Crummy is a simple and tasty way to add breadcrumbs to your Rails applications.
 
 h2. Install
 
-The gem is hosted on gemcutter, so if you haven’t already, add it as a gem source:
+Simply add the dependency to your Gemfile:
 
 <pre>
   <code>
-    gem sources -a http://gemcutter.org/
+    gem "crummy", "~> 1.3"
   </code>
 </pre>
 
-Then install the Crummy gem:
+h3. Rails 2
 
-<pre>
-  <code>
-    gem install crummy
-  </code>
-</pre>
-
-h3. Rails 3 / Bundler.
-
-Simply add gem dependency to your Gemfile:
+In your terminal, write:
 
 <pre>
   <code>
-    gem "crummy", ">= 1.0.1"
+    gem install crummy
   </code>
 </pre>
 
@@ -48,6 +40,9 @@ In your controllers you may add_crumb either like a before_filter or within a me
       before_filter :load_comment, :only => "show"
       add_crumb :comment, :only => "show"
 
+      # Example for nested routes:
+      add_crumb(:document) { [:account, :document] }
+
       def show
         add_crumb @business.display_name, @business
       end
@@ -99,13 +94,12 @@ h3. Examples
   render_crumbs :format => :html_list  #=> <ul class="" id=""><li class=""><a href="/">Home</a></li><li class=""><a href="/">Businesses</a></li></ul>
  </code>
 </pre>
-A crumb with a nil link will just output plain text.
+A crumb with a nil argument for the link will output an unlinked crumb.
+
 With :format => :html_list you can specify additional params: :active_li_class, :li_class, :ul_class, :ul_id
 
 h2. Notes
 
-The variable set is set to @_crumbs as to not conflict with your code.
-
 h2. Todo
 
 * Port over rspecs from project to plugin (Fully tested in a project)
@@ -124,5 +118,7 @@ h2. Credits
 * "Kamil K. Lemański":http://kml.jogger.pl
 * "Brian Cobb":http://bcobb.net/
 * "Kir Shatrov":http://shatrov.tk/
+* "sugilog":http://github.com/sugilog
+* "Trond Arve Nordheim":http://github.com/tanordheim
 
-*Copyright (c) 2011 Zach Inglis, released under the MIT license*
+*Copyright (c) 2008-2011 Zach Inglis, released under the MIT license*

data/VERSION

@@ -1 +1 @@
-1.2
+1.3

data/lib/crummy/action_controller.rb

@@ -4,6 +4,7 @@ module Crummy
       # Add a crumb to the crumbs array.
       #
       #   add_crumb("Home", "/")
+      #   add_crumb(lambda { |instance| instance.business_name }, "/")
       #   add_crumb("Business") { |instance| instance.business_path }
       #
       # Works like a before_filter so +:only+ and +except+ both work.
@@ -15,18 +16,36 @@ module Crummy
         before_filter(options) do |instance|
           url = yield instance if block_given?
           url = instance.send url if url.is_a? Symbol
+          
+          if url.present?
+            if url.kind_of? Enumerable
+              url.map! do |name|
+                name.is_a?(Symbol) ? instance.instance_variable_get("@#{name}") : name
+              end
+            end
+            url = instance.send :url_for, url unless url.is_a? String
+          end
+
+          # Get the return value of the name if its a proc.
+          transformed_name = name.is_a?(Proc) ? name.call(instance) : name
 
-          _record = instance.instance_variable_get("@#{name}") unless url or block_given?
+          _record = instance.instance_variable_get("@#{transformed_name}")
           if _record and _record.respond_to? :to_param
-            instance.add_crumb(_record.to_s, instance.url_for(_record))
+            instance.add_crumb(_record.to_s, url || instance.url_for(_record))
           else 
-            instance.add_crumb(name, url)
+            instance.add_crumb(transformed_name, url)
           end
         
           # FIXME: url = instance.url_for(name) if name.respond_to?("to_param") && url.nil?
           # FIXME: Add ||= for the name, url above
         end
       end
+
+      def clear_crumbs
+        before_filter do |instance|
+          instance.clear_crumbs
+        end
+      end
     end
 
     module InstanceMethods
@@ -39,6 +58,10 @@ module Crummy
         crumbs.push [name, url]
       end
 
+      def clear_crumbs
+        crumbs.clear
+      end
+
       # Lists the crumbs as an array
       def crumbs
         get_or_set_ivar "@_crumbs", []

data/lib/crummy/standard_renderer.rb

@@ -39,7 +39,6 @@ module Crummy
         crumb_string = crumbs.collect do |crumb|
           crumb_to_html crumb, options[:links]
         end * options[:separator]
-        crumb_string = crumb_string.html_safe if crumb_string.respond_to?(:html_safe)
         crumb_string
       when :html_list
         # In html_list format there are no separator, but may be
@@ -53,7 +52,6 @@ module Crummy
           crumb_to_html_list crumb, options[:links], options[:li_class], options[:active_li_class]
         end * options[:separator]
         crumb_string = "<ul class=\"#{options[:ul_class]}\" id=\"#{options[:ul_id]}\">" + crumb_string + "</ul>"
-        crumb_string = crumb_string.html_safe if crumb_string.respond_to?(:html_safe)
         crumb_string
       when :xml
         crumbs.collect do |crumb|

metadata

@@ -1,32 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: crummy
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: '1.3'
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  version: "1.2"
 platform: ruby
-authors: 
+authors:
 - Zach Inglis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-20 00:00:00 +01:00
-default_executable: 
+date: 2011-04-20 00:00:00.000000000 Z
 dependencies: []
-
 description: Crummy is a simple and tasty way to add breadcrumbs to your Rails applications.
 email: zach+crummy@londonmade.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - .gitignore
 - MIT-LICENSE
 - README.textile
@@ -39,39 +30,28 @@ files:
 - lib/crummy/railtie.rb
 - lib/crummy/standard_renderer.rb
 - tasks/crummy_tasks.rake
-has_rdoc: true
 homepage: http://github.com/zachinglis/crummy
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Tasty breadcrumbs!
 test_files: []
-