Skip to content

Commit

Permalink
Makes generated markup html safe
Browse files Browse the repository at this point in the history
  • Loading branch information
arfl committed Jul 20, 2011
1 parent 821f76b commit 59adc18
Show file tree
Hide file tree
Showing 19 changed files with 42 additions and 297 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.gem
.bundle
Gemfile.lock
pkg/*
.rvmrc
1 change: 1 addition & 0 deletions .rvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rvm ree@breadcrumb --create
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source "http://rubygems.org"

# Specify your gem's dependencies in breadcrumb.gemspec
gemspec
11 changes: 0 additions & 11 deletions History.txt

This file was deleted.

15 changes: 0 additions & 15 deletions Manifest.txt

This file was deleted.

7 changes: 0 additions & 7 deletions PostInstall.txt

This file was deleted.

48 changes: 0 additions & 48 deletions README.rdoc

This file was deleted.

34 changes: 1 addition & 33 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,33 +1 @@
require 'rubygems'
gem 'hoe', '>= 2.1.0'
require 'hoe'
require 'fileutils'
require './lib/breadcrumb'

Hoe.plugin :newgem
# delete broken Hoe plugins
Hoe.plugins.delete :rubyforge
Hoe.plugins.delete :test

# Generate all the Rake tasks
# Run 'rake -T' to see list of generated tasks (from gem root directory)
$hoe = Hoe.spec 'breadcrumb' do
self.developer 'Caroo GmbH Development', 'dev@pkw.de'
self.extra_deps = [['activesupport', "~> 2.3"],['actionpack', "~> 2.3"]]
self.extra_dev_deps = [['test-unit']]
end

require 'newgem/tasks'
Dir['tasks/**/*.rake'].each { |t| load t }

# use rake test task instead of the broken hoe plugin
desc "Run unit tests"
Rake::TestTask.new(:test) do |t|
t.libs << 'test'
t.ruby_opts << "-rubygems"
t.test_files = FileList['test/*_test.rb']
t.verbose = true
t.warning = true
end
# set default task to test
task :default => [:test]
require 'bundler/gem_tasks'
52 changes: 18 additions & 34 deletions breadcrumb.gemspec
Original file line number Diff line number Diff line change
@@ -1,40 +1,24 @@
# -*- encoding: utf-8 -*-
$:.push File.expand_path("../lib", __FILE__)
require "breadcrumb/version"

Gem::Specification.new do |s|
s.name = %q{breadcrumb}
s.version = "0.2.0"
s.name = "breadcrumb"
s.version = Breadcrumb::VERSION
s.authors = ["pkw.de dev team"]
s.email = ["dev@pkw.de"]
s.homepage = ""
s.summary = %q{Generates breadcrumb markup}
s.description = %q{Generates breadcrumb markup}

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Caroo GmbH Development"]
s.date = %q{2010-09-15}
s.description = %q{FIX (describe your package)}
s.email = ["dev@pkw.de"]
s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "breadcrumb.gemspec", "lib/breadcrumb.rb", "lib/breadcrumb/controller_methods.rb", "lib/breadcrumb/view_helper.rb", "script/console", "script/destroy", "script/generate", "test/controller_methods_test.rb", "test/test_helper.rb", "test/view_helper_test.rb"]
s.homepage = %q{http://github.com/#{github_username}/#{project_name}}
s.rdoc_options = ["--main", "README.rdoc"]
s.require_paths = ["lib"]
s.rubyforge_project = %q{breadcrumb}
s.rubygems_version = %q{1.3.7}
s.summary = %q{FIX (describe your package)}
s.test_files = ["test/test_helper.rb"]

if s.respond_to? :specification_version then
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<actionpack>, [">= 0"])
s.add_development_dependency(%q<test-unit>, [">= 0"])
s.add_development_dependency(%q<hoe>, [">= 2.6.1"])
else
s.add_dependency(%q<actionpack>, [">= 0"])
s.add_dependency(%q<test-unit>, [">= 0"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
end
else
s.add_dependency(%q<actionpack>, [">= 0"])
s.add_dependency(%q<test-unit>, [">= 0"])
s.add_dependency(%q<hoe>, [">= 2.6.1"])
end
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency "actionpack", '>= 3.0'
s.add_dependency "railties", '>= 3.0'
s.add_development_dependency 'rake'
s.add_development_dependency 'test-unit'
end
13 changes: 5 additions & 8 deletions lib/breadcrumb.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
$:.unshift(File.dirname(__FILE__)) unless
$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))

require File.join(File.dirname(__FILE__), "breadcrumb", "view_helper")
require File.join(File.dirname(__FILE__), "breadcrumb", "controller_methods")

require "breadcrumb/version"
require "breadcrumb/view_helper"
require "breadcrumb/controller_methods"
require "action_view"


module Breadcrumb
VERSION = '0.2.0'
end
# Your code goes here...
end
6 changes: 3 additions & 3 deletions lib/breadcrumb/controller_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ def add_breadcrumb(name, url, options = {})
before_filter options do |controller|
if options[:params] and options[:params].is_a?(Array)
if controller.params[options[:params].first] and controller.params[options[:params].first] == options[:params].last
controller.send(:add_breadcrumb, name, url)
controller.add_breadcrumb(name, url)
end
else
controller.send(:add_breadcrumb, name, url)
controller.add_breadcrumb(name, url)
end
end
end

def reset_breadcrumbs
before_filter do |controller|
controller.send(:reset_breadcrumbs)
controller.reset_breadcrumbs
end
end
end
Expand Down
3 changes: 3 additions & 0 deletions lib/breadcrumb/version.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module Breadcrumb
VERSION = "0.3.0"
end
4 changes: 2 additions & 2 deletions lib/breadcrumb/view_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module ViewHelper

def render_breadcrumbs
crumbs = []
if @breadcrumbs && !@breadcrumbs.empty?
if @breadcrumbs.present?
@breadcrumbs[0..-2].each do |txt, path|
crumbs << content_tag(:li) do
link_to(content_tag(:span, h(txt)), path)
Expand All @@ -12,8 +12,8 @@ def render_breadcrumbs
crumbs << content_tag(:li, :class => :current) do
content_tag :span, h(@breadcrumbs.last.first)
end
content_tag(:ul, crumbs.to_s.html_safe, :id => :breadcrumb)
end
return crumbs.blank? ? "" : content_tag(:ul, crumbs.to_s, :id => :breadcrumb)
end
end
end
10 changes: 0 additions & 10 deletions script/console

This file was deleted.

14 changes: 0 additions & 14 deletions script/destroy

This file was deleted.

14 changes: 0 additions & 14 deletions script/generate

This file was deleted.

53 changes: 0 additions & 53 deletions test/controller_methods_test.rb

This file was deleted.

22 changes: 0 additions & 22 deletions test/test_helper.rb

This file was deleted.

Loading

0 comments on commit 59adc18

Please sign in to comment.