gretel 1.1.5 → 1.1.6

data/lib/gretel/crumbs.rb

@@ -31,7 +31,11 @@ module Gretel
         Gretel::Crumb.new(@links, @parent)
       end
       
-      def link(text, url, options = {})
+      def link(*args)
+        options = args.extract_options!
+        text = args[0]
+        url = args[1]
+        
         text = text.call(@object) if text.is_a?(Proc)
         url = url.call(@object) if url.is_a?(Proc)
         

data/lib/gretel/helper_methods.rb

@@ -5,7 +5,7 @@ module Gretel
     end
     
     def self.included(base)
-      base.send :helper_method, :breadcrumb_for, :breadcrumb
+      base.send :helper_method, :breadcrumbs, :breadcrumb
     end
     
     def breadcrumb(*args)
@@ -23,69 +23,104 @@ module Gretel
         end
       end
       
-      if crumb && options[:pretext]
-        crumb = options[:pretext].html_safe + " " + crumb
+      if crumb
+        if options[:pretext]
+          crumb = options[:pretext].html_safe + crumb
+        end
+        if options[:posttext]
+          crumb = crumb + options[:posttext].html_safe
+        end
       end
       
       crumb
     end
     
-    def breadcrumb_for(*args)
+    def breadcrumbs(*args)
       options = args.extract_options!
-      link_last = options[:link_last]
-
-      name, object = args[0], args[1]
       
-      links = []
-      
-      crumb = Crumbs.get_crumb(name, object)
-      while link = crumb.links.pop
-        links.unshift link
-      end
-      
-      while crumb = crumb.parent
-        last_parent = crumb.name
-        crumb = Crumbs.get_crumb(crumb.name, crumb.object)
+      if @_breadcrumb_name
+        links = []
+
+        crumb = Crumbs.get_crumb(@_breadcrumb_name, @_breadcrumb_object)
         while link = crumb.links.pop
-          links.unshift link
+          links.unshift ViewLink.new(link.text, link.url, link.options)
         end
-      end
-      
-      if options[:autoroot] && name != :root && last_parent != :root
-        crumb = Crumbs.get_crumb(:root)
-        while link = crumb.links.pop
-          links.unshift link
+
+        while crumb = crumb.parent
+          last_parent = crumb.name
+          crumb = Crumbs.get_crumb(crumb.name, crumb.object)
+          while link = crumb.links.pop
+            links.unshift ViewLink.new(link.text, link.url, link.options)
+          end
+        end
+
+        if options[:autoroot] && @_breadcrumb_name != :root && last_parent != :root
+          crumb = Crumbs.get_crumb(:root)
+          while link = crumb.links.pop
+            links.unshift ViewLink.new(link.text, link.url, link.options)
+          end
+        end
+
+        current_link = links.pop
+
+        out = []
+        while link = links.shift
+          out << ViewLink.new(link.text, link.url, link.options)
         end
+
+        if current_link
+          out << ViewLink.new(current_link.text, current_link.url, current_link.options, true)
+        end
+      else
+        out = []
       end
+
+      out
+    end
+    
+    def breadcrumb_for(*args)
+      options = args.extract_options!
+      name, object = args[0], args[1]
+      
+      links = breadcrumbs(name, object, options)
       
-      last_link = links.pop
+      current_link = links.pop
       
       out = []
       while link = 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")
+        out << get_crumb(link.text, link.url, options[:semantic], nil, link.options)
+      end
+      
+      if current_link
+        if options[:link_last] || options[:link_current]
+          out << get_crumb(current_link.text, current_link.url, options[:semantic], "current", current_link.options)
         else
-          out << link_to(link.text, link.url)
+          out << get_crumb(current_link.text, nil, options[:semantic], "current")
         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
+      out.join(options[:separator] || " &gt; ").html_safe
+    end
+    
+    def get_crumb(text, url, semantic, css_class, options = {})
+      if url.blank?
+        if semantic
+          content_tag(:div, content_tag(:span, text, :class => css_class, :itemprop => "title"), :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb")
         else
-          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")
+          if css_class
+            content_tag(:span, text, :class => css_class)
           else
-            out << content_tag(:span, last_link.text, :class => "current")
+            text
           end
         end
+      else
+        options.merge! :class => (options[:class] ? options[:class] + " " : "") + css_class if css_class
+        if semantic
+          content_tag(:div, link_to(content_tag(:span, text, :itemprop => "title"), url, options.merge(:itemprop => "url")), :itemscope => "", :itemtype => "http://data-vocabulary.org/Breadcrumb")
+        else
+          link_to(text, url, options)
+        end
       end
-      
-      out.join(" " + (options[:separator] || "&gt;") + " ").html_safe
     end
   end
 end

data/lib/gretel/view_link.rb

@@ -0,0 +1,13 @@
+module Gretel
+  class ViewLink
+    attr_reader :text, :url, :options, :current
+    
+    def initialize(text, url, options, current = false)
+      @text, @url, @options, @current = text, url, options, current
+    end
+    
+    def current?
+      current
+    end
+  end
+end

data/lib/gretel.rb

@@ -1,6 +1,7 @@
 require 'gretel/crumb'
 require 'gretel/crumbs'
 require 'gretel/helper_methods'
+require 'gretel/view_link'
 require 'gretel/link'
 require 'gretel/parent'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gretel
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Lasse Bunk
@@ -34,6 +34,7 @@ files:
 - lib/gretel/helper_methods.rb
 - lib/gretel/link.rb
 - lib/gretel/parent.rb
+- lib/gretel/view_link.rb
 - lib/gretel.rb
 homepage: http://github.com/lassebunk/gretel
 licenses: []