gretel 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6ea439e9c5de59ad623d0f2f90affb3ec5a4815
-  data.tar.gz: d95784f691b047b1dd58f324eecdc8157beb78b0
+  metadata.gz: 0080b505b59c5b36fb677893d4eb7eb423653392
+  data.tar.gz: 6cab21d17741ad215d56a26f7d12c20c833bcc9d
 SHA512:
-  metadata.gz: 0f2e1c8b30834d532aaa245ab4aba2b01738712108ae7f00ce990db684c9a4821d7da21ce90ca8abdbc7e1eccecbcd6836ae19e0b9a014b6d2a49fb3ebb00cb8
-  data.tar.gz: 7c6975eb29de22545495a7e990970527b5794876ec360c8b776a1b26b2a2c57b82bf66deb55984b06cbf0f46213279edb59a774be3e552d2d2c2abb2ff407473
+  metadata.gz: a39a87e3267b845a254a72a1d7478d987cff71d6484de22326aa28c7eb8476d22d6500df7c376fa5407ba9d65ad82d6f975fa2d70916e2169954c9bbbd7b7938
+  data.tar.gz: d02a3bc7312ab98ad6b0b6adc68c38454e655c5bb29db4fbf140871cec41c8eb59dabc09170b9d94b8f9c9b24c64a4db659e27f32ac3d04411f9ad136df2cdd5

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
+sudo: false
 rvm:
+  - 2.2.0
   - 2.1.0
   - 2.0.0
   - 1.9.3
 gemfile:
+  - gemfiles/Gemfile-rails.3.1.x
   - gemfiles/Gemfile-rails.3.2.x
   - gemfiles/Gemfile-rails.4.0.x
   - gemfiles/Gemfile-rails.4.1.x

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 3.0.9
+* Adds breadcrumbs option `link_current_to_request_path` to link the current breadcrumb to the request path(#28 via #29)
+* Fixes semantic breadcrumbs when the last item has no link (via #55)
+* Downgrades Rails dependency to 3.1 (via #56)
+* Fixes jRuby issue with `Rails::Application` constant (via #50)
+* Fixes deprecation warnings for `alias_method_chain` (via #66)
+* Updated coprights (via #63)
+
 ## Version 3.0.8
 * Parent breadcrumbs can now also be inferred from models responding to `model_name`.
 
@@ -45,4 +53,4 @@
 * No longer supports procs for link text or URL as this is unnecessary when you can pass arguments to the block anyway.
 * It now accepts multiple arguments for `crumb` and `parent` (see the readme).
 * Breadcrumbs are now rendered with `<%= breadcrumbs %>`, although you can still use the old `<%= breadcrumb %>` (without *s*).
-* You can now access view helpers from inside `Gretel::Crumbs.layout do .. end`.
+* You can now access view helpers from inside `Gretel::Crumbs.layout do .. end`.

data/Gemfile

@@ -5,9 +5,6 @@ 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
@@ -15,3 +12,12 @@ gem "jquery-rails"
 
 # 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

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Lasse Bunk
+Copyright (c) 2010-2016 Lasse Bunk
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -87,6 +87,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"`
@@ -133,7 +134,7 @@ crumb :project_issues do |project|
   parent project # inferred to :project
 end
 
-# Child 
+# Child
 crumb :issue do |issue|
   link issue.name, issue_path(issue)
   parent :project_issues, issue.project
@@ -333,6 +334,7 @@ in `config/breadcrumbs.rb`.
 
 * [Full documentation](http://rubydoc.info/gems/gretel)
 * [Changelog](https://github.com/lassebunk/gretel/blob/master/CHANGELOG.md)
+* [Tutorial on using Gretel](http://www.sitepoint.com/breadcrumbs-rails-gretel/) (Sitepoint)
 
 ## Versioning
 
@@ -347,17 +349,20 @@ To contribute:
 1. Fork the project
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Make your changes
-4. Add tests
-5. Run `rake` to make sure all tests pass
-6. Commit your changes (`git commit -am 'Add new feature'`)
-7. Push to the branch (`git push origin my-new-feature`)
-8. Create new pull request
+4. Add/Fix tests
+5. Prepare database for testing: `cd test/dummy; rake db:migrate; rake db:test:prepare; cd ../..`
+6. Run `rake` to make sure all tests pass
+7. Commit your changes (`git commit -am 'Add new feature'`)
+8. Push to the branch (`git push origin my-new-feature`)
+9. Create new pull request
 
 Thanks.
 
 ## Contributors
 
-* [See the list of contributors](https://github.com/lassebunk/gretel/graphs/contributors)
+Gretel was created by [@lassebunk](https://github.com/lassebunk) and is maintained by [@WilHall](https://github.com/WilHall).
+
+[See the list of contributors](https://github.com/lassebunk/gretel/graphs/contributors)
 
 ## And then
 
@@ -365,4 +370,4 @@ Thanks.
 
 Have fun!
 
-Copyright (c) 2010-2013 [Lasse Bunk](http://lassebunk.dk), released under the MIT license
+Copyright (c) 2010-2016 [Lasse Bunk](http://lassebunk.dk), released under the MIT license

data/gemfiles/Gemfile-rails.3.1.x

@@ -0,0 +1,19 @@
+source "https://rubygems.org"
+
+gem "gretel",  :path => ".."
+
+gem "rails", "~> 3.1.0"
+gem "sqlite3"
+
+# 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'
+
+gem 'test-unit', '~> 3.0' if RUBY_VERSION >= "2.2"

data/gemfiles/Gemfile-rails.3.2.x

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

data/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"

data/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"

data/gretel.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^test/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "rails", ">= 3.2.0"
+  gem.add_dependency "rails", ">= 3.1.0"
   gem.add_development_dependency "sqlite3"
-end
+end

data/lib/gretel.rb

@@ -16,8 +16,8 @@ module Gretel
     # breadcrumbs set in engines.
     def breadcrumb_paths
       @breadcrumb_paths ||= begin
-        engines = Rails::Application::Railties.respond_to?(:engines) ?
-          Rails::Application::Railties.engines :
+        engines = Rails::Engine::Railties.respond_to?(:engines) ?
+          Rails::Engine::Railties.engines :
           Rails::Engine.subclasses.map(&:instance)
 
         engine_roots = engines.map { |e| e.config.root }
@@ -79,4 +79,4 @@ module Gretel
   end
 end
 
-ActionView::Base.send :include, Gretel::ViewHelpers
+ActionView::Base.send :include, Gretel::ViewHelpers

data/lib/gretel/deprecated/default_style_key.rb

@@ -1,11 +1,25 @@
-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
+if RUBY_VERSION < "2.0"
+  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
+else
+  module DeprecatedDefaultStyleKey
+    def options_for_style(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
+      super(style_key)
     end
-    options_for_style_without_default_style_key(style_key)
   end
 
-  alias_method_chain :options_for_style, :default_style_key
+  Gretel::Renderer.send :prepend, DeprecatedDefaultStyleKey
 end

data/lib/gretel/deprecated/show_root_alone.rb

@@ -1,12 +1,27 @@
-Gretel::Renderer.class_eval do
-  def options_for_render_with_show_root_alone(options = {})
-    options = options_for_render_without_show_root_alone(options)
-    if show_root_alone = options.delete(:show_root_alone)
-      Gretel.show_deprecation_warning "The :show_root_alone option is deprecated and will be removed in Gretel v4.0.0. Use `breadcrumbs(display_single_fragment: #{show_root_alone.inspect})` instead."
-      options[:display_single_fragment] = show_root_alone
+if RUBY_VERSION < "2.0"
+  Gretel::Renderer.class_eval do
+    def options_for_render_with_show_root_alone(options = {})
+      options = options_for_render_without_show_root_alone(options)
+      if show_root_alone = options.delete(:show_root_alone)
+        Gretel.show_deprecation_warning "The :show_root_alone option is deprecated and will be removed in Gretel v4.0.0. Use `breadcrumbs(display_single_fragment: #{show_root_alone.inspect})` instead."
+        options[:display_single_fragment] = show_root_alone
+      end
+      options
+    end
+
+    alias_method_chain :options_for_render, :show_root_alone
+  end
+else
+  module DeprecatedShowRootAlone
+    def options_for_render(options = {})
+      options = super(options)
+      if show_root_alone = options.delete(:show_root_alone)
+        Gretel.show_deprecation_warning "The :show_root_alone option is deprecated and will be removed in Gretel v4.0.0. Use `breadcrumbs(display_single_fragment: #{show_root_alone.inspect})` instead."
+        options[:display_single_fragment] = show_root_alone
+      end
+      options
     end
-    options
   end
 
-  alias_method_chain :options_for_render, :show_root_alone
-end
+  Gretel::Renderer.send :prepend, DeprecatedShowRootAlone
+end

data/lib/gretel/deprecated/yield_links.rb

@@ -1,4 +1,6 @@
-Gretel::ViewHelpers.class_eval do
+if RUBY_VERSION < "2.0"
+  Gretel::ViewHelpers.class_eval do
+
   def breadcrumbs_with_yield_links(options = {})
     if block_given?
       Gretel.show_deprecation_warning(
@@ -17,4 +19,26 @@ Gretel::ViewHelpers.class_eval do
   end
 
   alias_method_chain :breadcrumbs, :yield_links
-end
+  end
+else
+  module DeprecatedYieldLinks
+    def breadcrumbs(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
+        super(options)
+      end
+    end
+  end
+
+  Gretel::ViewHelpers.send :prepend, DeprecatedYieldLinks
+end

data/lib/gretel/renderer.rb

@@ -8,6 +8,7 @@ module Gretel
       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 @@ module Gretel
       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 @@ module Gretel
 
         # Links of first crumb
         links = crumb.links.dup
-        
+
         # Get parent links
         links.unshift *parent_links_for(crumb)
 
@@ -137,9 +138,9 @@ module Gretel
 
     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
@@ -175,7 +176,7 @@ module Gretel
 
         # 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])
+        fragments << render_fragment(options[:fragment_tag], current_link.text, (options[:link_current] ? current_link.url : nil), options[:semantic], class: options[:current_class], current_link: current_link.url)
 
         # Build the final HTML
         html_fragments = []
@@ -209,7 +210,14 @@ module Gretel
       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?
+
+          if url.present?
+            text = breadcrumb_link_to(text, url, itemprop: "url")
+          elsif options[:current_link].present?
+            current_url = "#{root_url}#{options[:current_link].gsub(/^\//, '')}"
+            text = text + tag(:meta, itemprop: "url", content: current_url)
+          end
+
           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")

data/lib/gretel/version.rb

@@ -1,3 +1,3 @@
 module Gretel
-  VERSION = "3.0.8"
-end
+  VERSION = "3.0.9"
+end

data/test/helper_methods_test.rb

@@ -219,10 +219,10 @@ class HelperMethodsTest < ActionView::TestCase
       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 @@ class HelperMethodsTest < ActionView::TestCase
 
   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 @@ class HelperMethodsTest < ActionView::TestCase
     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
@@ -365,7 +372,7 @@ class HelperMethodsTest < ActionView::TestCase
 
   test "custom semantic container and fragment tags" do
     breadcrumb :basic
-    assert_dom_equal %Q{<c class="breadcrumbs"><f itemscope="#{itemscope_value}" itemtype="http://data-vocabulary.org/Breadcrumb"><a href="/" itemprop="url"><span itemprop="title">Home</span></a></f> &rsaquo; <f class="current" itemscope="#{itemscope_value}" itemtype="http://data-vocabulary.org/Breadcrumb"><span itemprop="title">About</span></f></c>},
+    assert_dom_equal %Q{<c class="breadcrumbs"><f itemscope="#{itemscope_value}" itemtype="http://data-vocabulary.org/Breadcrumb"><a itemprop="url" href="/"><span itemprop="title">Home</span></a></f> &rsaquo; <f class="current" itemscope="#{itemscope_value}" itemtype="http://data-vocabulary.org/Breadcrumb"><span itemprop="title">About</span><meta itemprop="url" content="http://test.host/about" /></f></c>},
                  breadcrumbs(container_tag: :c, fragment_tag: :f, semantic: true).to_s
   end
 
@@ -378,7 +385,7 @@ class HelperMethodsTest < ActionView::TestCase
 
   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>},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gretel
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Lasse Bunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/Gemfile-rails.3.1.x
 - gemfiles/Gemfile-rails.3.2.x
 - gemfiles/Gemfile-rails.4.0.x
 - gemfiles/Gemfile-rails.4.1.x
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Flexible Ruby on Rails breadcrumbs plugin.