gretel 1.0.5 → 1.0.6

data/lib/gretel/crumbs.rb

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

data/lib/gretel/helper_methods.rb

@@ -10,14 +10,14 @@ module Gretel
     
     def breadcrumb(*args)
       options = args.extract_options!
-      name, params = args[0], args[1..-1]
+      name, object = args[0], args[1]
       
       if name
         @_breadcrumb_name = name
-        @_breadcrumb_params = params
+        @_breadcrumb_object = object
       else
         if @_breadcrumb_name
-          crumb = breadcrumb_for(@_breadcrumb_name, *@_breadcrumb_params, options)
+          crumb = breadcrumb_for(@_breadcrumb_name, @_breadcrumb_object, options)
         elsif options[:show_root_alone]
           crumb = breadcrumb_for(:root, options)
         end
@@ -36,14 +36,14 @@ module Gretel
       options[:link_last] = true
       separator = (options[:separator] || ">").html_safe
 
-      name, params = args[0], args[1..-1]
+      name, object = args[0], args[1]
       
-      crumb = Crumbs.get_crumb(name, *params)
+      crumb = Crumbs.get_crumb(name, object)
       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.params)
+        crumb = Crumbs.get_crumb(parent.name, parent.object)
         out = link_to(crumb.link.text, crumb.link.url, crumb.link.options) + " " + separator + " " + out
       end
       

data/lib/gretel/parent.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Lasse Bunk