breadcrumbs_on_rails 2.2.0 → 2.3.0

data/.gitignore

@@ -1,3 +1,8 @@
+# Bundler
 .bundle
-pkg
-yardoc
+pkg/*
+Gemfile.lock
+
+# YARD
+.yardoc
+yardoc/

data/.rvmrc

@@ -0,0 +1 @@
+rvm use @breadcrumbs_on_rails --create

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 
 
+## Release 2.3.0
+
+* FIXED: In some circumstances the BreadcrumbsOnRails::ActionController::HelperMethods is not mixed into the controller.
+
+* FIXED: Breadcrumbs now accepts a polymorphic path (GH-15).
+
+* CHANGED: Second argument on `add_breadcrumb` is now optional (GH-6, GH-32). [Thanks @mpartel]
+
+* CHANGED: Breadcrumb path computation fallbacks to url_for in case of unknown arguments.
+
+
 ## Release 2.2.0
 
 * NEW: Support for Rails 3.2.

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 Simone Carletti
+Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 
 MIT License
 

data/breadcrumbs_on_rails.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = "breadcrumbs_on_rails"
-  s.version = "2.2.0"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = "2012-02-03"
+  s.date = "2012-12-25"
   s.description = "BreadcrumbsOnRails is a simple Ruby on Rails plugin for creating and managing a breadcrumb navigation for a Rails project."
   s.email = "weppos@weppos.net"
-  s.files = [".gitignore", ".travis.yml", "Appraisals", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "Rakefile", "breadcrumbs_on_rails.gemspec", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "init.rb", "lib/breadcrumbs_on_rails.rb", "lib/breadcrumbs_on_rails/action_controller.rb", "lib/breadcrumbs_on_rails/breadcrumbs.rb", "lib/breadcrumbs_on_rails/railtie.rb", "lib/breadcrumbs_on_rails/version.rb", "test/test_helper.rb", "test/unit/builder_test.rb", "test/unit/element_test.rb", "test/unit/simple_builder_test.rb"]
+  s.files = [".gitignore", ".rvmrc", ".travis.yml", "Appraisals", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "breadcrumbs_on_rails.gemspec", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "init.rb", "lib/breadcrumbs_on_rails.rb", "lib/breadcrumbs_on_rails/action_controller.rb", "lib/breadcrumbs_on_rails/breadcrumbs.rb", "lib/breadcrumbs_on_rails/railtie.rb", "lib/breadcrumbs_on_rails/version.rb", "test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/builder_test.rb", "test/unit/element_test.rb", "test/unit/simple_builder_test.rb", "test/views/example/default.html.erb"]
   s.homepage = "http://www.simonecarletti.com/code/breadcrumbs_on_rails"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "A simple Ruby on Rails plugin for creating and managing a breadcrumb navigation."
-  s.test_files = ["test/test_helper.rb", "test/unit/builder_test.rb", "test/unit/element_test.rb", "test/unit/simple_builder_test.rb"]
+  s.test_files = ["test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/builder_test.rb", "test/unit/element_test.rb", "test/unit/simple_builder_test.rb", "test/views/example/default.html.erb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/breadcrumbs_on_rails/action_controller.rb

@@ -19,7 +19,7 @@ module BreadcrumbsOnRails
 
     protected
 
-    def add_breadcrumb(name, path, options = {})
+    def add_breadcrumb(name, path = nil, options = {})
       self.breadcrumbs << Breadcrumbs::Element.new(name, path, options)
     end
 
@@ -60,7 +60,7 @@ module BreadcrumbsOnRails
 
     module ClassMethods
 
-      def add_breadcrumb(name, path, filter_options = {})
+      def add_breadcrumb(name, path = nil, filter_options = {})
         # This isn't really nice here
         if eval = Utils.convert_to_set_of_strings(filter_options.delete(:eval), %w(name path))
           name = Utils.instance_proc(name) if eval.include?("name")

data/lib/breadcrumbs_on_rails/breadcrumbs.rb

@@ -61,10 +61,8 @@ module BreadcrumbsOnRails
             @context.send(path)
           when Proc
             path.call(@context)
-          when Hash
-            @context.url_for(path)
           else
-            path.to_s
+            @context.url_for(path)
           end
         end
 
@@ -87,7 +85,11 @@ module BreadcrumbsOnRails
       end
 
       def render_element(element)
-        content = @context.link_to_unless_current(compute_name(element), compute_path(element), element.options)
+        if element.path == nil
+          content = compute_name(element)
+        else
+          content = @context.link_to_unless_current(compute_name(element), compute_path(element), element.options)
+        end
         if @options[:tag]
           @context.content_tag(@options[:tag], content)
         else
@@ -116,7 +118,7 @@ module BreadcrumbsOnRails
       # @param  [Hash] options The element/link URL.
       # @return [Element]
       #
-      def initialize(name, path, options = {})
+      def initialize(name, path = nil, options = {})
         self.name     = name
         self.path     = path
         self.options  = options

data/lib/breadcrumbs_on_rails/railtie.rb

@@ -10,11 +10,10 @@ module BreadcrumbsOnRails
 
   class Railtie < Rails::Railtie
     initializer "breadcrumbs_on_rails.initialize" do
+      ActiveSupport.on_load(:action_controller) do
+        include BreadcrumbsOnRails::ActionController
+      end
     end
   end
 
 end
-
-ActiveSupport.on_load(:action_controller) do
-  include BreadcrumbsOnRails::ActionController
-end

data/lib/breadcrumbs_on_rails/version.rb

@@ -10,7 +10,7 @@ module BreadcrumbsOnRails
 
   module Version
     MAJOR = 2
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
     BUILD = nil
 

data/test/dummy.rb

@@ -0,0 +1,41 @@
+ENV["RAILS_ENV"] = "test"
+
+require "active_support"
+require "action_controller"
+require "rails/railtie"
+
+
+class Dummy
+  Routes = ActionDispatch::Routing::RouteSet.new
+  Routes.draw do
+    match ':controller(/:action(/:id))'
+  end
+end
+
+ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
+ActionController::Base.send :include, Dummy::Routes.url_helpers
+
+class ActiveSupport::TestCase
+
+  setup do
+    @routes = Dummy::Routes
+  end
+
+
+  def controller
+    @controller_proxy ||= ControllerProxy.new(@controller)
+  end
+
+  class ControllerProxy
+    def initialize(controller)
+      @controller = controller
+    end
+    def method_missing(method, *args)
+      @controller.instance_eval do
+        m = method(method)
+        m.call(*args)
+      end
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -1,20 +1,6 @@
 require 'test/unit'
 require 'mocha'
-
-ENV["RAILS_ENV"] = "test"
-
-require "active_support"
-require "action_controller"
-require "rails/railtie"
+require 'dummy'
 
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'breadcrumbs_on_rails'
-
-ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
-
-BreadcrumbsOnRails::Routes = ActionDispatch::Routing::RouteSet.new
-BreadcrumbsOnRails::Routes.draw do
-  match ':controller(/:action(/:id))'
-end
-
-ActionController::Base.send :include, BreadcrumbsOnRails::Routes.url_helpers

data/test/unit/action_controller_test.rb

@@ -0,0 +1,72 @@
+require 'test_helper'
+
+
+class ExampleController < ActionController::Base
+  include BreadcrumbsOnRails::ActionController
+
+  def self.controller_name; "example"; end
+  def self.controller_path; "example"; end
+
+  layout false
+
+  def action_default
+    execute("action_default")
+  end
+
+  def action_compute_paths
+    add_breadcrumb "String", "/"
+    add_breadcrumb "Proc", proc { |c| "/?proc" }
+    add_breadcrumb "Polymorfic", [:admin, :namespace]
+    execute("action_default")
+  end
+
+
+  private
+
+  def execute(method)
+    if method.to_s =~ /^action_(.*)/
+      render :action => (params[:template] || 'default')
+    end
+  end
+
+  def admin_namespace_path(*)
+    "/?polymorfic"
+  end
+  helper_method :admin_namespace_path
+
+end
+
+class ExampleControllerTest < ActionController::TestCase
+  tests ExampleController
+
+  def test_render_default
+    get :action_default
+    assert_dom_equal  %(),
+                      @response.body
+  end
+
+  def test_render_compute_paths
+    get :action_compute_paths
+    assert_dom_equal  %(<a href="/">String</a> &raquo; <a href="/?proc">Proc</a> &raquo; <a href="/?polymorfic">Polymorfic</a>),
+                      @response.body
+  end
+
+end
+
+class ExampleHelpersTest < ActionView::TestCase
+  tests BreadcrumbsOnRails::ActionController::HelperMethods
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::UrlHelper
+
+  attr_accessor :breadcrumbs
+
+  setup do
+    self.breadcrumbs = []
+  end
+
+  def test_render_breadcrumbs
+    assert_dom_equal '', render_breadcrumbs
+  end
+
+end
+

data/test/unit/builder_test.rb

@@ -81,7 +81,12 @@ class BuilderTest < ActionView::TestCase
 
 
   def url_for(params)
-    "http://localhost?" + params.to_param
+    case params
+    when String
+      params
+    else
+      "http://localhost?" + params.to_param
+    end
   end
 
   protected

data/test/unit/element_test.rb

@@ -2,10 +2,9 @@ require 'test_helper'
 
 class ElementTest < ActiveSupport::TestCase
 
-  def test_initialize_should_require_name_and_path
+  def test_initialize_should_require_name
     assert_raise(ArgumentError) { BreadcrumbsOnRails::Breadcrumbs::Element.new }
-    assert_raise(ArgumentError) { BreadcrumbsOnRails::Breadcrumbs::Element.new(nil) }
-    assert_nothing_raised { BreadcrumbsOnRails::Breadcrumbs::Element.new(nil, nil) }
+    assert_nothing_raised { BreadcrumbsOnRails::Breadcrumbs::Element.new(nil) }
   end
 
   def test_initialize_should_set_name
@@ -41,5 +40,10 @@ class ElementTest < ActiveSupport::TestCase
     element.options = { :title => "Go to the Homepage" }
     assert_equal({ :title => "Go to the Homepage" }, element.options)
   end
+  
+  def test_path_is_optional
+    element = BreadcrumbsOnRails::Breadcrumbs::Element.new(:homepage)
+    assert_nil element.path
+  end
 
 end

data/test/unit/simple_builder_test.rb

@@ -52,6 +52,14 @@ class SimpleBuilderTest < ActionView::TestCase
                      simplebuilder(@template, generate_elements(2)).render)
   end
 
+  def test_render_with_no_links
+    elements = (1..2).collect do |index|
+      BreadcrumbsOnRails::Breadcrumbs::Element.new("Element #{index}", nil)
+    end
+    assert_dom_equal("Element 1 &raquo; Element 2",
+                     simplebuilder(@template, elements).render)
+  end
+
 
   protected
 

data/test/views/example/default.html.erb

@@ -0,0 +1 @@
+<%= render_breadcrumbs %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: breadcrumbs_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70311920950420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70311920950420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70311920948980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70311920948980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70311920940920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70311920940920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70311920940160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70311920940160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: BreadcrumbsOnRails is a simple Ruby on Rails plugin for creating and
   managing a breadcrumb navigation for a Rails project.
 email: weppos@weppos.net
@@ -63,12 +83,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - .travis.yml
 - Appraisals
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - breadcrumbs_on_rails.gemspec
@@ -84,10 +104,13 @@ files:
 - lib/breadcrumbs_on_rails/breadcrumbs.rb
 - lib/breadcrumbs_on_rails/railtie.rb
 - lib/breadcrumbs_on_rails/version.rb
+- test/dummy.rb
 - test/test_helper.rb
+- test/unit/action_controller_test.rb
 - test/unit/builder_test.rb
 - test/unit/element_test.rb
 - test/unit/simple_builder_test.rb
+- test/views/example/default.html.erb
 homepage: http://www.simonecarletti.com/code/breadcrumbs_on_rails
 licenses: []
 post_install_message: 
@@ -108,12 +131,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple Ruby on Rails plugin for creating and managing a breadcrumb navigation.
 test_files:
+- test/dummy.rb
 - test/test_helper.rb
+- test/unit/action_controller_test.rb
 - test/unit/builder_test.rb
 - test/unit/element_test.rb
 - test/unit/simple_builder_test.rb
+- test/views/example/default.html.erb

data/Gemfile.lock

@@ -1,99 +0,0 @@
-PATH
-  remote: .
-  specs:
-    breadcrumbs_on_rails (2.2.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.4.0)
-      bundler
-      rake
-    arel (3.0.0)
-    builder (3.0.0)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.1)
-    json (1.6.5)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    mocha (0.9.12)
-    multi_json (1.0.4)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
-      bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    sprockets (2.1.2)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    yard (0.7.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  breadcrumbs_on_rails!
-  mocha (~> 0.9.10)
-  rails (>= 3.0)
-  yard