From 741b505d9d6cfd32bcea0010226dc28dc84c2cad Mon Sep 17 00:00:00 2001 From: Ryan Grove Date: Fri, 3 Jun 2011 19:41:41 -0700 Subject: [PATCH 1/2] Loosen Nokogiri dependency to allow 1.5.x. Fixes #41. --- HISTORY.md | 6 ++++++ README.rdoc | 4 ++-- Rakefile | 2 +- lib/sanitize/version.rb | 2 +- sanitize.gemspec | 20 ++++++++++---------- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index ba4e5e1..787cfd6 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,12 @@ Sanitize History ================================================================================ +Version 2.0.3 (git) +------------------- + + * Loosened the Nokogiri dependency to allow Nokogiri 1.5.x. + + Version 2.0.2 (2011-05-21) -------------------------- diff --git a/README.rdoc b/README.rdoc index aae6f4a..9c9cab8 100644 --- a/README.rdoc +++ b/README.rdoc @@ -14,14 +14,14 @@ of fragile regular expressions, Sanitize has no trouble dealing with malformed or maliciously-formed HTML, and will always output valid HTML or XHTML. *Author*:: Ryan Grove (mailto:ryan@wonko.com) -*Version*:: 2.0.2 (2011-05-21) +*Version*:: 2.0.3 (git) *Copyright*:: Copyright (c) 2011 Ryan Grove. All rights reserved. *License*:: MIT License (http://opensource.org/licenses/mit-license.php) *Website*:: http://github.com/rgrove/sanitize == Requires -* Nokogiri ~> 1.4.4 +* Nokogiri >= 1.4.4 * libxml2 >= 2.7.2 == Installation diff --git a/Rakefile b/Rakefile index 43f9f2e..c3f204f 100644 --- a/Rakefile +++ b/Rakefile @@ -43,7 +43,7 @@ gemspec = Gem::Specification.new do |s| s.required_ruby_version = '>= 1.8.7' # Runtime dependencies. - s.add_dependency('nokogiri', '~> 1.4.4') + s.add_dependency('nokogiri', '>= 1.4.4', '< 1.6') # Development dependencies. s.add_development_dependency('minitest', '~> 2.0.0') diff --git a/lib/sanitize/version.rb b/lib/sanitize/version.rb index 8b54732..2a1884e 100644 --- a/lib/sanitize/version.rb +++ b/lib/sanitize/version.rb @@ -1,3 +1,3 @@ class Sanitize - VERSION = '2.0.2' + VERSION = '2.0.3.dev.20110603' end diff --git a/sanitize.gemspec b/sanitize.gemspec index 8354584..f21fd3e 100644 --- a/sanitize.gemspec +++ b/sanitize.gemspec @@ -2,34 +2,34 @@ Gem::Specification.new do |s| s.name = %q{sanitize} - s.version = "2.0.2" + s.version = "2.0.3.dev.20110603" - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Ryan Grove"] - s.date = %q{2011-05-21} + s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= + s.authors = [%q{Ryan Grove}] + s.date = %q{2011-06-04} s.email = %q{ryan@wonko.com} - s.files = ["HISTORY.md", "LICENSE", "README.rdoc", "lib/sanitize/config/basic.rb", "lib/sanitize/config/relaxed.rb", "lib/sanitize/config/restricted.rb", "lib/sanitize/config.rb", "lib/sanitize/transformers/clean_cdata.rb", "lib/sanitize/transformers/clean_comment.rb", "lib/sanitize/transformers/clean_element.rb", "lib/sanitize/version.rb", "lib/sanitize.rb"] + s.files = [%q{HISTORY.md}, %q{LICENSE}, %q{README.rdoc}, %q{lib/sanitize/config/basic.rb}, %q{lib/sanitize/config/relaxed.rb}, %q{lib/sanitize/config/restricted.rb}, %q{lib/sanitize/config.rb}, %q{lib/sanitize/transformers/clean_cdata.rb}, %q{lib/sanitize/transformers/clean_comment.rb}, %q{lib/sanitize/transformers/clean_element.rb}, %q{lib/sanitize/version.rb}, %q{lib/sanitize.rb}] s.homepage = %q{https://github.com/rgrove/sanitize/} - s.require_paths = ["lib"] + s.require_paths = [%q{lib}] s.required_ruby_version = Gem::Requirement.new(">= 1.8.7") s.rubyforge_project = %q{riposte} - s.rubygems_version = %q{1.7.2} + s.rubygems_version = %q{1.8.5} s.summary = %q{Whitelist-based HTML sanitizer.} 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, ["~> 1.4.4"]) + s.add_runtime_dependency(%q, ["< 1.6", ">= 1.4.4"]) s.add_development_dependency(%q, ["~> 2.0.0"]) s.add_development_dependency(%q, ["~> 0.8.0"]) else - s.add_dependency(%q, ["~> 1.4.4"]) + s.add_dependency(%q, ["< 1.6", ">= 1.4.4"]) s.add_dependency(%q, ["~> 2.0.0"]) s.add_dependency(%q, ["~> 0.8.0"]) end else - s.add_dependency(%q, ["~> 1.4.4"]) + s.add_dependency(%q, ["< 1.6", ">= 1.4.4"]) s.add_dependency(%q, ["~> 2.0.0"]) s.add_dependency(%q, ["~> 0.8.0"]) end From 612995ab8925d0e3167e7213f1b4613cf4de8510 Mon Sep 17 00:00:00 2001 From: Ryan Grove Date: Wed, 22 Jun 2011 10:17:33 -0700 Subject: [PATCH 2/2] Add /tmp to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b630bb3..da7ed90 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ doc/ pkg/ +tmp/ ._* .DS_Store