gretel 1.0.4 → 1.0.5

data/lib/gretel/crumbs.rb

@@ -20,29 +20,32 @@ module Gretel
         all[name] = block
       end
       
-      def get_crumb(name, object = nil)
+      def get_crumb(name, *params)
         raise "Crumb '#{name}' not found." unless all[name]
         
-        @object = object # share the object so we can call it from link() and parent()
+        @params = params # share the params so we can call it from link() and parent()
         @link = nil
         @parent = nil
         
-        all[name].call(object)
+        all[name].call(*params)
         Gretel::Crumb.new(@link, @parent)
       end
       
-      def link(text, url)
-        text = text.call(@object) if text.is_a?(Proc)
-        url = url.call(@object) if url.is_a?(Proc)
+      def link(text, url, options = {})
+        text = text.call(*@params) if text.is_a?(Proc)
+        url = url.call(*@params) if url.is_a?(Proc)
         
-        @link = Gretel::Link.new(text, url)
+        @link = Gretel::Link.new(text, url, options)
       end
       
-      def parent(name, object = nil)
-        name = name.call(@object) if name.is_a?(Proc)
-        object = object.call(@object) if object.is_a?(Proc)
+      def parent(name, *params)
+        name = name.call(*@params) if name.is_a?(Proc)
 
-        @parent = Gretel::Parent.new(name, object)
+        params.each_with_index do |param, i|
+          params[i] = param.call(&@params) if param.is_a?(Proc)
+        end
+
+        @parent = Gretel::Parent.new(name, *params)
       end
     end
   end

data/lib/gretel/helper_methods.rb

@@ -10,14 +10,14 @@ module Gretel
     
     def breadcrumb(*args)
       options = args.extract_options!
-      name, object = args[0], args[1]
+      name, params = args[0], args[1..-1]
       
       if name
         @_breadcrumb_name = name
-        @_breadcrumb_object = object
+        @_breadcrumb_params = params
       else
         if @_breadcrumb_name
-          crumb = breadcrumb_for(@_breadcrumb_name, @_breadcrumb_object, options)
+          crumb = breadcrumb_for(@_breadcrumb_name, *@_breadcrumb_params, options)
         elsif options[:show_root_alone]
           crumb = breadcrumb_for(:root, options)
         end
@@ -36,21 +36,21 @@ module Gretel
       options[:link_last] = true
       separator = (options[:separator] || ">").html_safe
 
-      name, object = args[0], args[1]
+      name, params = args[0], args[1..-1]
       
-      crumb = Crumbs.get_crumb(name, object)
-      out = link_to_if(link_last, crumb.link.text, crumb.link.url)
+      crumb = Crumbs.get_crumb(name, *params)
+      out = link_to_if(link_last, crumb.link.text, crumb.link.url, crumb.link.options)
       
       while parent = crumb.parent
         last_parent = parent.name
-        crumb = Crumbs.get_crumb(parent.name, parent.object)
-        out = link_to(crumb.link.text, crumb.link.url) + " " + separator + " " + out
+        crumb = Crumbs.get_crumb(parent.name, *parent.params)
+        out = link_to(crumb.link.text, crumb.link.url, crumb.link.options) + " " + separator + " " + out
       end
       
       # TODO: Refactor this
       if options[:autoroot] && name != :root && last_parent != :root
         crumb = Crumbs.get_crumb(:root)
-        out = link_to(crumb.link.text, crumb.link.url) + " " + separator + " " + out
+        out = link_to(crumb.link.text, crumb.link.url, crumb.link.options) + " " + separator + " " + out
       end
       
       out

data/lib/gretel/link.rb

@@ -1,9 +1,9 @@
 module Gretel
   class Link
-    attr_accessor :text, :url
+    attr_accessor :options, :text, :url
     
-    def initialize(text, url)
-      @text, @url = text, url
+    def initialize(text, url, options = {})
+      @text, @url, @options = text, url, options
     end
   end
 end

data/lib/gretel/parent.rb

@@ -1,9 +1,9 @@
 module Gretel
   class Parent
-    attr_accessor :name, :object
+    attr_accessor :name, :params
     
-    def initialize(name, object)
-      @name, @object = name, object
+    def initialize(name, *params)
+      @name, @params = name, params
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gretel
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Lasse Bunk
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 Z
+date: 2012-01-06 00:00:00 +01:00
+default_executable: 
 dependencies: []
 
 description: Gretel is a Ruby on Rails plugin that makes it easy yet flexible to create breadcrumbs.
@@ -34,7 +34,7 @@ files:
 - lib/gretel/helper_methods.rb
 - lib/gretel/link.rb
 - lib/gretel/parent.rb
-- lib/gretel.rb
+has_rdoc: true
 homepage: http://github.com/lassebunk/gretel
 licenses: []
 
@@ -44,27 +44,23 @@ rdoc_options: []
 require_paths: 
 - lib
 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 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Flexible Ruby on Rails breadcrumbs plugin.

data/lib/gretel.rb

@@ -1,7 +0,0 @@
-require 'gretel/crumb'
-require 'gretel/crumbs'
-require 'gretel/helper_methods'
-require 'gretel/link'
-require 'gretel/parent'
-
-ActionController::Base.send :include, Gretel::HelperMethods