bsm-breadcrumbs 0.3.2 → 0.3.3

data/lib/breadcrumbs/render/base.rb

@@ -37,7 +37,7 @@ class Breadcrumbs
       end
 
       def escape(text)
-        text.respond_to?(:html_safe?) && text.html_safe? ? text : CGI.escapeHTML(text)
+        text.respond_to?(:html_safe?) && text.html_safe? ? text : Rack::Utils.escape_html(text)
       end
     end
   end

data/lib/breadcrumbs/version.rb

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

metadata

@@ -1,116 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bsm-breadcrumbs
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.3
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Nando Vieira
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-16 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionpack
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &8433300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  prerelease: false
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *8433300
+- !ruby/object:Gem::Dependency
   name: activemodel
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &8430720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  prerelease: false
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  requirement: *id002
-description: Breadcrumbs is a simple plugin that adds a `breadcrumbs` object to controllers and views.
+  prerelease: false
+  version_requirements: *8430720
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &8422620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *8422620
+description: 
 email: dimitrij@blacksquaremedia.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
 - README.rdoc
-files: 
-- .bundle/config
-- Gemfile
-- Gemfile.lock
-- README.rdoc
-- Rakefile
-- bsm-breadcrumbs.gemspec
 - lib/breadcrumbs.rb
-- lib/breadcrumbs/action_controller_ext.rb
 - lib/breadcrumbs/render.rb
-- lib/breadcrumbs/render/base.rb
+- lib/breadcrumbs/action_controller_ext.rb
+- lib/breadcrumbs/version.rb
+- lib/breadcrumbs/render/ordered_list.rb
 - lib/breadcrumbs/render/inline.rb
+- lib/breadcrumbs/render/base.rb
 - lib/breadcrumbs/render/list.rb
-- lib/breadcrumbs/render/ordered_list.rb
-- lib/breadcrumbs/version.rb
-- test/breadcrumbs_test.rb
-- test/resources/en.yml
-- test/test_helper.rb
-has_rdoc: true
-homepage: http://github.com/bsm/breadcrumbs
+homepage: https://github.com/bsm/breadcrumbs
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.8.7
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Breadcrumbs is a simple plugin that adds a `breadcrumbs` object to controllers and views.
-test_files: 
-- test/breadcrumbs_test.rb
-- test/test_helper.rb
+summary: Breadcrumbs is a simple plugin that adds a `breadcrumbs` object to controllers
+  and views.
+test_files: []

data/.bundle/config

@@ -1,2 +0,0 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"

data/Gemfile

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

data/Gemfile.lock

@@ -1,38 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.3)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    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.2)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (~> 3.0.0)
-  activemodel (~> 3.0.0)
-  test-unit

data/Rakefile

@@ -1,38 +0,0 @@
-require "jeweler"
-require "rake/testtask"
-require "rake/rdoctask"
-require "lib/breadcrumbs/version"
-
-task :default => :test
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.verbose = true
-end
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.main = "README.rdoc"
-  rdoc.rdoc_dir = "doc"
-  rdoc.title = "Breadcrumbs"
-  rdoc.options += %w[ --line-numbers --inline-source --charset utf-8 ]
-  rdoc.rdoc_files.include("README.rdoc")
-  rdoc.rdoc_files.include("lib/**/*.rb")
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "bsm-breadcrumbs"
-    gem.email = "dimitrij@blacksquaremedia.com"
-    gem.homepage = "http://github.com/bsm/breadcrumbs"
-    gem.authors = ["Nando Vieira", "Dimitrij Denissenko"]
-    gem.version = Breadcrumbs::Version::STRING
-    gem.summary = "Breadcrumbs is a simple plugin that adds a `breadcrumbs` object to controllers and views."
-    gem.description = "Breadcrumbs is a simple plugin that adds a `breadcrumbs` object to controllers and views."
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/bsm-breadcrumbs.gemspec

@@ -1,61 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{bsm-breadcrumbs}
-  s.version = "0.3.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nando Vieira", "Dimitrij Denissenko"]
-  s.date = %q{2011-02-16}
-  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 = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".bundle/config",
-    "Gemfile",
-    "Gemfile.lock",
-    "README.rdoc",
-    "Rakefile",
-    "bsm-breadcrumbs.gemspec",
-    "lib/breadcrumbs.rb",
-    "lib/breadcrumbs/action_controller_ext.rb",
-    "lib/breadcrumbs/render.rb",
-    "lib/breadcrumbs/render/base.rb",
-    "lib/breadcrumbs/render/inline.rb",
-    "lib/breadcrumbs/render/list.rb",
-    "lib/breadcrumbs/render/ordered_list.rb",
-    "lib/breadcrumbs/version.rb",
-    "test/breadcrumbs_test.rb",
-    "test/resources/en.yml",
-    "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/bsm/breadcrumbs}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
-  s.summary = %q{Breadcrumbs is a simple plugin that adds a `breadcrumbs` object to controllers and views.}
-  s.test_files = [
-    "test/breadcrumbs_test.rb",
-    "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
-    else
-      s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
-      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-    end
-  else
-    s.add_dependency(%q<actionpack>, ["~> 3.0.0"])
-    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-  end
-end
-

data/test/breadcrumbs_test.rb

@@ -1,243 +0,0 @@
-require "test_helper"
-
-class BreadcrumbsTest < Test::Unit::TestCase
-
-  def setup
-    @controller = TestsController.new
-    @controller.request = ActionController::TestRequest.new
-    @breadcrumbs = Breadcrumbs.new(@controller)
-    @inline = Breadcrumbs::Render::Inline.new(@breadcrumbs)
-  end
-
-  def test_return_safe_html
-    @breadcrumbs.add "Terms & Conditions"
-    assert_equal %(<span class="first last item-0">Terms &amp; Conditions</span>), @breadcrumbs.render(:format => :inline)
-  end
-
-  def test_allow_custom_text_escaping
-    @breadcrumbs.add "<em>Home</em>".html_safe
-    html = @breadcrumbs.render(:format => :inline)
-    assert_equal %(<span class="first last item-0"><em>Home</em></span>), html
-  end
-
-  def test_add_item
-    @breadcrumbs.add "Home"
-    assert_equal 1, @breadcrumbs.count
-
-    @breadcrumbs << "Home"
-    assert_equal 2, @breadcrumbs.count
-  end
-
-  def test_add_empty_item # Just in case, we generate the label
-    @breadcrumbs.add ""
-    assert_equal 1, @breadcrumbs.count
-  end
-
-  def test_tag
-    assert_equal "<span>Hi!</span>", @inline.tag(:span, "Hi!")
-  end
-
-  def test_tag_with_attributes
-    expected = %[<span class="greetings" id="hi">Hi!</span>]
-    assert_equal expected, @inline.tag(:span, "Hi!", :class => "greetings", :id => "hi")
-  end
-
-  def test_tag_with_block
-    assert_equal "<span>Hi!</span>", @inline.tag(:span) { "Hi!" }
-  end
-
-  def test_tag_with_block_and_attributes
-    expected = %[<span class="greetings" id="hi">Hi!</span>]
-    assert_equal expected, @inline.tag(:span, :class => "greetings", :id => "hi") { "Hi!" }
-  end
-
-  def test_nested_tags
-    expected = %[<span class="greetings"><strong id="hi">Hi!</strong></span>]
-    actual = @inline.tag(:span, :class => "greetings") { tag(:strong, "Hi!", :id => "hi") }
-    assert_equal expected, actual
-  end
-
-  def test_render_as_list
-    @breadcrumbs.add "Home", "/", :class => "home"
-    list = parse_tag(@breadcrumbs.render)
-    assert_equal "ul", list.name
-    assert_equal "breadcrumbs", list['class']
-  end
-
-  def test_render_as_ordered_list
-    @breadcrumbs.add "Home", "/"
-    list = parse_tag(@breadcrumbs.render(:format => :ordered_list))
-    assert_equal "ol", list.name
-    assert_equal "breadcrumbs", list['class']
-  end
-
-  def test_render_as_list_with_custom_attributes
-    @breadcrumbs.add "Home", "/", :class => "home"
-    ul = parse_tag(@breadcrumbs.render(:id => "breadcrumbs", :class => "top"))
-    assert_equal "ul", ul.name
-    assert_equal "top", ul['class']
-    assert_equal "breadcrumbs", ul['id']
-  end
-
-  def test_render_as_list_add_items
-    @breadcrumbs.add "Home", "/", :class => "home"
-    @breadcrumbs.add "About", "/about", :class => "about"
-    @breadcrumbs.add "People"
-
-    ul = parse_tag(@breadcrumbs.render)
-    items = ul.children
-
-    assert_equal 3, items.count
-
-    assert_equal "first item-0", items[0]["class"]
-    assert_equal %(<a href="/" class="home">Home</a>), items[0].children.join
-
-    assert_equal "item-1", items[1]["class"]
-    assert_equal %(<a href="/about" class="about">About</a>), items[1].children.join
-
-    assert_equal "last item-2", items[2]["class"]
-    assert_equal %(<span>People</span>), items[2].children.join
-  end
-
-  def test_render_inline
-    @breadcrumbs.add "Home", "/", :class => "home"
-    item = parse_tag(@breadcrumbs.render(:format => :inline))
-    assert_not_equal 'ul', item.name
-  end
-
-  def test_render_inline_add_items
-    @breadcrumbs.add "Home", "/", :class => "home"
-    @breadcrumbs.add "About", "/about", :class => "about"
-    @breadcrumbs.add "People"
-
-    items = parse_tags(@breadcrumbs.render(:format => :inline))
-    assert_equal 5, items.count
-
-    assert_equal "a", items[0].name
-    assert_equal "home first item-0", items[0]["class"]
-    assert_equal "Home", items[0].children.join
-    assert_equal "/", items[0]["href"]
-
-    assert_equal "span", items[1].name
-    assert_equal "separator", items[1]["class"]
-    assert_equal "&#187;", items[1].children.join
-
-    assert_equal "a", items[2].name
-    assert_equal "about item-1", items[2]["class"]
-    assert_equal "About", items[2].children.join
-    assert_equal "/about", items[2]["href"]
-
-    assert_equal "span", items[3].name
-    assert_equal "separator", items[3]["class"]
-    assert_equal "&#187;", items[3].children.join
-
-    assert_equal "span", items[4].name
-    assert_equal "last item-2", items[4]["class"]
-    assert_equal "People", items[4].children.join
-  end
-
-  def test_render_inline_with_custom_separator
-    @breadcrumbs.add "Home", "/", :class => "home"
-    @breadcrumbs.add "People"
-
-    tags = parse_tags(@breadcrumbs.render(:format => :inline, :separator => "|"))
-    assert_equal [
-      %(<a href="/" class="home first item-0">Home</a>),
-      %(<span class="separator">|</span>),
-      %(<span class="last item-1">People</span>)
-    ], tags.map(&:to_s)
-  end
-
-  def test_render_original_text_when_disabling_translation
-    @breadcrumbs.add :home, nil, :i18n => false
-    @breadcrumbs.add :people
-
-    items = parse_tag(@breadcrumbs.render).children
-    assert_equal "<span>home</span>", items[0].children.join
-    assert_equal "<span>Our team</span>", items[1].children.join
-  end
-
-  def test_render_internationalized_text_using_default_scope
-    @breadcrumbs.add :home
-    @breadcrumbs.add :people
-
-    items = parse_tag(@breadcrumbs.render).children
-    assert_equal "<span>Home page</span>", items[0].children.join
-    assert_equal "<span>Our team</span>", items[1].children.join
-  end
-
-  def test_render_with_string_is_not_translated
-    @breadcrumbs.add 'home'
-    items = parse_tag(@breadcrumbs.render).children
-    assert_equal "<span>home</span>", items[0].children.join
-  end
-  
-  def test_render_scope_as_text_for_missing_scope
-    @breadcrumbs.add :contact
-    @breadcrumbs.add "Help"
-
-    items = parse_tag(@breadcrumbs.render).children
-    assert_equal "<span>contact</span>", items[0].children.join
-    assert_equal "<span>Help</span>", items[1].children.join
-  end
-
-  def test_pimp_action_controller
-    assert @controller.respond_to?(:breadcrumbs)
-    assert_equal @controller.breadcrumbs, @controller.breadcrumbs
-  end
-
-  def test_escape_text_when_rendering_inline
-    @breadcrumbs.add "<script>alert(1)</script>"
-    html = @breadcrumbs.render(:format => :inline)
-
-    assert_equal %[<span class="first last item-0">&lt;script&gt;alert(1)&lt;/script&gt;</span>], html
-  end
-
-  def test_escape_text_when_rendering_list
-    @breadcrumbs.add "<script>alert(1)</script>"
-    html = @breadcrumbs.render
-
-    assert_match /&lt;script&gt;alert\(1\)&lt;\/script&gt;/, html
-  end
-
-  def test_with_polymorphic_urls
-    @breadcrumbs.add "Resources", [:tests]
-    prefix  = "#{@controller.request.scheme}://#{@controller.request.host}"
-    tag     = parse_tag(@breadcrumbs.render(:format => :inline))
-
-    assert_equal "a", tag.name
-    assert_equal "first last item-0", tag['class']
-    assert_equal "#{prefix}/tests", tag['href']
-    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)
-      tag.children.reject! do |child|
-        child.tag? ? (reject_blanks!(child) && false) : child.to_s.blank?
-      end
-    end
-
-    def parse_tags(html)
-      root = HTML::Document.new(html, true, true).root
-      reject_blanks!(root)
-      root.children
-    end
-
-    def parse_tag(html)
-      parse_tags(html).first
-    end
-end

data/test/resources/en.yml

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

data/test/test_helper.rb

@@ -1,43 +0,0 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-Bundler.require :default, :test
-
-require 'test/unit'
-require "breadcrumbs"
-require 'action_controller'
-require 'action_controller/test_case'
-require 'active_model/naming'
-
-I18n.load_path << File.dirname(__FILE__) + "/resources/en.yml"
-I18n.locale = :en
-
-class TestsController < ActionController::Base
-end
-
-class UsersController < ActionController::Base
-end
-
-module Admin
-  class UsersController < ActionController::Base
-  end
-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