gretel 2.2.0.rc2 → 3.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63912baa8d7b8687330b6469ca18b82fef24a6d9
-  data.tar.gz: 93e5d1939577261f3ee204f6874749c4675d4c41
+  metadata.gz: 7b08f97b7c16a830427f2ccf1968732cfec834b6
+  data.tar.gz: 2cbf78c43a72b8cb525a2485287c09c123672913
 SHA512:
-  metadata.gz: 2d99b7fe134a685a49f6eb4b6d167ebe9e6c22134e2851fac27f3bee17159ab51bd5290a9647400a64b0a52470630e31305a62443469b29983e792036e0ed2ac
-  data.tar.gz: f17fdfdc5ab2a03578230b8d5c00b48b3094a611234621facbba87448c96b896b202e6ddc102d275583d6fa725b144f427a1c0f6c12eec9168f2f57d09a3bc26
+  metadata.gz: cbd0cf33abb351a39e3fa7dcb723cce2ee75e8f3c219406ceb28bcecdd693f0adeb77ab4f92553d261545a38cde87c6bd801a059eb9702cd16bdf85a99c4bafc
+  data.tar.gz: 5c2af9e0cd84b039965fb1389f234dd778cd994e7c056f385cd274c6384e4203c275d3572220dd6b221e9fd0a9350a4bdb4e81fcb395222b386193afdb911599

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 Changelog
 =========
 
-Version 2.2
+Version 3.0
 -----------
+* Support for `Gretel::Crumbs.layout do ... end` in an initializer has been removed. See the readme for details on how to upgrade.
 * Support for setting trails via the URL – `params[:trail]`. This makes it possible to link to a different breadcrumb trail than the one specified in your breadcrumb,
   for example if you have a store with products that have a default parent to their category, but when linking from the review section, you want to link back to the reviews instead.
   See the readme for more info.

data/README.md

@@ -68,8 +68,8 @@ At the top of *app/views/issues/show.html.erb*, set the current breadcrumb (assu
 Then, in *app/views/layouts/application.html.erb*:
 
 ```erb
-<%= breadcrumbs :pretext => "You are here: ",
-                :separator => " &rsaquo; " %>
+<%= breadcrumbs pretext: "You are here: ",
+                separator: " &rsaquo; " %>
 ```
 
 This will generate the following HTML (indented for readability):
@@ -86,13 +86,14 @@ This will generate the following HTML (indented for readability):
 Options
 -------
 
-You can pass options to `<%= breadcrumbs %>`, e.g. `<%= breadcrumbs :pretext => "You are here: " %>`:
+You can pass options to `<%= breadcrumbs %>`, e.g. `<%= breadcrumbs pretext: "You are here: " %>`:
 
 Option           | Description                                                                                                                | Default
 ---------------- | -------------------------------------------------------------------------------------------------------------------------- | -------
-: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; "`                                                                               | `" &gt; "`
+:style           | How to render the breadcrumbs. Can be `:default`, `:ol`, `:ul`, or `:bootstrap`. See below for more info.                  | `:default`
+: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; "`
 :autoroot        | Whether it should automatically link to the `:root` crumb if no parent is given.                                           | True
 :show_root_alone | Whether it should show `:root` if that is the only link.                                                                   | False
 :link_current    | Whether the current crumb should be linked to.                                                                             | False
@@ -101,6 +102,21 @@ Option           | Description
 :class           | CSS class for the breadcrumbs container.                                                                                   | `"breadcrumbs"`
 :current_class   | CSS class for the current link or span.                                                                                    | `"current"`
 
+### Styles
+
+These are the styles you can use with `breadcrumb style: :xx`.
+
+Style        | Description
+------------ | -----------
+`:default`   | 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/).
+
+Or you can build the breadcrumbs manually for full customization; see below.
+
+If you add other widely used styles, please submit a [Pull Request](https://github.com/lassebunk/gretel/pulls) so others can use them too.
+
 More examples
 -------------
 
@@ -155,7 +171,7 @@ end
 # match the user's actual navigation path
 # URL: /products/123?q=my+search
 crumb :search do |keyword|
-  link "Search for #{keyword}", search_path(:q => keyword)
+  link "Search for #{keyword}", search_path(q: keyword)
 end
 
 crumb :product do |product|
@@ -277,11 +293,11 @@ Since Gretel version 2.1.0, the breadcrumb configuration files are now reloaded
 
 Upgrading from version 2.0 or below
 -----------------------------------
+
 Instead of using the initializer that in Gretel version 2.0 and below required restarting the application after breadcrumb configuration changes, the configuration of the breadcrumbs is now loaded from `config/breadcrumbs.rb` (and `config/breadcrumbs/*.rb` if you want to split your breadcrumbs configuration across multiple files).
 In the Rails development environment, these files are automatically reloaded when changed.
 
-Using the initializer (e.g. `config/initializers/breadcrumbs.rb`) is deprecated but still supported until Gretel version 3.0.
-If you want to silence the deprecation warning until you upgrade, you can set `Gretel.suppress_deprecation_warnings = true` before the layout block in your initializer.
+Using the initializer (e.g. `config/initializers/breadcrumbs.rb`) was deprecated in Gretel version 2.1.0 and removed in version 3.0. It raises an error if you try to use it.
 
 To update to the latest version of Gretel, use `bundle update gretel`. Then remove the `Gretel::Crumbs.layout do ... end` block, so instead of:
 

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => :test
+task default: :test

data/lib/gretel.rb

@@ -3,6 +3,7 @@ require 'gretel/crumbs'
 require 'gretel/crumb'
 require 'gretel/link'
 require 'gretel/trail'
+require 'gretel/renderer'
 require 'gretel/view_helpers'
 require 'gretel/deprecated'
 

data/lib/gretel/crumbs.rb

@@ -20,9 +20,6 @@ module Gretel
       def load_breadcrumbs
         @crumbs = {}
 
-        # Deprecated in v2.1.0.
-        instance_eval &deprecated_breadcrumbs_block
-
         loaded_file_mtimes.clear
         breadcrumb_files.each do |file|
           instance_eval open(file).read, file

data/lib/gretel/deprecated.rb

@@ -2,7 +2,8 @@ module Gretel
   module Crumbs
     class << self
       # Lay out the breadcrumbs.
-      # Deprecated since v2.1.0. Put breadcrumbs in +config/breadcrumbs.rb+ instead (see https://github.com/lassebunk/gretel/blob/master/README.md for details).
+      # Deprecated since v2.1.0 and removed in v3.0.0.
+      # Put breadcrumbs in +config/breadcrumbs.rb+ instead (see https://github.com/lassebunk/gretel/blob/master/README.md for details).
       #
       # Example:
       #   Gretel::Crumbs.layout do
@@ -11,16 +12,11 @@ module Gretel
       #     end
       #   end
       def layout(&block)
-        Gretel.show_deprecation_warning(
-          "Gretel::Crumbs.layout has been deprecated and will be removed in Gretel version 3.0. " +
+        raise (
+          "Gretel::Crumbs.layout has been deprecated was removed in Gretel version 3.0. " +
           "Please put your breadcrumbs in `config/breadcrumbs.rb`. " +
           "This will also automatically reload your breadcrumbs when you change them in the development environment. " +
           "See https://github.com/lassebunk/gretel/blob/master/README.md for details.")
-        @deprecated_breadcrumbs_block = block
-      end
-
-      def deprecated_breadcrumbs_block
-        @deprecated_breadcrumbs_block ||= Proc.new {}
       end
     end
   end

data/lib/gretel/renderer.rb

@@ -0,0 +1,193 @@
+module Gretel
+  class Renderer
+    DEFAULT_OPTIONS = {
+      style: :default,
+      pretext: "",
+      posttext: "",
+      separator: "",
+      autoroot: true,
+      show_root_alone: false,
+      link_current: false,
+      semantic: false,
+      class: "breadcrumbs",
+      current_class: "current",
+      id: nil
+    }
+
+    STYLES = {
+      # Default style
+      default: { container_tag: :div, separator: " › " },
+
+      # Ordered list
+      ol: { container_tag: :ol, fragment_tag: :li },
+
+      # Unordered list
+      ul: { container_tag: :ul, fragment_tag: :li },
+
+      # Twitter Bootstrap
+      bootstrap: { container_tag: :ol, fragment_tag: :li, class: "breadcrumb", current_class: "active" }
+    }
+
+    def initialize(context, breadcrumb_key, *breadcrumb_args)
+      @context = context
+      @breadcrumb_key = breadcrumb_key
+      @breadcrumb_args = breadcrumb_args
+    end
+
+    # Renders the breadcrumbs HTML.
+    def render(options)
+      options = options_for_render(options)
+      links = links_for_render(options)
+
+      return "" if links.empty?
+
+      # Array to hold the HTML fragments
+      fragments = []
+
+      # Loop through all but the last (current) link and build HTML of the fragments
+      links[0..-2].each do |link|
+        fragments << 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])
+    end
+
+    # Yields an array of links to be used in a view.
+    def yield_links(options = {}, &block)
+      options = options_for_render(options)
+      yield links_for_render(options)
+    end
+
+    # Returns encoded trail for the breadcrumb.
+    def trail
+      @trail ||= Gretel::Trail.encode(links)
+    end
+
+    private
+
+    attr_reader :context, :breadcrumb_key, :breadcrumb_args
+
+    def options_for_render(options = {})
+      style = options_for_style(options[:style] || DEFAULT_OPTIONS[:style])
+      DEFAULT_OPTIONS.merge(style).merge(options)
+    end
+
+    # Returns options for the given +style_key+ and raises an exception if it's not found.
+    def options_for_style(style_key)
+      if style = STYLES[style_key]
+        style
+      else
+        raise ArgumentError, "Breadcrumbs style #{style_key.inspect} not found. Use any of #{STYLES.keys.inspect}."
+      end
+    end
+
+    # Array of links for the path of the breadcrumb.
+    # Also reloads the breadcrumb configuration if needed.
+    def links
+      return [] if @breadcrumb_key.blank?
+
+      @links ||= begin
+        # Reload breadcrumbs configuration if needed
+        Gretel::Crumbs.reload_if_needed
+
+        # Get breadcrumb set by the `breadcrumb` method
+        crumb = Gretel::Crumb.new(self, breadcrumb_key, *breadcrumb_args)
+
+        # Links of first crumb
+        links = crumb.links.dup
+        
+        links.last.tap do |last|
+          last.url = request.try(:fullpath) || last.url
+        end
+
+        # Get trail
+        links.unshift *trail_for(crumb)
+
+        links
+      end
+    end
+
+    # Returns parent links for the crumb, or the trail from `params[:trail]` if it is set.
+    def trail_for(crumb)
+      if params[Gretel::Trail.trail_param].present?
+        # Decode trail from URL
+        Gretel::Trail.decode(params[Gretel::Trail.trail_param])
+      else
+        # Build parents
+        links = []
+        while crumb = crumb.parent
+          links.unshift *crumb.links
+        end
+        links
+      end
+    end
+
+    # Array of links with applied options.
+    def links_for_render(options = {})
+      out = links.dup
+
+      # Handle autoroot
+      if options[:autoroot] && out.map(&:key).exclude?(:root) && Gretel::Crumbs.crumb_defined?(:root)
+        out.unshift *Gretel::Crumb.new(self, :root).links
+      end
+
+      # Handle show root alone
+      if out.count == 1 && out.first.key == :root && !options[:show_root_alone]
+        out.shift
+      end
+
+      out
+    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 = link_to(text, url, itemprop: "url") if url.present?
+        content_tag(fragment_tag, text, class: options[:class], itemscope: "", itemtype: "http://data-vocabulary.org/Breadcrumb")
+      else
+        if url.present?
+          content_tag(:div, 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
+    end
+
+    # Renders regular, non-semantic fragment HTML.
+    def render_nonsemantic_fragment(fragment_tag, text, url, options = {})
+      if fragment_tag
+        text = link_to(text, url) if url.present?
+        content_tag(fragment_tag, text, class: options[:class])
+      else
+        if url.present?
+          link_to(text, url, class: options[:class])
+        elsif options[:class].present?
+          content_tag(:span, text, class: options[:class])
+        else
+          text
+        end
+      end
+    end
+
+    # Proxy to view context
+    def method_missing(method, *args, &block)
+      context.send(method, *args, &block)
+    end
+  end
+end

data/lib/gretel/trail.rb

@@ -47,7 +47,7 @@ module Gretel
 
     private
 
-      # Encodes links array to Base64, internally using YAML for serialization.
+      # Encodes links array to Base64, internally using JSON for serialization.
       def encode_base64(links)
         arr = links.map { |link| [link.key, link.text, link.url] }
         Base64.urlsafe_encode64(arr.to_json)

data/lib/gretel/version.rb

@@ -1,3 +1,3 @@
 module Gretel
-  VERSION = "2.2.0.rc2"
+  VERSION = "3.0.0.beta1"
 end

data/lib/gretel/view_helpers.rb

@@ -4,21 +4,12 @@ module Gretel
     #   <%
     #   breadcrumb :category, @category
     #   %>
-    def breadcrumb(*args)
-      options = args.extract_options!
-
-      if args.any?
-        @_breadcrumb_key = args.shift
-        @_breadcrumb_args = args
-        @_breadcrumb_links = nil
-        @_breadcrumb_trail = nil
-      else
-        breadcrumbs(options)
-      end
+    def breadcrumb(key, *args)
+      @_gretel_renderer = Gretel::Renderer.new(self, key, *args)
     end
 
     # Renders the breadcrumbs HTML, for example in your layout. See the readme for default options.
-    #   <%= breadcrumbs :pretext => "You are here: " %>
+    #   <%= breadcrumbs pretext: "You are here: " %>
     #
     # If you supply a block, it will yield an array with the breadcrumb links so you can build the breadcrumbs HTML manually:
     #   <% breadcrumbs do |links| %>
@@ -29,124 +20,22 @@ module Gretel
     #       <% end %>
     #     <% end %>
     #   <% end %>
-    def breadcrumbs(options = {})
-      options = default_breadcrumb_options.merge(options)
-      links = breadcrumb_links_for_render(options)
+    def breadcrumbs(options = {}, &block)
       if block_given?
-        yield links
+        gretel_renderer.yield_links(options, &block)
       else
-        render_breadcrumbs(links, options)
+        gretel_renderer.render(options)
       end
     end
 
     def breadcrumb_trail
-      @_breadcrumb_trail ||= Gretel::Trail.encode(breadcrumb_links)
+      gretel_renderer.trail
     end
 
     private
 
-    def breadcrumb_links
-      @_breadcrumb_links ||= begin
-        Gretel::Crumbs.reload_if_needed
-        get_breadcrumb_links
-      end
-    end
-
-    def breadcrumb_links_for_render(options = {})
-      links = breadcrumb_links.dup
-
-      # Handle autoroot
-      if options[:autoroot] && links.map(&:key).exclude?(:root) && Gretel::Crumbs.crumb_defined?(:root)
-        links.unshift *Gretel::Crumb.new(self, :root).links
-      end
-
-      # Handle show root alone
-      if links.count == 1 && links.first.key == :root && !options[:show_root_alone]
-        links.shift
-      end
-
-      links
-    end
-
-    # Returns an array of links for the path of the breadcrumb set by +breadcrumb+.
-    def get_breadcrumb_links
-      return [] if @_breadcrumb_key.blank?
-
-      # Get breadcrumb set by the `breadcrumb` method
-      crumb = Gretel::Crumb.new(self, @_breadcrumb_key, *@_breadcrumb_args)
-
-      # Links of first crumb
-      links = crumb.links.dup
-      
-      links.last.tap do |last|
-        last.url = request.try(:fullpath) || last.url
-      end
-
-      if params[Gretel::Trail.trail_param].present?
-        # Decode trail from URL
-        links.unshift *Gretel::Trail.decode(params[Gretel::Trail.trail_param])
-      else
-        # Build parents
-        while crumb = crumb.parent
-          links.unshift *crumb.links
-        end
-      end
-
-      links
-    end
-
-    # Renders breadcrumbs HTML.
-    def render_breadcrumbs(links, options)
-      return "" if links.empty?
-
-      # Array to hold the HTML fragments
-      fragments = []
-
-      # Loop through all but the last (current) link and build HTML of the fragments
-      links[0..-2].each do |link|
-        fragments << render_breadcrumb_fragment(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_breadcrumb_fragment(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(:div, html, :id => options[:id], :class => options[:class])
-    end
-
-    # Renders HTML for a breadcrumb fragment, i.e. a breadcrumb link.
-    def render_breadcrumb_fragment(text, url, semantic, options = {})
-      if semantic
-        if url.present?
-          content_tag(:div, 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
-      else
-        if url.present?
-          link_to(text, url, :class => options[:class])
-        elsif options[:class]
-          content_tag(:span, text, :class => options[:class])
-        else
-          text
-        end
-      end
-    end
-
-    # Default options for the breadcrumb rendering.
-    def default_breadcrumb_options
-      { :pretext => "",
-        :posttext => "",
-        :separator => " &gt; ",
-        :autoroot => true,
-        :show_root_alone => false,
-        :link_current => false,
-        :semantic => false,
-        :class => "breadcrumbs",
-        :current_class => "current",
-        :id => nil }
+    def gretel_renderer
+      @_gretel_renderer ||= Gretel::Renderer.new(self, nil)
     end
   end
 end

data/test/deprecated_test.rb

@@ -10,21 +10,9 @@ class DeprecatedTest < ActionView::TestCase
   end
 
   test "deprecated configuration block" do
-    Gretel.suppress_deprecation_warnings = true
-    
-    Gretel::Crumbs.layout do
-      crumb :deprecated_parent do
-        link "Test deprecated", root_path
-      end
-
-      crumb :deprecated_child do
-        link "Child", about_path
-        parent :deprecated_parent
+    assert_raises RuntimeError do
+      Gretel::Crumbs.layout do
       end
     end
-
-    breadcrumb :deprecated_child
-    assert_equal %{<div class="breadcrumbs"><a href="/">Test deprecated</a> &gt; <span class="current">Child</span></div>},
-                 breadcrumbs(:autoroot => false)
   end
 end

data/test/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  wrap_parameters format: [:json]
 end
 
 # Disable root element in JSON by default.

data/test/dummy/config/routes.rb

@@ -1,9 +1,9 @@
 Dummy::Application.routes.draw do
-  root :to => "dummy#dummy"
+  root to: "dummy#dummy"
 
-  match "about"              => "dummy#dummy", :as => :about
-  match "about/contact"      => "dummy#dummy", :as => :contact
-  match "about/contact/form" => "dummy#dummy", :as => :contact_form
+  match "about"              => "dummy#dummy", as: :about
+  match "about/contact"      => "dummy#dummy", as: :contact
+  match "about/contact/form" => "dummy#dummy", as: :contact_form
 
   resources :projects do
     resources :issues

data/test/dummy/db/schema.rb

@@ -11,19 +11,19 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130122163051) do
+ActiveRecord::Schema.define(version: 20130122163051) do
 
-  create_table "issues", :force => true do |t|
+  create_table "issues", force: true do |t|
     t.string   "title"
     t.integer  "project_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "projects", :force => true do |t|
+  create_table "projects", force: true do |t|
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

data/test/helper_methods_test.rb

@@ -10,52 +10,54 @@ class HelperMethodsTest < ActionView::TestCase
     Gretel::Trail.secret = "128107d341e912db791d98bbe874a8250f784b0a0b4dbc5d5032c0fc1ca7bda9c6ece667bd18d23736ee833ea79384176faeb54d2e0d21012898dde78631cdf1"
   end
 
+  # Breadcrumb generation
+
   test "shows basic breadcrumb" do
     breadcrumb :basic
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <span class="current">About</span></div>},
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
                  breadcrumbs
   end
 
   test "shows breadcrumb with root" do
     breadcrumb :with_root
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <span class="current">About</span></div>},
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
                  breadcrumbs
   end
 
   test "shows breadcrumb with parent" do
     breadcrumb :with_parent
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about">About</a> &gt; <span class="current">Contact</span></div>},
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about">About</a> &rsaquo; <span class="current">Contact</span></div>},
                  breadcrumbs
   end
 
   test "shows breadcrumb with autopath" do
     breadcrumb :with_autopath, projects(:one)
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <span class="current">Test Project</span></div>},
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">Test Project</span></div>},
                  breadcrumbs
   end
 
   test "shows breadcrumb with parent object" do
     breadcrumb :with_parent_object, issues(:one)
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/projects/1">Test Project</a> &gt; <span class="current">Test Issue</span></div>},
+    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
   end
 
   test "shows multiple links" do
     breadcrumb :multiple_links
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about/contact">Contact</a> &gt; <span class="current">Contact form</span></div>},
+    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
   end
 
   test "shows multiple links with parent" do
     breadcrumb :multiple_links_with_parent
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about">About</a> &gt; <a href="/about/contact">Contact</a> &gt; <span class="current">Contact form</span></div>},
+    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
   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> &gt; <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"><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)
   end
 
   test "doesn't show root alone" do
@@ -66,7 +68,7 @@ class HelperMethodsTest < ActionView::TestCase
   test "shows 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)
   end
 
   test "shows no breadcrumb" do
@@ -75,70 +77,64 @@ class HelperMethodsTest < ActionView::TestCase
 
   test "links current breadcrumb" do
     breadcrumb :with_root
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about" class="current">About</a></div>},
-                 breadcrumbs(:link_current => true)
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about" class="current">About</a></div>},
+                 breadcrumbs(link_current: true)
   end
 
   test "shows pretext" do
     breadcrumb :basic
-    assert_equal %{<div class="breadcrumbs">You are here: <a href="/">Home</a> &gt; <span class="current">About</span></div>},
-                 breadcrumbs(:pretext => "You are here: ")
+    assert_equal %{<div class="breadcrumbs">You are here: <a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
+                 breadcrumbs(pretext: "You are here: ")
   end
 
   test "shows posttext" do
     breadcrumb :basic
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <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> - text after breadcrumbs</div>},
+                 breadcrumbs(posttext: " - text after breadcrumbs")
   end
 
   test "autoroot disabled" do
     breadcrumb :basic
     assert_equal %{<div class="breadcrumbs"><span class="current">About</span></div>},
-                 breadcrumbs(:autoroot => false)
+                 breadcrumbs(autoroot: false)
   end
 
   test "shows separator" do
     breadcrumb :with_root
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
-                 breadcrumbs(:separator => " &rsaquo; ")
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &raquo; <span class="current">About</span></div>},
+                 breadcrumbs(separator: " &raquo; ")
   end
 
   test "shows element id" do
     breadcrumb :basic
-    assert_equal %{<div class="breadcrumbs" id="custom_id"><a href="/">Home</a> &gt; <span class="current">About</span></div>},
-                 breadcrumbs(:id => "custom_id")
+    assert_equal %{<div class="breadcrumbs" id="custom_id"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
+                 breadcrumbs(id: "custom_id")
   end
 
   test "shows custom container class" do
     breadcrumb :basic
-    assert_equal %{<div class="custom_class"><a href="/">Home</a> &gt; <span class="current">About</span></div>},
-                 breadcrumbs(:class => "custom_class")
+    assert_equal %{<div class="custom_class"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
+                 breadcrumbs(class: "custom_class")
   end
 
   test "shows custom current class" do
     breadcrumb :basic
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <span class="custom_current_class">About</span></div>},
-                 breadcrumbs(:current_class => "custom_current_class")
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="custom_current_class">About</span></div>},
+                 breadcrumbs(current_class: "custom_current_class")
   end
 
   test "unsafe html" do
     breadcrumb :with_unsafe_html
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <span class="current">Test &lt;strong&gt;bold text&lt;/strong&gt;</span></div>},
+    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
   end
 
   test "safe html" do
     breadcrumb :with_safe_html
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <span class="current">Test <strong>bold text</strong></span></div>},
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">Test <strong>bold text</strong></span></div>},
                  breadcrumbs
   end
 
-  test "works with legacy breadcrumb rendering method" do
-    breadcrumb :basic
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <span class="current">About</span></div>},
-                 breadcrumb
-  end
-
   test "yields a block containing breadcrumb links array" do
     breadcrumb :multiple_links_with_parent
 
@@ -154,30 +150,77 @@ class HelperMethodsTest < ActionView::TestCase
 
   test "without link" do
     breadcrumb :without_link
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; Also without link &gt; <span class="current">Without link</span></div>},
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; Also without link &rsaquo; <span class="current">Without link</span></div>},
                  breadcrumbs
   end
 
   test "view context" do
     breadcrumb :using_view_helper
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <span class="current">TestTest</span></div>},
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">TestTest</span></div>},
                  breadcrumbs
   end
 
   test "multiple arguments" do
     breadcrumb :with_multiple_arguments, "One", "Two", "Three"
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about">First OneOne then TwoTwo then ThreeThree</a> &gt; <span class="current">One and Two and Three</span></div>},
-                 breadcrumb
+    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
   end
 
   test "calling breadcrumbs helper twice" do
     breadcrumb :with_parent
     2.times do
-      assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about">About</a> &gt; <span class="current">Contact</span></div>},
+      assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/about">About</a> &rsaquo; <span class="current">Contact</span></div>},
                    breadcrumbs
     end
   end
 
+  # Styles
+
+  test "default style" do
+    breadcrumb :basic
+    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
+                 breadcrumbs
+  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)
+  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)
+  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)
+  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)
+  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)
+  end
+
+  test "unknown style" do
+    breadcrumb :basic
+    assert_raises ArgumentError do
+      breadcrumbs(style: :nonexistent)
+    end
+  end
+
+  # Trails
+
   test "trail helper" do
     breadcrumb :basic
 
@@ -188,7 +231,7 @@ class HelperMethodsTest < ActionView::TestCase
     params[:trail] = "12MoG3DY5eLzU_W1siYmFzaWMiLCJBYm91dCIsIi9hYm91dCJdXQ=="
     breadcrumb :multiple_links
 
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about">About</a> &gt; <a href="/about/contact">Contact</a> &gt; <span class="current">Contact form</span></div>},
+    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
   end
 
@@ -197,10 +240,12 @@ class HelperMethodsTest < ActionView::TestCase
     params[:mytest] = "12MoG3DY5eLzU_W1siYmFzaWMiLCJBYm91dCIsIi9hYm91dCJdXQ=="
     breadcrumb :multiple_links
 
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home</a> &gt; <a href="/about">About</a> &gt; <a href="/about/contact">Contact</a> &gt; <span class="current">Contact form</span></div>},
+    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
   end
 
+  # Configuration reload
+
   test "reload configuration when file is changed" do
     path = setup_loading_from_tmp_folder
     Gretel.reload_environments << "test"
@@ -217,7 +262,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &gt; <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
 
     sleep 1 # File change interval is 1 second
 
@@ -233,7 +278,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/test">Home (reloaded)</a> &gt; <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
   end
 
   test "reload configuration when file is added" do
@@ -262,7 +307,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &gt; <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
   end
 
   test "reload configuration when file is deleted" do
@@ -290,7 +335,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :contact
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &gt; <a href="/about">About (loaded)</a> &gt; <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
 
     File.delete path.join("pages.rb")
 
@@ -300,7 +345,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &gt; <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
   end
 
   test "reloads only in development environment" do
@@ -320,7 +365,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &gt; <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
 
     sleep 1
 
@@ -336,7 +381,7 @@ class HelperMethodsTest < ActionView::TestCase
     end
 
     breadcrumb :about
-    assert_equal %{<div class="breadcrumbs"><a href="/">Home (loaded)</a> &gt; <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
   end
 
 private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gretel
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc2
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Lasse Bunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,6 +62,7 @@ files:
 - lib/gretel/crumbs.rb
 - lib/gretel/deprecated.rb
 - lib/gretel/link.rb
+- lib/gretel/renderer.rb
 - lib/gretel/trail.rb
 - lib/gretel/version.rb
 - lib/gretel/view_helpers.rb