gretel 1.1.1 → 1.1.2

data/lib/gretel/crumb.rb

@@ -1,9 +1,9 @@
 module Gretel
   class Crumb
-    attr_accessor :link, :parent
+    attr_accessor :links, :parent
     
-    def initialize(link, parent)
-      @link, @parent = link, parent
+    def initialize(links, parent)
+      @links, @parent = links, parent
     end
   end
 end

data/lib/gretel/crumbs.rb

@@ -21,21 +21,21 @@ module Gretel
       end
       
       def get_crumb(name, object = nil)
-        raise "Crumb '#{name}' not found." unless all[name]
-        
         @object = object # share the object so we can call it from link() and parent()
-        @link = nil
         @parent = nil
         
         all[name].call(object)
-        Gretel::Crumb.new(@link, @parent)
+        Gretel::Crumb.new(@links, @parent)
       end
       
       def link(text, url, options = {})
         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)
+        @links ||= []
+        @links << Gretel::Link.new(text, url, options)
+        
+        @links
       end
       
       def parent(name, object = nil)

data/lib/gretel/helper_methods.rb

@@ -33,43 +33,59 @@ module Gretel
     def breadcrumb_for(*args)
       options = args.extract_options!
       link_last = options[:link_last]
-      options[:link_last] = true
-      separator = (options[:separator] || ">").html_safe
 
       name, object = args[0], args[1]
       
+      links = []
+      
       crumb = Crumbs.get_crumb(name, object)
-      if link_last
-        out = link_to_if(link_last, crumb.link.text, crumb.link.url, crumb.link.options.merge(:class => "current"))
-      else
-        if options[:use_microformats]
-          out = content_tag(:span, crumb.link.text, :class => "current", :itemprop => "title")
-        else
-          out = content_tag(:span, crumb.link.text, :class => "current")
-        end
+      while link = crumb.links.shift
+        links.unshift link
       end
       
-      while parent = crumb.parent
-        last_parent = parent.name
-        crumb = Crumbs.get_crumb(parent.name, parent.object)
-        if options[:use_microformats]
-          out = content_tag(:div, link_to(content_tag(:span, crumb.link.text, :itemprop => "title"), crumb.link.url, crumb.link.options.merge(:itemprop => "url")) + " ", :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb") + " " + separator + " " + out
-        else
-          out = link_to(crumb.link.text, crumb.link.url, crumb.link.options) + " " + separator + " " + out
+      while crumb = crumb.parent
+        last_parent = crumb.name
+        crumb = Crumbs.get_crumb(crumb.name, crumb.object)
+        while link = crumb.links.shift
+          links.unshift link
         end
       end
       
-      # TODO: Refactor this
       if options[:autoroot] && name != :root && last_parent != :root
         crumb = Crumbs.get_crumb(:root)
+        while link = crumb.links.shift
+          links.unshift link
+        end
+      end
+      
+      last_link = links.pop
+      
+      out = []
+      while link = links.shift
         if options[:use_microformats]
-          out = content_tag(:div, link_to(content_tag(:span, crumb.link.text, :itemprop => "title"), crumb.link.url, crumb.link.options.merge(:itemprop => "url")) + " ", :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb") + " " + separator + " " + out
+          out << content_tag(:div, link_to(content_tag(:span, link.text, :itemprop => "title"), link.url, link.options.merge(:itemprop => "url")), :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb")
+        else
+          out << link_to(link.text, link.url)
+        end
+      end
+      
+      if last_link
+        if options[:link_last]
+          if options[:use_microformats]
+            out << content_tag(:div, link_to(content_tag(:span, last_link.text, :class => "current", :itemprop => "title"), last_link.url, last_link.options.merge(:itemprop => "url")), :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb")
+          else
+            out << link_to(last_link.text, last_link.url, :class => "current")
+          end
         else
-          out = link_to(crumb.link.text, crumb.link.url, crumb.link.options) + " " + separator + " " + out
+          if options[:use_microformats]
+            out << content_tag(:div, content_tag(:span, last_link.text, :class => "current", :itemprop => "title"), :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb")
+          else
+            out << content_tag(:span, last_link.text, :class => "current", :itemprop => "title")
+          end
         end
       end
       
-      out
+      out.join(" " + (options[:separator] || "&gt;") + " ").html_safe
     end
   end
 end

data/lib/gretel/helper_methods_old.rb

@@ -0,0 +1,90 @@
+module Gretel
+  module HelperMethods
+    include ActionView::Helpers::UrlHelper
+    def controller # hack because ActionView::Helpers::UrlHelper needs a controller method
+    end
+    
+    def self.included(base)
+      base.send :helper_method, :breadcrumb_for, :breadcrumb
+    end
+    
+    def breadcrumb(*args)
+      options = args.extract_options!
+      name, object = args[0], args[1]
+      
+      if name
+        @_breadcrumb_name = name
+        @_breadcrumb_object = object
+      else
+        if @_breadcrumb_name
+          crumb = breadcrumb_for(@_breadcrumb_name, @_breadcrumb_object, options)
+        elsif options[:show_root_alone]
+          crumb = breadcrumb_for(:root, options)
+        end
+      end
+      
+      if crumb && options[:pretext]
+        crumb = options[:pretext].html_safe + " " + crumb
+      end
+      
+      crumb
+    end
+    
+    def breadcrumb_for(*args)
+      options = args.extract_options!
+      link_last = options[:link_last]
+
+      name, object = args[0], args[1]
+      
+      crumbs = []
+      
+      crumb = Crumbs.get_crumb(name, object)
+      if crumb.links
+        last_link = crumb.links.pop
+        #if link_last
+        #  out = out + " " + separator + " " + link_to_if(link_last, last_link.text, last_crumb.link.url, last_crumb.options.merge(:class => "current"))
+        #else
+        #  if options[:use_microformats]
+        #    out = out + " " + separator + " " + content_tag(:span, last_link.text, :class => "current", :itemprop => "title")
+        #  else
+            crumbs << content_tag(:span, last_link.text, :class => "current")
+        #  end
+        #end
+      end
+      
+      last_parent = nil
+      while parent = crumb.parent
+        last_parent = parent.name
+        crumb = Crumbs.get_crumb(parent.name, parent.object)
+        
+        if crumb.links
+            while link = crumb.links.shift
+              if link
+              #if options[:use_microformats]
+              #  parents = out + " " + separator + " " + content_tag(:div, link_to(content_tag(:span, link.text, :itemprop => "title"), link.url, link.options.merge(:itemprop => "url")) + " ", :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb")
+              #else
+                crumbs.shift link_to(link.text, link.url, link.options)
+              #end
+              end
+            end
+        end
+      end
+      
+      # TODO: Refactor this
+      if options[:autoroot] && name != :root && last_parent != :root
+        crumb = Crumbs.get_crumb(:root)
+        if crumb.links
+          while link = crumb.links.shift
+            #if options[:use_microformats]
+            #  out = content_tag(:div, link_to(content_tag(:span, link.text, :itemprop => "title"), link.url, link.options.merge(:itemprop => "url")) + " ", :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb") + " " + separator + " " + out
+            #else
+              crumbs.unshift link_to(link.text, link.url, link.options)
+            #end
+          end
+        end
+      end
+      
+      crumbs.join(" " + (options[:separator] || "&gt;") + " ").html_safe
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gretel
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Lasse Bunk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-21 00:00:00 Z
+date: 2012-05-26 00:00:00 Z
 dependencies: []
 
 description: Gretel is a Ruby on Rails plugin that makes it easy yet flexible to create breadcrumbs.
@@ -32,6 +32,7 @@ files:
 - lib/gretel/crumb.rb
 - lib/gretel/crumbs.rb
 - lib/gretel/helper_methods.rb
+- lib/gretel/helper_methods_old.rb
 - lib/gretel/link.rb
 - lib/gretel/parent.rb
 - lib/gretel.rb