hpricot_scrub 0.3.9 → 0.3.10

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/CHANGELOG.txt

@@ -1,7 +1,10 @@
-2009-11-04 Matt Kelly
-  Release 0.3.9
-  - fix undefined method `scrubbable?' for #<Hpricot::DocType> 
-  
+2009-11-29 Mina Naguib <mina.hpricotscrub@naguib.ca>
+	Release 0.3.10
+	- Perma-fix recurrent breakage of missing scrubbable? on new Hpricot
+	entities
+	- Fix breakage with Hpricot 0.8.2's "attributes" not being a hash,
+	therefore not supporting #each
+
 2009-07-29 Mina Naguib <mina.hpricotscrub@naguib.ca>
 	Release 0.3.8
 	- fix undefined method `scrubbable?' for #<Hpricot::ProcIns> 

data/History.txt

@@ -1,7 +1,10 @@
-2009-11-04 Matt Kelly
-  Release 0.3.9
-  - fix undefined method `scrubbable?' for #<Hpricot::DocType> 
-  
+2009-11-29 Mina Naguib <mina.hpricotscrub@naguib.ca>
+	Release 0.3.10
+	- Perma-fix recurrent breakage of missing scrubbable? on new Hpricot
+	entities
+	- Fix breakage with Hpricot 0.8.2's "attributes" not being a hash,
+	therefore not supporting #each
+
 2009-07-29 Mina Naguib <mina.hpricotscrub@naguib.ca>
 	Release 0.3.8
 	- fix undefined method `scrubbable?' for #<Hpricot::ProcIns> 

data/Manifest.txt

@@ -0,0 +1,14 @@
+Rakefile
+README.txt
+CHANGELOG.txt
+History.txt
+setup.rb
+lib/hpricot_scrub/hpricot_scrub.rb
+lib/hpricot_scrub/version.rb
+lib/hpricot_scrub.rb
+test/test_helper.rb
+test/scrubber_data.rb
+test/hpricot_scrub_test.rb
+test/old_hpricot_scrub_test.rb
+examples/config.yml
+examples/old_config.yml

data/Rakefile

@@ -1,53 +1,53 @@
 require 'rubygems'
 require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'fileutils'
-require 'hoe'
-include FileUtils
-require File.join(File.dirname(__FILE__), 'lib', 'hpricot_scrub', 'version')
 
-AUTHOR = "UnderpantsGnome"  # can also be an array of Authors
-EMAIL = "michael@underpantsgnome.com"
-DESCRIPTION = "Scrub HTML with Hpricot"
-GEM_NAME = "hpricot_scrub" # what ppl will type to install your gem
-RUBYFORGE_PROJECT = "hpricot-scrub" # The unix name for your project
-HOMEPATH = "http://trac.underpantsgnome.com/hpricot_scrub/"
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "hpricot_scrub"
+    gem.summary = "Scrub HTML with Hpricot"
+    gem.description = "Scrub HTML with Hpricot like you would with perl HTML:Scrubber"
+    gem.email = "michael@underpantsgnome.com"
+    gem.homepage = "http://github.com/UnderpantsGnome/hpricot_scrub"
+    gem.authors = ["UnderpantsGnome (Michael Moen)", "minaguib (Mina Naguib)"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency 'hpricot', '>=0.8.1'
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
 
-NAME = "hpricot_scrub"
-REV = nil # UNCOMMENT IF REQUIRED: File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-VERS = ENV['VERSION'] || (HpricotScrub::VERSION::STRING + (REV ? ".#{REV}" : ""))
-                          CLEAN.include ['**/.*.sw?', '*.gem', '.config']
-RDOC_OPTS = ['--quiet', '--title', "hpricot_scrub documentation",
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
 
-class Hoe
-  def extra_deps 
-    @extra_deps.reject { |x| Array(x).first == 'hoe' } 
-  end 
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
 end
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/*_test.rb"]
-  p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  #p.changes        - A description of the release's latest changes.
-  p.extra_deps = [['hpricot',  '>= 0.5']]
-  #p.spec_extras    - A hash of extra values to set in the gemspec.
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "hpricot_scrub #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -0,0 +1 @@
+0.3.10

data/hpricot_scrub.gemspec

@@ -0,0 +1,63 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{hpricot_scrub}
+  s.version = "0.3.10"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["UnderpantsGnome (Michael Moen)", "minaguib (Mina Naguib)"]
+  s.date = %q{2010-01-25}
+  s.description = %q{Scrub HTML with Hpricot like you would with perl HTML:Scrubber}
+  s.email = %q{michael@underpantsgnome.com}
+  s.extra_rdoc_files = [
+    "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG.txt",
+     "History.txt",
+     "Manifest.txt",
+     "README.txt",
+     "Rakefile",
+     "VERSION",
+     "examples/config.yml",
+     "examples/old_config.yml",
+     "hpricot_scrub.gemspec",
+     "lib/hpricot_scrub.rb",
+     "lib/hpricot_scrub/hpricot_scrub.rb",
+     "lib/hpricot_scrub/version.rb",
+     "setup.rb",
+     "test/hpricot_scrub_test.rb",
+     "test/old_hpricot_scrub_test.rb",
+     "test/scrubber_data.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/UnderpantsGnome/hpricot_scrub}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Scrub HTML with Hpricot}
+  s.test_files = [
+    "test/hpricot_scrub_test.rb",
+     "test/old_hpricot_scrub_test.rb",
+     "test/scrubber_data.rb",
+     "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::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<hpricot>, [">= 0.8.1"])
+    else
+      s.add_dependency(%q<hpricot>, [">= 0.8.1"])
+    end
+  else
+    s.add_dependency(%q<hpricot>, [">= 0.8.1"])
+  end
+end
+

data/lib/hpricot_scrub/hpricot_scrub.rb

@@ -115,14 +115,6 @@ module Hpricot
 
     end
 
-    module Scrubbable
-      def scrubbable?
-        ! [ Hpricot::Text,
-            Hpricot::BogusETag,
-          ].include?(self.class) && self.respond_to?(:scrub)
-      end
-    end
-
   end
 
   class Elements
@@ -135,32 +127,7 @@ module Hpricot
     end
   end
 
-  class DocType
-    include Scrub::Scrubbable
-  end
-
-  class BogusETag
-    include Scrub::Scrubbable
-  end
-
-  class Text
-    include Scrub::Scrubbable
-  end
-
-  class BaseEle
-    include Scrub::Scrubbable
-  end
-
-  class CData
-    include Scrub::Scrubbable
-  end
-
-  class ProcIns
-    include Scrub::Scrubbable
-  end
-
   class Comment
-    include Scrub::Scrubbable
 
     def remove
       parent.children.delete(self)
@@ -180,7 +147,6 @@ module Hpricot
   end
 
   class Elem
-    include Scrub::Scrubbable
 
     def remove
       parent.children.delete(self)
@@ -214,7 +180,7 @@ module Hpricot
       config = Scrub::normalize_config(config)
 
       (children || []).reverse.each do |child|
-        child.scrub(config) if child.scrubbable?
+        child.scrub(config) if child.respond_to?(:scrub)
       end
 
       rule = config[:elem_rules].has_key?(name) ? config[:elem_rules][name] : config[:default_elem_rule]
@@ -241,8 +207,8 @@ module Hpricot
     # Loops over all the attributes on this element, and removes any which Hpricot::Scrub.keep_attribute? returns false for
     #
     def scrub_attributes(attribute_rule = nil)
-      if attributes
-        attributes.each do |key, value|
+      if raw_attributes
+        raw_attributes.each do |key, value|
           remove_attribute(key) unless Scrub.keep_attribute?(self, key, value, attribute_rule)
         end
       end
@@ -262,7 +228,7 @@ module Hpricot
     def scrub(config=nil)
       config = Scrub::normalize_config(config)
       (children || []).reverse.each do |child|
-        child.scrub(config) if child.scrubbable?
+        child.scrub(config) if child.respond_to?(:scrub)
       end
       return self
     end

data/lib/hpricot_scrub/version.rb

@@ -2,7 +2,7 @@ module HpricotScrub #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 9
+    TINY  = 10
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: hpricot_scrub
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors: 
-- UnderpantsGnome
+- UnderpantsGnome (Michael Moen)
+- minaguib (Mina Naguib)
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -06:00
+date: 2010-01-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,19 +21,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        version: 0.8.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: Scrub HTML with Hpricot
+description: Scrub HTML with Hpricot like you would with perl HTML:Scrubber
 email: michael@underpantsgnome.com
 executables: []
 
@@ -40,31 +31,32 @@ extensions: []
 
 extra_rdoc_files: 
 - README.txt
-- CHANGELOG.txt
-- History.txt
 files: 
-- Rakefile
-- README.txt
+- .gitignore
 - CHANGELOG.txt
 - History.txt
-- setup.rb
+- Manifest.txt
+- README.txt
+- Rakefile
+- VERSION
+- examples/config.yml
+- examples/old_config.yml
+- hpricot_scrub.gemspec
+- lib/hpricot_scrub.rb
 - lib/hpricot_scrub/hpricot_scrub.rb
 - lib/hpricot_scrub/version.rb
-- lib/hpricot_scrub.rb
-- test/test_helper.rb
-- test/scrubber_data.rb
+- setup.rb
 - test/hpricot_scrub_test.rb
 - test/old_hpricot_scrub_test.rb
-- examples/config.yml
-- examples/old_config.yml
+- test/scrubber_data.rb
+- test/test_helper.rb
 has_rdoc: true
-homepage: http://trac.underpantsgnome.com/hpricot_scrub/
+homepage: http://github.com/UnderpantsGnome/hpricot_scrub
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: hpricot-scrub
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
@@ -89,3 +81,5 @@ summary: Scrub HTML with Hpricot
 test_files: 
 - test/hpricot_scrub_test.rb
 - test/old_hpricot_scrub_test.rb
+- test/scrubber_data.rb
+- test/test_helper.rb