gretel 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c82f3dde4a98f82f3eb6f0ce135a64a2ca7e8dc
-  data.tar.gz: 44d2c6ec3b8405991c4f0c2b9fc837d8a2711b70
+  metadata.gz: 31c77ef551e13b999644f0b27d782987629ae7ab
+  data.tar.gz: 8bdf306a5ba44daaf9bcfb6b7b5f4830cbc8dd5d
 SHA512:
-  metadata.gz: 01e17764cb6cdfc58a8010a114722d9941671b4933cb92ca6b221c20d29fc787652f7bd504454a753626faee3cfbb1e7c813558f172468766740c22c4cf1264a
-  data.tar.gz: 6cd0c52eb47346f631916d66d9203857567b33c294adff6be93411eed6b3f72d1092349be8364d3915868bbf79890c523b439ebaead4317c957166f1c5892c97
+  metadata.gz: dfd56e69ce95e4fde666b9320fa5531275261804f2d74e623c3d98ca41996805aecc47907d27b64856243d79c7f123e2564c7542321a505fa6f8d47c1f49a804
+  data.tar.gz: ba35e16f9908e7259c01bdd9f174dfaf2e4aac45e99e2f61fbbe8b034f5e66dd52de75408733593775633ad4e257455465bc2e90c247f3c104d614fe4804225c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 3.0.6
+* Pretext and posttext are now enclosed in spans with `<span class="pretext">` and `<span class="posttext">`.
+* Semantic breadcrumbs are now rendered in spans instead of divs to enable easier styling.
+
 ## Version 3.0.3
 * Breadcrumbs can now be rendered for use in the [Foundation 5](http://foundation.zurb.com/) framework. Use `breadcrumbs style: :foundation5`.
 * Breadcrumbs are now automatically loaded from any engines' `config/breadcrumbs.rb` and `config/breadcrumbs/**/*.rb`. See the readme for details.

data/README.md

@@ -97,7 +97,7 @@ You can pass options to `<%= breadcrumbs %>`, e.g. `<%= breadcrumbs pretext: "Yo
 
 Option                   | Description                                                                                                                | Default
 ------------------------ | -------------------------------------------------------------------------------------------------------------------------- | -------
-:style                   | How to render the breadcrumbs. Can be `:default`, `:ol`, `:ul`, or `:bootstrap`. See below for more info.                  | `:default`
+:style                   | How to render the breadcrumbs. Can be `:inline`, `:ol`, `:ul`, or `:bootstrap`. See below for more info.                   | `:inline`
 :pretext                 | Text to be rendered before breadcrumb, e.g. `"You are here: "`.                                                            | None
 :posttext                | Text to be appended after breadcrumb, e.g. `"Text after breacrumb"`,                                                       | None
 :separator               | Separator between links, e.g. `" &rsaquo; "`.                                                                              | `" &rsaquo; "`
@@ -117,7 +117,7 @@ These are the styles you can use with `breadcrumbs style: :xx`.
 
 Style          | Description
 -------------- | -----------
-`:default`     | Renders each link by itself with `&rsaquo;` as the seperator.
+`:inline`      | Renders each link by itself with `&rsaquo;` as the seperator.
 `:ol`          | Renders the links in `<li>` elements contained in an outer `<ol>`.
 `:ul`          | Renders the links in `<li>` elements contained in an outer `<ul>`.
 `:bootstrap`   | Renders the links for use in [Twitter Bootstrap](http://getbootstrap.com/).

data/gretel.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "rails", ">= 3.2.0"
-  gem.add_development_dependency "rails", "~> 3.2.13"
   gem.add_development_dependency "sqlite3"
 end

data/lib/gretel/crumb.rb

@@ -51,7 +51,7 @@ module Gretel
     # The current view context.
     attr_reader :context
 
-    # Proxy to view context
+    # Proxy to view context.
     def method_missing(method, *args, &block)
       context.send(method, *args, &block)
     end

data/lib/gretel/deprecated.rb

@@ -1,2 +1 @@
-require "gretel/deprecated/layout"
-require "gretel/deprecated/show_root_alone"
+Dir[File.dirname(__FILE__) + "/deprecated/*.rb"].each { |file| require file }

data/lib/gretel/deprecated/default_style_key.rb

@@ -0,0 +1,11 @@
+Gretel::Renderer.class_eval do
+  def options_for_style_with_default_style_key(style_key)
+    if style_key == :default
+      Gretel.show_deprecation_warning "The :default style key is now called :inline. Please use `breadcrumbs style: :inline` instead or omit it, as it is the default."
+      style_key = :inline
+    end
+    options_for_style_without_default_style_key(style_key)
+  end
+
+  alias_method_chain :options_for_style, :default_style_key
+end

data/lib/gretel/deprecated/yield_links.rb

@@ -0,0 +1,20 @@
+Gretel::ViewHelpers.class_eval do
+  def breadcrumbs_with_yield_links(options = {})
+    if block_given?
+      Gretel.show_deprecation_warning(
+        "Calling `breadcrumbs` with a block has been deprecated and will be removed in Gretel version 4.0. Please use `tap` instead. Example:\n" +
+        "\n" +
+        "  breadcrumbs(autoroot: false).tap do |links|\n" +
+        "    if links.any?\n" +
+        "      # process links here\n" +
+        "    end\n" +
+        "  end\n"
+      )
+      yield gretel_renderer.render(options)
+    else
+      breadcrumbs_without_yield_links(options)
+    end
+  end
+
+  alias_method_chain :breadcrumbs, :yield_links
+end

data/lib/gretel/renderer.rb

@@ -1,7 +1,7 @@
 module Gretel
   class Renderer
     DEFAULT_OPTIONS = {
-      style: :default,
+      style: :inline,
       pretext: "",
       posttext: "",
       separator: "",
@@ -15,7 +15,7 @@ module Gretel
     }
 
     DEFAULT_STYLES = {
-      default: { container_tag: :div, separator: " › " },
+      inline: { container_tag: :div, separator: " › " },
       ol: { container_tag: :ol, fragment_tag: :li },
       ul: { container_tag: :ul, fragment_tag: :li },
       bootstrap: { container_tag: :ol, fragment_tag: :li, class: "breadcrumb", current_class: "active" },
@@ -33,32 +33,17 @@ module Gretel
       options = options_for_render(options)
       links = links_for_render(options)
 
-      return "" if links.empty?
-
-      # Loop through all but the last (current) link and build HTML of the fragments
-      fragments = links[0..-2].map do |link|
-        render_fragment(options[:fragment_tag], link.text, link.url, options[:semantic])
-      end
-
-      # The current link is handled a little differently, and is only linked if specified in the options
-      current_link = links.last
-      fragments << render_fragment(options[:fragment_tag], current_link.text, (options[:link_current] ? current_link.url : nil), options[:semantic], class: options[:current_class])
-
-      # Build the final HTML
-      html = (options[:pretext] + fragments.join(options[:separator]) + options[:posttext]).html_safe
-      content_tag(options[:container_tag], html, id: options[:id], class: options[:class])
+      LinkCollection.new(context, links, options)
     end
 
     # Yields links with applied options.
     def yield_links(options = {})
-      options = options_for_render(options)
-      yield links_for_render(options)
+      yield render(options)
     end
 
     # Returns the parent breadcrumb.
     def parent_breadcrumb(options = {})
-      options = options_for_render(options)
-      links_for_render(options)[-2]
+      render(options)[-2]
     end
 
     # Yields the parent breadcrumb if any.
@@ -68,11 +53,6 @@ module Gretel
       end
     end
 
-    # Proxy for +context.link_to+ that can be overridden by plugins.
-    def breadcrumb_link_to(name, url, options = {})
-      context.link_to(name, url, options)
-    end
-
     private
 
     attr_reader :context, :breadcrumb_key, :breadcrumb_args
@@ -148,43 +128,7 @@ module Gretel
       links
     end
 
-    # Renders HTML for a breadcrumb fragment, i.e. a breadcrumb link.
-    def render_fragment(fragment_tag, text, url, semantic, options = {})
-      if semantic
-        render_semantic_fragment(fragment_tag, text, url, options)
-      else
-        render_nonsemantic_fragment(fragment_tag, text, url, options)
-      end
-    end
-
-    # Renders semantic fragment HTML.
-    def render_semantic_fragment(fragment_tag, text, url, options = {})
-      if fragment_tag
-        text = content_tag(:span, text, itemprop: "title")
-        text = breadcrumb_link_to(text, url, itemprop: "url") if url.present?
-        content_tag(fragment_tag, text, class: options[:class], itemscope: "", itemtype: "http://data-vocabulary.org/Breadcrumb")
-      elsif url.present?
-        content_tag(:div, breadcrumb_link_to(content_tag(:span, text, itemprop: "title"), url, class: options[:class], itemprop: "url"), itemscope: "", itemtype: "http://data-vocabulary.org/Breadcrumb")
-      else
-        content_tag(:div, content_tag(:span, text, class: options[:class], itemprop: "title"), itemscope: "", itemtype: "http://data-vocabulary.org/Breadcrumb")
-      end
-    end
-
-    # Renders regular, non-semantic fragment HTML.
-    def render_nonsemantic_fragment(fragment_tag, text, url, options = {})
-      if fragment_tag
-        text = breadcrumb_link_to(text, url) if url.present?
-        content_tag(fragment_tag, text, class: options[:class])
-      elsif url.present?
-        breadcrumb_link_to(text, url, class: options[:class])
-      elsif options[:class].present?
-        content_tag(:span, text, class: options[:class])
-      else
-        text
-      end
-    end
-
-    # Proxy to view context
+    # Proxy to view context.
     def method_missing(method, *args, &block)
       context.send(method, *args, &block)
     end
@@ -204,5 +148,97 @@ module Gretel
         @styles ||= DEFAULT_STYLES
       end
     end
+
+    class LinkCollection < Array
+      attr_reader :context, :links, :options
+
+      def initialize(context, links, options = {})
+        @context, @links, @options = context, links, options
+        concat links
+      end
+
+      # Helper for returning all link keys to allow for simple testing.
+      def keys
+        map(&:key)
+      end
+
+      # Renders the links into breadcrumbs.
+      def render
+        return "" if links.empty?
+
+        # Loop through all but the last (current) link and build HTML of the fragments
+        fragments = links[0..-2].map do |link|
+          render_fragment(options[:fragment_tag], link.text, link.url, options[:semantic])
+        end
+
+        # The current link is handled a little differently, and is only linked if specified in the options
+        current_link = links.last
+        fragments << render_fragment(options[:fragment_tag], current_link.text, (options[:link_current] ? current_link.url : nil), options[:semantic], class: options[:current_class])
+
+        # Build the final HTML
+        html_fragments = []
+
+        if options[:pretext].present?
+          html_fragments << content_tag(:span, options[:pretext], class: "pretext")
+        end
+
+        html_fragments << fragments.join(options[:separator])
+
+        if options[:posttext].present?
+          html_fragments << content_tag(:span, options[:posttext], class: "posttext")
+        end
+
+        html = html_fragments.join(" ").html_safe
+        content_tag(options[:container_tag], html, id: options[:id], class: options[:class])
+      end
+
+      alias :to_s :render
+
+      # Renders HTML for a breadcrumb fragment, i.e. a breadcrumb link.
+      def render_fragment(fragment_tag, text, url, semantic, options = {})
+        if semantic
+          render_semantic_fragment(fragment_tag, text, url, options)
+        else
+          render_nonsemantic_fragment(fragment_tag, text, url, options)
+        end
+      end
+
+      # Renders semantic fragment HTML.
+      def render_semantic_fragment(fragment_tag, text, url, options = {})
+        if fragment_tag
+          text = content_tag(:span, text, itemprop: "title")
+          text = breadcrumb_link_to(text, url, itemprop: "url") if url.present?
+          content_tag(fragment_tag, text, class: options[:class], itemscope: "", itemtype: "http://data-vocabulary.org/Breadcrumb")
+        elsif url.present?
+          content_tag(:span, breadcrumb_link_to(content_tag(:span, text, itemprop: "title"), url, class: options[:class], itemprop: "url"), itemscope: "", itemtype: "http://data-vocabulary.org/Breadcrumb")
+        else
+          content_tag(:span, content_tag(:span, text, class: options[:class], itemprop: "title"), itemscope: "", itemtype: "http://data-vocabulary.org/Breadcrumb")
+        end
+      end
+
+      # Renders regular, non-semantic fragment HTML.
+      def render_nonsemantic_fragment(fragment_tag, text, url, options = {})
+        if fragment_tag
+          text = breadcrumb_link_to(text, url) if url.present?
+          content_tag(fragment_tag, text, class: options[:class])
+        elsif url.present?
+          breadcrumb_link_to(text, url, class: options[:class])
+        elsif options[:class].present?
+          content_tag(:span, text, class: options[:class])
+        else
+          text
+        end
+      end
+
+      # Proxy for +context.link_to+ that can be overridden by plugins.
+      def breadcrumb_link_to(name, url, options = {})
+        context.link_to(name, url, options)
+      end
+
+      # Proxy to view context.
+      def method_missing(method, *args, &block)
+        context.send(method, *args, &block)
+      end
+    end
   end
 end

data/lib/gretel/version.rb

@@ -1,3 +1,3 @@
 module Gretel
-  VERSION = "3.0.5"
+  VERSION = "3.0.6"
 end

data/lib/gretel/view_helpers.rb

@@ -48,12 +48,8 @@ module Gretel
     #       <% end %>
     #     <% end %>
     #   <% end %>
-    def breadcrumbs(options = {}, &block)
-      if block_given?
-        gretel_renderer.yield_links(options, &block)
-      else
-        gretel_renderer.render(options)
-      end
+    def breadcrumbs(options = {})
+      gretel_renderer.render(options)
     end
 
     # Returns or yields parent breadcrumb (second-to-last in the trail) if it is present.

data/test/deprecated_test.rb

@@ -13,7 +13,7 @@ class DeprecatedTest < ActionView::TestCase
   test "show root alone" do
     breadcrumb :root
     assert_equal %{<div class="breadcrumbs"><span class="current">Home</span></div>},
-                 breadcrumbs(show_root_alone: true)
+                 breadcrumbs(show_root_alone: true).to_s
   end
 
   test "deprecated configuration block" do
@@ -22,4 +22,24 @@ class DeprecatedTest < ActionView::TestCase
       end
     end
   end
+
+  test ":default style key" do
+    breadcrumb :basic
+
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
+                 breadcrumbs(style: :default).to_s
+  end
+
+  test "yield links" do
+    breadcrumb :multiple_links_with_parent
+
+    out = breadcrumbs do |links|
+      links.map { |link| [link.key, link.text, link.url] }
+    end
+
+    assert_equal [[:root, "Home", "/"],
+                  [:basic, "About", "/about"],
+                  [:multiple_links_with_parent, "Contact", "/about/contact"],
+                  [:multiple_links_with_parent, "Contact form", "/about/contact/form"]], out
+  end
 end

data/test/helper_methods_test.rb

@@ -14,142 +14,129 @@ class HelperMethodsTest < ActionView::TestCase
   test "shows basic breadcrumb" do
     breadcrumb :basic
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "shows breadcrumb with root" do
     breadcrumb :with_root
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "shows breadcrumb with parent" do
     breadcrumb :with_parent
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about">About</a> &rsaquo; <span class="current">Contact</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "shows breadcrumb with autopath" do
     breadcrumb :with_autopath, projects(:one)
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">Test Project</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "shows breadcrumb with parent object" do
     breadcrumb :with_parent_object, issues(:one)
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/projects/1">Test Project</a> &rsaquo; <span class="current">Test Issue</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "shows multiple links" do
     breadcrumb :multiple_links
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about/contact">Contact</a> &rsaquo; <span class="current">Contact form</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "shows multiple links with parent" do
     breadcrumb :multiple_links_with_parent
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about">About</a> &rsaquo; <a href="/about/contact">Contact</a> &rsaquo; <span class="current">Contact form</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "shows semantic breadcrumb" do
     breadcrumb :with_root
-    assert_equal %{<div class="breadcrumbs"><div itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/" itemprop="url"><span itemprop="title">Home</span></a></div> &rsaquo; <div itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><span class="current" itemprop="title">About</span></div></div>},
-                 breadcrumbs(semantic: true)
+    assert_equal %{<div class="breadcrumbs"><span itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/" itemprop="url"><span itemprop="title">Home</span></a></span> &rsaquo; <span itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><span class="current" itemprop="title">About</span></span></div>},
+                 breadcrumbs(semantic: true).to_s
   end
 
   test "doesn't show root alone" do
     breadcrumb :root
-    assert_equal "", breadcrumbs
+    assert_equal "", breadcrumbs.to_s
   end
 
   test "displays single fragment" do
     breadcrumb :root
     assert_equal %{<div class="breadcrumbs"><span class="current">Home</span></div>},
-                 breadcrumbs(display_single_fragment: true)
+                 breadcrumbs(display_single_fragment: true).to_s
   end
 
   test "displays single non-root fragment" do
     breadcrumb :basic
     assert_equal %{<div class="breadcrumbs"><span class="current">About</span></div>},
-                 breadcrumbs(autoroot: false, display_single_fragment: true)
+                 breadcrumbs(autoroot: false, display_single_fragment: true).to_s
   end
 
   test "shows no breadcrumb" do
-    assert_equal "", breadcrumbs
+    assert_equal "", breadcrumbs.to_s
   end
 
   test "links current breadcrumb" do
     breadcrumb :with_root
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about" class="current">About</a></div>},
-                 breadcrumbs(link_current: true)
+                 breadcrumbs(link_current: true).to_s
   end
 
   test "shows pretext" do
     breadcrumb :basic
-    assert_equal %{<div class="breadcrumbs">You are here: <a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs(pretext: "You are here: ")
+    assert_equal %{<div class="breadcrumbs"><span class="pretext">You are here:</span> <a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
+                 breadcrumbs(pretext: "You are here:").to_s
   end
 
   test "shows posttext" do
     breadcrumb :basic
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span> - text after breadcrumbs</div>},
-                 breadcrumbs(posttext: " - text after breadcrumbs")
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span> <span class="posttext">text after breadcrumbs</span></div>},
+                 breadcrumbs(posttext: "text after breadcrumbs").to_s
   end
 
   test "autoroot disabled" do
     breadcrumb :basic
-    assert_equal "", breadcrumbs(autoroot: false)
+    assert_equal "", breadcrumbs(autoroot: false).to_s
   end
 
   test "shows separator" do
     breadcrumb :with_root
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &raquo; <span class="current">About</span></div>},
-                 breadcrumbs(separator: " &raquo; ")
+                 breadcrumbs(separator: " &raquo; ").to_s
   end
 
   test "shows element id" do
     breadcrumb :basic
     assert_equal %{<div class="breadcrumbs" id="custom_id"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs(id: "custom_id")
+                 breadcrumbs(id: "custom_id").to_s
   end
 
   test "shows custom container class" do
     breadcrumb :basic
     assert_equal %{<div class="custom_class"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs(class: "custom_class")
+                 breadcrumbs(class: "custom_class").to_s
   end
 
   test "shows custom current class" do
     breadcrumb :basic
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="custom_current_class">About</span></div>},
-                 breadcrumbs(current_class: "custom_current_class")
+                 breadcrumbs(current_class: "custom_current_class").to_s
   end
 
   test "unsafe html" do
     breadcrumb :with_unsafe_html
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">Test &lt;strong&gt;bold text&lt;/strong&gt;</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "safe html" do
     breadcrumb :with_safe_html
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">Test <strong>bold text</strong></span></div>},
-                 breadcrumbs
-  end
-
-  test "yields a block containing breadcrumb links array" do
-    breadcrumb :multiple_links_with_parent
-
-    out = breadcrumbs do |links|
-      links.map { |link| [link.key, link.text, link.url] }
-    end
-
-    assert_equal [[:root, "Home", "/"],
-                  [:basic, "About", "/about"],
-                  [:multiple_links_with_parent, "Contact", "/about/contact"],
-                  [:multiple_links_with_parent, "Contact form", "/about/contact/form"]], out
+                 breadcrumbs.to_s
   end
 
   test "parent breadcrumb" do
@@ -186,20 +173,29 @@ class HelperMethodsTest < ActionView::TestCase
     assert_nil out
   end
 
-  test "sets current on last link in array" do
-    breadcrumb :multiple_links_with_parent
+  test "link keys" do
+    breadcrumb :basic
+    assert_equal [:root, :basic], breadcrumbs.keys
+  end
+
+  test "using breadcrumbs as array" do
+    breadcrumb :basic
 
-    out = breadcrumbs do |links|
-      links.map(&:current?)
+    breadcrumbs.tap do |links|
+      assert_kind_of Array, links
+      assert_equal 2, links.count
     end
+  end
 
-    assert_equal [false, false, false, true], out
+  test "sets current on last link in array" do
+    breadcrumb :multiple_links_with_parent
+    assert_equal [false, false, false, true], breadcrumbs.map(&:current?)
   end
 
   test "passing options to links" do
     breadcrumb :with_link_options
 
-    breadcrumbs(autoroot: false) do |links|
+    breadcrumbs(autoroot: false).tap do |links|
       links[0].tap do |link|
         assert link.title?
         assert_equal "My Title", link.title
@@ -218,53 +214,53 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     assert_equal %{<div class="breadcrumbs"><a href="/about">Test</a> &rsaquo; <span class="current">Other Link</span></div>},
-                 breadcrumbs(autoroot: false)
+                 breadcrumbs(autoroot: false).to_s
   end
 
   test "without link" do
     breadcrumb :without_link
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; Also without link &rsaquo; <span class="current">Without link</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "view context" do
     breadcrumb :using_view_helper
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">TestTest</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "multiple arguments" do
     breadcrumb :with_multiple_arguments, "One", "Two", "Three"
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about">First OneOne then TwoTwo then ThreeThree</a> &rsaquo; <span class="current">One and Two and Three</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "from views folder" do
     breadcrumb :from_views
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">Breadcrumb From View</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "with_breadcrumb" do
     breadcrumb :basic
     
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
 
     with_breadcrumb(:with_parent_object, issues(:one)) do
       assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/projects/1">Test Project</a> &rsaquo; <span class="current">Test Issue</span></div>},
-                   breadcrumbs
+                   breadcrumbs.to_s
     end    
     
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "calling breadcrumbs helper twice" do
     breadcrumb :with_parent
     2.times do
       assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about">About</a> &rsaquo; <span class="current">Contact</span></div>},
-                   breadcrumbs
+                   breadcrumbs.to_s
     end
   end
 
@@ -279,7 +275,7 @@ class HelperMethodsTest < ActionView::TestCase
     self.request = OpenStruct.new(fullpath: "/testpath?a=1&b=2")
 
     breadcrumb :basic
-    assert_equal "/testpath?a=1&b=2", breadcrumbs { |links| links.last.url }
+    assert_equal "/testpath?a=1&b=2", breadcrumbs.last.url
   end
 
   test "calling the breadcrumb method with wrong arguments" do
@@ -299,7 +295,7 @@ class HelperMethodsTest < ActionView::TestCase
   test "inferred breadcrumb" do
     breadcrumb Project.first
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">Test Project</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   # Styles
@@ -307,43 +303,43 @@ class HelperMethodsTest < ActionView::TestCase
   test "default style" do
     breadcrumb :basic
     assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs
+                 breadcrumbs.to_s
   end
 
   test "ordered list style" do
     breadcrumb :basic
     assert_equal %{<ol class="breadcrumbs"><li><a href="/">Home</a></li><li class="current">About</li></ol>},
-                 breadcrumbs(style: :ol)
+                 breadcrumbs(style: :ol).to_s
   end
 
   test "unordered list style" do
     breadcrumb :basic
     assert_equal %{<ul class="breadcrumbs"><li><a href="/">Home</a></li><li class="current">About</li></ul>},
-                 breadcrumbs(style: :ul)
+                 breadcrumbs(style: :ul).to_s
   end
 
   test "bootstrap style" do
     breadcrumb :basic
     assert_equal %{<ol class="breadcrumb"><li><a href="/">Home</a></li><li class="active">About</li></ol>},
-                 breadcrumbs(style: :bootstrap)
+                 breadcrumbs(style: :bootstrap).to_s
   end
 
   test "foundation5 style" do
     breadcrumb :basic
     assert_equal %{<ul class="breadcrumbs"><li><a href="/">Home</a></li><li class="current">About</li></ul>},
-	         breadcrumbs(style: :foundation5)
+	         breadcrumbs(style: :foundation5).to_s
   end
 
   test "custom container and fragment tags" do
     breadcrumb :basic
     assert_equal %{<c class="breadcrumbs"><f><a href="/">Home</a></f> &rsaquo; <f class="current">About</f></c>},
-                 breadcrumbs(container_tag: :c, fragment_tag: :f)
+                 breadcrumbs(container_tag: :c, fragment_tag: :f).to_s
   end
 
   test "custom semantic container and fragment tags" do
     breadcrumb :basic
     assert_equal %{<c class="breadcrumbs"><f itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/" itemprop="url"><span itemprop="title">Home</span></a></f> &rsaquo; <f class="current" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"><span itemprop="title">About</span></f></c>},
-                 breadcrumbs(container_tag: :c, fragment_tag: :f, semantic: true)
+                 breadcrumbs(container_tag: :c, fragment_tag: :f, semantic: true).to_s
   end
 
   test "unknown style" do
@@ -359,7 +355,7 @@ class HelperMethodsTest < ActionView::TestCase
     breadcrumb :basic
 
     assert_equal %{<one class="breadcrumbs"><two><a href="/">Home</a></two><two class="current">About</two></one>},
-                 breadcrumbs(style: :test_style)
+                 breadcrumbs(style: :test_style).to_s
   end
 
   # Configuration reload
@@ -380,7 +376,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs.to_s
 
     sleep 1 # File change interval is 1 second
 
@@ -396,7 +392,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/test">Home (reloaded)</a> &rsaquo; <span class="current">About (reloaded)</span></div>}, breadcrumbs
+    assert_equal %{<div class="breadcrumbs"><a href="/test">Home (reloaded)</a> &rsaquo; <span class="current">About (reloaded)</span></div>}, breadcrumbs.to_s
   end
 
   test "reload configuration when file is added" do
@@ -425,7 +421,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs.to_s
   end
 
   test "reload configuration when file is deleted" do
@@ -453,7 +449,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :contact
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <a href="/about">About (loaded)</a> &rsaquo; <span class="current">Contact (loaded)</span></div>}, breadcrumbs
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <a href="/about">About (loaded)</a> &rsaquo; <span class="current">Contact (loaded)</span></div>}, breadcrumbs.to_s
 
     File.delete path.join("pages.rb")
 
@@ -463,7 +459,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs.to_s
   end
 
   test "reloads only in development environment" do
@@ -483,7 +479,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs.to_s
 
     sleep 1
 
@@ -499,7 +495,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &rsaquo; <span class="current">About (loaded)</span></div>}, breadcrumbs.to_s
   end
 
 private

metadata

@@ -1,55 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: gretel
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Lasse Bunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gretel is a Ruby on Rails plugin that makes it easy yet flexible to create
@@ -60,8 +46,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -75,8 +61,10 @@ files:
 - lib/gretel/crumb.rb
 - lib/gretel/crumbs.rb
 - lib/gretel/deprecated.rb
+- lib/gretel/deprecated/default_style_key.rb
 - lib/gretel/deprecated/layout.rb
 - lib/gretel/deprecated/show_root_alone.rb
+- lib/gretel/deprecated/yield_links.rb
 - lib/gretel/link.rb
 - lib/gretel/renderer.rb
 - lib/gretel/resettable.rb
@@ -136,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Flexible Ruby on Rails breadcrumbs plugin.