bsm-breadcrumbs 0.2.1 → 0.3.0

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "actionpack", '~> 3.0.0'
+gem "activemodel", '~> 3.0.0'
 
 group :test do
   gem "test-unit"

data/Gemfile.lock

@@ -2,31 +2,31 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.1)
+      i18n (~> 0.4)
+    activesupport (3.0.3)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.2)
+    i18n (0.5.0)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    test-unit (2.1.1)
+    test-unit (2.1.2)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -34,4 +34,5 @@ PLATFORMS
 
 DEPENDENCIES
   actionpack (~> 3.0.0)
+  activemodel (~> 3.0.0)
   test-unit

data/bsm-breadcrumbs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bsm-breadcrumbs}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira", "Dimitrij Denissenko"]
-  s.date = %q{2010-11-11}
+  s.date = %q{2010-12-13}
   s.description = %q{Breadcrumbs is a simple plugin that adds a `breadcrumbs` object to controllers and views.}
   s.email = %q{dimitrij@blacksquaremedia.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
      "lib/breadcrumbs/render/ordered_list.rb",
      "lib/breadcrumbs/version.rb",
      "test/breadcrumbs_test.rb",
-     "test/resources/pt.yml",
+     "test/resources/en.yml",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/bsm/breadcrumbs}

data/lib/breadcrumbs.rb

@@ -5,10 +5,10 @@ class Breadcrumbs < Array
   autoload :Render, "breadcrumbs/render"
   autoload :Version, "breadcrumbs/version"
 
-  attr_accessor :controller, :items
+  attr_reader :controller
 
   def initialize(controller) # :nodoc:
-    self.controller = controller
+    @controller = controller
     super([])
   end
 
@@ -27,9 +27,41 @@ class Breadcrumbs < Array
     url  = controller.__send__(:url_for, url) if url
     push [text.to_s, url, options]
   end
-
   alias :<< :add
 
+  # Short-cut for adding breadcrumbs. Examples:
+  #
+  #   breadcrumbs.crumb :posts
+  #   # => ["Posts", "/posts"]
+  #
+  #   breadcrumbs.crumb @post, :comments
+  #   # => ["Comments", "/posts/123/comments"]
+  #
+  #   @user # => #<User name: "Sam">
+  #   breadcrumbs.crumb :admin, @account, @user
+  #   # => ["Sam", "/admin/accounts/123/users/456"]
+  #
+  #   breadcrumbs.crumb @post, :comments, :title => "Our Comments"
+  #   # => ["Our Comments", "/posts/123/comments"]
+  #
+  def crumb(*args)
+    options = args.extract_options!
+
+    title = if options[:title]
+      options.delete(:title)
+    else
+      case args.last
+      when String, Symbol
+        infer_model_name_from_symbol(args.last).human(:count => :multiple)
+      else
+        infer_title_from_record(args.last)
+      end
+    end
+    url = args.presence || false
+
+    add title.presence, options.delete(:url) || url, options
+  end
+
   # Render breadcrumbs using the specified format.
   # Use HTML lists by default, but can be plain links.
   #
@@ -69,6 +101,19 @@ class Breadcrumbs < Array
     text ||= I18n.t(scope, :default => scope.to_s)
     text
   end
+
+  private
+
+    def infer_model_name_from_symbol(symbol)
+      symbol.to_s.classify.constantize.model_name
+    end
+
+    def infer_title_from_record(record)
+      %w(to_label title_was title name_was name label_was label value_was value to_s).each do |m|
+        return record.send(m) if record.respond_to?(m)
+      end
+    end
+
 end
 
-require "breadcrumbs/action_controller_ext"
+require "breadcrumbs/action_controller_ext"

data/lib/breadcrumbs/version.rb

@@ -1,8 +1,8 @@
 class Breadcrumbs
   module Version # :nodoc: all
     MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/breadcrumbs_test.rb

@@ -149,7 +149,7 @@ class BreadcrumbsTest < Test::Unit::TestCase
 
     items = parse_tag(@breadcrumbs.render).children
     assert_equal "<span>home</span>", items[0].children.join
-    assert_equal "<span>Nosso time</span>", items[1].children.join
+    assert_equal "<span>Our team</span>", items[1].children.join
   end
 
   def test_render_internationalized_text_using_default_scope
@@ -157,8 +157,8 @@ class BreadcrumbsTest < Test::Unit::TestCase
     @breadcrumbs.add :people
 
     items = parse_tag(@breadcrumbs.render).children
-    assert_equal "<span>Página inicial</span>", items[0].children.join
-    assert_equal "<span>Nosso time</span>", items[1].children.join
+    assert_equal "<span>Home page</span>", items[0].children.join
+    assert_equal "<span>Our team</span>", items[1].children.join
   end
 
   def test_render_scope_as_text_for_missing_scope
@@ -200,6 +200,18 @@ class BreadcrumbsTest < Test::Unit::TestCase
     assert_equal "Resources", tag.children.join
   end
 
+  def test_crumb_shortcuts
+    @breadcrumbs.crumb :users
+    @breadcrumbs.crumb :users, :title => "Custom"
+    @breadcrumbs.crumb :admin, :users
+    @breadcrumbs.crumb :admin, User.new
+
+    assert_equal ["Users", "http://test.host/users", {}], @breadcrumbs[0]
+    assert_equal ["Custom", "http://test.host/users", {}], @breadcrumbs[1]
+    assert_equal ["Users", "http://test.host/admin/users", {}], @breadcrumbs[2]
+    assert_equal ["Sam", "http://test.host/admin/users/123", {}], @breadcrumbs[3]
+  end
+
   private
 
     def reject_blanks!(tag)

data/test/resources/en.yml

@@ -0,0 +1,12 @@
+en:
+  activemodel:
+    models:
+      user:
+        one: User
+        other: Users
+
+  people: "Our team"
+
+  breadcrumbs:
+    home: "Home page"
+    about: "About us"

data/test/test_helper.rb

@@ -7,21 +7,37 @@ require 'test/unit'
 require "breadcrumbs"
 require 'action_controller'
 require 'action_controller/test_case'
+require 'active_model/naming'
 
-I18n.load_path << File.dirname(__FILE__) + "/resources/pt.yml"
-I18n.locale = :pt
+I18n.load_path << File.dirname(__FILE__) + "/resources/en.yml"
+I18n.locale = :en
 
 class TestsController < ActionController::Base
 end
 
-if ActionPack::VERSION::MAJOR == 3
-  routes = ActionDispatch::Routing::RouteSet.new
-  routes.draw do
-    resources :tests
+class UsersController < ActionController::Base
+end
+
+module Admin
+  class UsersController < ActionController::Base
   end
-  TestsController.send(:include, routes.url_helpers)
-else
-  ActionController::Routing::Routes.draw do |map|
-    map.resources :tests
+end
+
+routes = ActionDispatch::Routing::RouteSet.new
+routes.draw do
+  resources :tests
+  resources :users
+  namespace :admin do
+    resources :users
   end
 end
+TestsController.send(:include, routes.url_helpers)
+
+class User
+  extend ActiveModel::Naming
+  extend ActiveModel::Translation
+
+  def to_param; "123" end
+  def name_was; "Sam" end
+  def name; "" end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bsm-breadcrumbs
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nando Vieira
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +00:00
+date: 2010-12-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ files:
 - lib/breadcrumbs/render/ordered_list.rb
 - lib/breadcrumbs/version.rb
 - test/breadcrumbs_test.rb
-- test/resources/pt.yml
+- test/resources/en.yml
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/bsm/breadcrumbs

data/test/resources/pt.yml

@@ -1,6 +0,0 @@
-pt:
-  people: "Nosso time"
-
-  breadcrumbs:
-    home: "Página inicial"
-    about: "Sobre"