Fixes #28 via #29. Adds option for linking current breadcrumb to the …

…request path

Gemfile

@@ -5,13 +5,19 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
 # To use debugger
 # gem 'debugger'
+
+group :development do
+  # jquery-rails is used by the dummy application
+  gem "jquery-rails"
+end
+
+group :test do
+  gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"
+end

README.md

@@ -93,6 +93,7 @@ Option                   | Description
 :autoroot                | Whether it should automatically link to the `:root` crumb if no parent is given.                                           | True
 :display_single_fragment | Whether it should display the breadcrumb if it includes only one link.                                                     | False
 :link_current            | Whether the current crumb should be linked to.                                                                             | False
+:link_current_to_request_path            | Whether the current crumb should always link to the current request path. *Note:* This option will have no effect unless `:link_current` is set to `true`.                                                                             | True
 :semantic                | Whether it should generate [semantic breadcrumbs](http://support.google.com/webmasters/bin/answer.py?hl=en&answer=185417). | False
 :id                      | ID for the breadcrumbs container.                                                                                          | None
 :class                   | CSS class for the breadcrumbs container. Can be set to `nil` for no class.                                                 | `"breadcrumbs"`

gemfiles/Gemfile-rails.3.1.x

@@ -15,3 +15,5 @@ gem "jquery-rails"
 
 # To use debugger
 # gem 'debugger'
+
+gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"

gemfiles/Gemfile-rails.4.0.x

@@ -15,3 +15,5 @@ gem "jquery-rails"
 
 # To use debugger
 # gem 'debugger'
+
+gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"

gemfiles/Gemfile-rails.4.1.x

@@ -15,3 +15,5 @@ gem "jquery-rails"
 
 # To use debugger
 # gem 'debugger'
+
+gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"

lib/gretel/renderer.rb

@@ -8,6 +8,7 @@ class Renderer
       autoroot: true,
       display_single_fragment: false,
       link_current: false,
+      link_current_to_request_path: true,
       semantic: false,
       class: "breadcrumbs",
       current_class: "current",
@@ -84,7 +85,7 @@ def links_for_render(options = {})
       end
 
       # Set current link to actual path
-      if out.any? && request
+      if options[:link_current_to_request_path] && out.any? && request
         out.last.url = request.fullpath
       end
 
@@ -111,7 +112,7 @@ def links
 
         # Links of first crumb
         links = crumb.links.dup
-        
+
         # Get parent links
         links.unshift *parent_links_for(crumb)
 
@@ -137,9 +138,9 @@ def method_missing(method, *args, &block)
 
     class << self
       include Resettable
-      
+
       # Registers a style for later use.
-      # 
+      #
       #   Gretel::Renderer.register_style :ul, { container_tag: :ul, fragment_tag: :li }
       def register_style(style_key, options)
         styles[style_key] = options

test/helper_methods_test.rb

@@ -219,10 +219,10 @@ def itemscope_value
       links[0].tap do |link|
         assert link.title?
         assert_equal "My Title", link.title
-        
+
         assert link.other?
         assert_equal "Other Option", link.other
-        
+
         assert !link.nonexistent?
         assert_nil link.nonexistent
       end
@@ -263,15 +263,15 @@ def itemscope_value
 
   test "with_breadcrumb" do
     breadcrumb :basic
-    
+
     assert_dom_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
                  breadcrumbs.to_s
 
     with_breadcrumb(:with_parent_object, issues(:one)) do
       assert_dom_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.to_s
-    end    
-    
+    end
+
     assert_dom_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <span class="current">About</span></div>},
                  breadcrumbs.to_s
   end
@@ -298,6 +298,13 @@ def itemscope_value
     assert_equal "/testpath?a=1&b=2", breadcrumbs.last.url
   end
 
+  test "current link url is not set to fullpath using link_current_to_request_path=false" do
+    self.request = OpenStruct.new(fullpath: "/testpath?a=1&b=2")
+
+    breadcrumb :basic
+    assert_equal "/about", breadcrumbs(:link_current_to_request_path => false).last.url
+  end
+
   test "calling the breadcrumb method with wrong arguments" do
     assert_nothing_raised do
       breadcrumb :basic, test: 1
@@ -378,7 +385,7 @@ def itemscope_value
 
   test "register style" do
     Gretel.register_style :test_style, { container_tag: :one, fragment_tag: :two }
-    
+
     breadcrumb :basic
 
     assert_dom_equal %{<one class="breadcrumbs"><two><a href="/">Home</a></two><two class="current">About</two></one>},