gretel 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41db63d201de11de1dbc6d9b9c2a172418ffa20
-  data.tar.gz: 48db9abfdc31f7900b0f32afdc9536fd2839efdf
+  metadata.gz: f6ea439e9c5de59ad623d0f2f90affb3ec5a4815
+  data.tar.gz: d95784f691b047b1dd58f324eecdc8157beb78b0
 SHA512:
-  metadata.gz: aa877e11f8c2037c68f9f01c9722101161163747e017e7be78606b56e7504d2a6bcbc253bb97144ab77c0d5ccd70a81a4323fe82ee2f0d4bc2b5d32ba79e21bb
-  data.tar.gz: 4e6d5c1f40b484fe1ac448fda62654756b17efbc1bb7a262a69229571de91a86512104e9aeec70a0f655259e2ba61e2971fcd0fb8f17f0672c10a04bfae08182
+  metadata.gz: 0f2e1c8b30834d532aaa245ab4aba2b01738712108ae7f00ce990db684c9a4821d7da21ce90ca8abdbc7e1eccecbcd6836ae19e0b9a014b6d2a49fb3ebb00cb8
+  data.tar.gz: 7c6975eb29de22545495a7e990970527b5794876ec360c8b776a1b26b2a2c57b82bf66deb55984b06cbf0f46213279edb59a774be3e552d2d2c2abb2ff407473

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
 gemfile:

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 3.0.8
+* Parent breadcrumbs can now also be inferred from models responding to `model_name`.
+
 ## Version 3.0.7
 * Pretext and posttext classes are now customizable with `<%= breadcrumbs pretext_class: "some-class" %>` and `<%= breadcrumbs posttext_class: "some-other-class" %>`.
 

data/README.md

@@ -8,23 +8,6 @@ Gretel also supports [semantic breadcrumbs](http://support.google.com/webmasters
 
 Have fun! And please do write, if you (dis)like it – [lassebunk@gmail.com](mailto:lassebunk@gmail.com).
 
-## New in version 3.0
-
-* Breadcrumbs can now be rendered in different styles like ul- and ol lists, and for use with the [Twitter Bootstrap](http://getbootstrap.com/) framework. See the `:style` option below for more info.
-* Defining breadcrumbs using `Gretel::Crumbs.layout do ... end` in an initializer has been removed. See below for details on how to upgrade.
-* The `:show_root_alone` option is now called `:display_single_fragment` and can be used to hide the breadcrumbs when there is only one link, also if it is not the root breadcrumb.
-  The old `:show_root_alone` option is still supported until Gretel version 4.0 and will show a deprecation warning when it's used.
-* Links yielded from `<%= breadcrumbs do |links| %>` now have a `current?` helper that returns true if the link is the last in the trail.
-* New view helper: `parent_breadcrumb` returns the parent breadcrumb link (with `#key`, `#text`, and `#url`). This can for example be used to create a dynamic back link.
-  You can supply options like `:autoroot` etc.
-  If you supply a block, it will yield the parent breadcrumb if it is present.
-* Breadcrumbs can now be inferred if you pass in an instance of an object that responds to `model_name` (like an ActiveRecord model instance). E.g. `breadcrumb @product` is short for `breadcrumb :product, @product`.
-
-
-I hope you find these changes as useful as I did – if you have more suggestions, please create an [Issue](https://github.com/lassebunk/gretel/issues) or [Pull Request](https://github.com/lassebunk/gretel/pulls).
-
-See below for more info or the [changelog](https://github.com/lassebunk/gretel/blob/master/CHANGELOG.md) for less significant changes.
-
 ## Installation
 
 In your *Gemfile*:
@@ -84,7 +67,7 @@ This will generate the following HTML (indented for readability):
 
 ```html
 <div class="breadcrumbs">
-  You are here:
+  <span class="pretext">You are here:</span>
   <a href="/">Home</a> &rsaquo;
   <a href="/issues">All issues</a> &rsaquo;
   <span class="current">My Issue</span>
@@ -147,7 +130,7 @@ end
 # Parent crumbs
 crumb :project_issues do |project|
   link "Issues", project_issues_path(project)
-  parent :project, project
+  parent project # inferred to :project
 end
 
 # Child 
@@ -160,7 +143,7 @@ end
 crumb :category do |category|
   link category.name, category
   if category.parent
-    parent :category, category.parent
+    parent category.parent # inferred to :category
   else
     parent :categories
   end
@@ -169,7 +152,7 @@ end
 # Product crumb with recursive parent categories (as defined above)
 crumb :product do |product|
   link product.name, product
-  parent :category, product.category
+  parent product.category # inferred to :category
 end
 
 # Crumb with multiple links
@@ -190,7 +173,7 @@ crumb :product do |product|
   if keyword = params[:q].presence
     parent :search, keyword
   else # default
-    parent :category, product.category
+    parent product.category # inferred to :category
   end
 end
 

data/lib/gretel/crumb.rb

@@ -3,6 +3,12 @@ module Gretel
     # Initializes a new crumb from the given +key+.
     # It finds the breadcrumb created in +Gretel::Crumbs.layout+ and renders the block using the arguments supplied in +args+.
     def initialize(context, key, *args)
+      if key.class.respond_to?(:model_name)
+        # Enables calling `breadcrumb @product` instead of `breadcrumb :product, @product`
+        args.unshift key
+        key = key.class.model_name.to_s.underscore.to_sym
+      end
+
       block = Gretel::Crumbs.crumbs[key]
       raise ArgumentError, "Breadcrumb :#{key} not found." unless block
       @key = key
@@ -38,6 +44,9 @@ module Gretel
     #
     # Example:
     #   parent :category, category
+    #
+    # Or short, which will infer the key from the model's `model_name`:
+    #   parent category
     def parent(*args)
       return @parent if args.empty?
       key = args.shift

data/lib/gretel/version.rb

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

data/lib/gretel/view_helpers.rb

@@ -10,10 +10,6 @@ module Gretel
     def breadcrumb(key = nil, *args)
       if key.nil? || key.is_a?(Hash)
         raise ArgumentError, "The `breadcrumb` method was called with #{key.inspect} as the key. This method is used to set the breadcrumb. Maybe you meant to call the `breadcrumbs` method (with an 's' in the end) which is used to render the breadcrumbs?"
-      elsif key.class.respond_to?(:model_name)
-        # Enables calling `breadcrumb @product` instead of `breadcrumb :product, @product`
-        args.unshift key
-        key = key.class.model_name.to_s.underscore.to_sym
       end
       @_gretel_renderer = Gretel::Renderer.new(self, key, *args)
     end

data/test/dummy/config/breadcrumbs/test_crumbs.rb

@@ -77,4 +77,9 @@ end
 crumb :with_link_options do
   link "Test", about_path, title: "My Title", other: "Other Option"
   link "Other Link", some_option: "Test"
+end
+
+crumb :with_inferred_parent do
+  link "Test", about_path
+  parent Project.first
 end

data/test/helper_methods_test.rb

@@ -318,6 +318,13 @@ class HelperMethodsTest < ActionView::TestCase
                  breadcrumbs.to_s
   end
 
+  test "inferred parent" do
+    breadcrumb :with_inferred_parent
+
+    assert_dom_equal %{<div class="breadcrumbs"><a href="/">Home</a> &rsaquo; <a href="/projects/1">Test Project</a> &rsaquo; <span class="current">Test</span></div>},
+                     breadcrumbs.to_s
+  end
+
   # Styles
 
   test "default style" do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: gretel
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Lasse Bunk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-08-23 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: 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
@@ -46,8 +46,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -127,17 +127,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.2
 signing_key: 
 specification_version: 4
 summary: Flexible Ruby on Rails breadcrumbs plugin.