addressable 2.2.7 → 2.2.8

data/{CHANGELOG → CHANGELOG.md}

@@ -1,3 +1,8 @@
+# Addressable 2.2.8
+- fixed issues with dot segment removal code
+- form encoding can now handle multiple values per key
+- updated development environment
+
 # Addressable 2.2.7
 - fixed issues related to Addressable::URI#query_values=
 - the Addressable::URI.parse method is now polymorphic

data/Gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem 'launchy'
+  gem 'yard'
+  gem 'redcarpet'
+  gem 'rubyforge'
+end
+
+group :test, :development do
+  gem 'rake', '>= 0.7.3'
+  gem 'rspec', '>= 2.9.0'
+end
+
+gem 'idn', :platform => :mri_18
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    addressable (2.2.8)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    idn (0.0.2)
+    launchy (2.1.0)
+      addressable (~> 2.2.6)
+    rake (0.9.2.2)
+    redcarpet (2.1.1)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    yard (0.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  addressable!
+  idn
+  launchy
+  rake (>= 0.7.3)
+  redcarpet
+  rspec (>= 2.9.0)
+  yard

data/README.md

@@ -7,6 +7,9 @@
   <dt>License</dt><dd>Apache 2.0</dd>
 </dl>
 
+[![Build Status](https://secure.travis-ci.org/sporkmonger/addressable.png)](http://travis-ci.org/sporkmonger/addressable)
+[![Dependency Status](https://gemnasium.com/sporkmonger/addressable.png)](https://gemnasium.com/sporkmonger/addressable)
+
 # Description
 
 Addressable is a replacement for the URI implementation that is part of
@@ -67,10 +70,14 @@ support for URI templates.
 
 # Install
 
-* sudo gem install addressable
+    $ sudo gem install addressable
 
 You may optionally turn on native IDN support by installing libidn and the
 idn gem:
 
-* brew install libidn
-* sudo gem install idn
+    $ sudo apt-get install idn # Debian/Ubuntu
+    $ sudo brew install libidn # OS X
+    $ sudo gem install idn
+
+**NOTE:** Native IDN support appears to be broken in Ruby 1.9.x. The IDN gem
+hasn't been updated in years.

data/Rakefile

@@ -1,10 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
 
 require File.join(File.dirname(__FILE__), 'lib', 'addressable', 'version')
 

data/lib/addressable/uri.rb

@@ -51,7 +51,7 @@ module Addressable
     end
 
     SLASH = '/'
-    EMPTYSTR = ''
+    EMPTY_STR = ''
 
     URIREGEX = /^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/
 
@@ -120,10 +120,10 @@ module Addressable
           user = userinfo.strip[/^([^:]*):?/, 1]
           password = userinfo.strip[/:(.*)$/, 1]
         end
-        host = authority.gsub(/^([^\[\]]*)@/, EMPTYSTR).gsub(/:([^:@\[\]]*?)$/, EMPTYSTR)
+        host = authority.gsub(/^([^\[\]]*)@/, EMPTY_STR).gsub(/:([^:@\[\]]*?)$/, EMPTY_STR)
         port = authority[/:([^:@\[\]]*?)$/, 1]
       end
-      if port == EMPTYSTR
+      if port == EMPTY_STR
         port = nil
       end
 
@@ -187,7 +187,7 @@ module Addressable
         if new_host
           parsed.defer_validation do
             new_path = parsed.path.gsub(
-              Regexp.new("^" + Regexp.escape(new_host)), EMPTYSTR)
+              Regexp.new("^" + Regexp.escape(new_host)), EMPTY_STR)
             parsed.host = new_host
             parsed.path = new_path
             parsed.scheme = hints[:scheme] unless parsed.scheme
@@ -237,7 +237,7 @@ module Addressable
       # Otherwise, convert to a String
       path = path.to_str.strip
 
-      path.gsub!(/^file:\/?\/?/, EMPTYSTR) if path =~ /^file:\/?\/?/
+      path.gsub!(/^file:\/?\/?/, EMPTY_STR) if path =~ /^file:\/?\/?/
       path = SLASH + path if path =~ /^([a-zA-Z])[\|:]/
       uri = self.parse(path)
 
@@ -249,14 +249,14 @@ module Addressable
         uri.path.gsub!(/\\/, SLASH)
         if File.exists?(uri.path) &&
             File.stat(uri.path).directory?
-          uri.path.gsub!(/\/$/, EMPTYSTR)
+          uri.path.gsub!(/\/$/, EMPTY_STR)
           uri.path = uri.path + '/'
         end
 
         # If the path is absolute, set the scheme and host.
         if uri.path =~ /^\//
           uri.scheme = "file"
-          uri.host = EMPTYSTR
+          uri.host = EMPTY_STR
         end
         uri.normalize!
       end
@@ -619,9 +619,18 @@ module Addressable
       else
         raise TypeError, "Can't convert #{form_values.class} into Array."
       end
-      form_values = form_values.map do |(key, value)|
-        [key.to_s, value.to_s]
+
+      form_values = form_values.inject([]) do |accu, (key, value)|
+        if value.kind_of?(Array)
+          value.each do |v|
+            accu << [key.to_s, v.to_s]
+          end
+        else
+          accu << [key.to_s, value.to_s]
+        end
+        accu
       end
+
       if sort
         # Useful for OAuth and optimizing caching systems
         form_values = form_values.sort
@@ -832,7 +841,7 @@ module Addressable
 
       # You can't have a nil user with a non-nil password
       if password != nil
-        @user = EMPTYSTR if @user.nil?
+        @user = EMPTY_STR if @user.nil?
       end
 
       # Reset dependant values
@@ -887,7 +896,7 @@ module Addressable
       @password ||= nil
       @user ||= nil
       if @password != nil
-        @user = EMPTYSTR if @user.nil?
+        @user = EMPTY_STR if @user.nil?
       end
 
       # Reset dependant values
@@ -992,7 +1001,7 @@ module Addressable
             end
             result
           else
-            EMPTYSTR
+            EMPTY_STR
           end
         else
           nil
@@ -1081,7 +1090,7 @@ module Addressable
           new_password = new_userinfo.strip[/:(.*)$/, 1]
         end
         new_host =
-          new_authority.gsub(/^([^\[\]]*)@/, EMPTYSTR).gsub(/:([^:@\[\]]*?)$/, EMPTYSTR)
+          new_authority.gsub(/^([^\[\]]*)@/, EMPTY_STR).gsub(/:([^:@\[\]]*?)$/, EMPTY_STR)
         new_port =
           new_authority[/:([^:@\[\]]*?)$/, 1]
       end
@@ -1269,7 +1278,7 @@ module Addressable
     #
     # @return [String] The path component.
     def path
-      return instance_variable_defined?(:@path) ? @path : EMPTYSTR
+      return instance_variable_defined?(:@path) ? @path : EMPTY_STR
     end
 
     NORMPATH = /^(?!\/)[^\/:]*:.*$/
@@ -1310,7 +1319,7 @@ module Addressable
       if new_path && !new_path.respond_to?(:to_str)
         raise TypeError, "Can't convert #{new_path.class} into String."
       end
-      @path = (new_path || EMPTYSTR).to_str
+      @path = (new_path || EMPTY_STR).to_str
       if !@path.empty? && @path[0..0] != SLASH && host != nil
         @path = "/#{@path}"
       end
@@ -1327,7 +1336,7 @@ module Addressable
     # @return [String] The path's basename.
     def basename
       # Path cannot be nil
-      return File.basename(self.path).gsub(/;[^\/]*$/, EMPTYSTR)
+      return File.basename(self.path).gsub(/;[^\/]*$/, EMPTY_STR)
     end
 
     ##
@@ -1572,7 +1581,7 @@ module Addressable
       return nil if self.absolute? && self.scheme !~ /^https?$/
       return (
         (!self.path.empty? ? self.path : SLASH) +
-        (self.query ? "?#{self.query}" : EMPTYSTR)
+        (self.query ? "?#{self.query}" : EMPTY_STR)
       )
     end
 
@@ -1732,7 +1741,7 @@ module Addressable
               joined_path = URI.normalize_path(uri.path)
             else
               base_path = self.path.dup
-              base_path = EMPTYSTR if base_path == nil
+              base_path = EMPTY_STR if base_path == nil
               base_path = URI.normalize_path(base_path)
 
               # Section 5.2.3 of RFC 3986
@@ -1741,7 +1750,7 @@ module Addressable
               if base_path =~ /\//
                 base_path.gsub!(/\/[^\/]+$/, SLASH)
               else
-                base_path = EMPTYSTR
+                base_path = EMPTY_STR
               end
 
               # If the base path is empty and an authority segment has been
@@ -1905,7 +1914,7 @@ module Addressable
           else
             if uri.path != SLASH
               components[:path].gsub!(
-                Regexp.new("^" + Regexp.escape(uri.path)), EMPTYSTR)
+                Regexp.new("^" + Regexp.escape(uri.path)), EMPTY_STR)
             end
           end
         end
@@ -2184,21 +2193,20 @@ module Addressable
     end
 
   private
+    SELF_REF = '.'
+    PARENT = '..'
+
+    RULE_2A = /\/\.\/|\/\.$/
+    RULE_2B_2C = /\/([^\/]*)\/\.\.\/|\/([^\/]*)\/\.\.$/
+    RULE_2D = /^\.\.?\/?/
+    RULE_PREFIXED_PARENT = /^\/\.\.?\/|^(\/\.\.?)+\/?$/
+
     ##
     # Resolves paths to their simplest form.
     #
     # @param [String] path The path to normalize.
     #
     # @return [String] The normalized path.
-
-    PARENT1 = '.'
-    PARENT2 = '..'
-
-    NPATH1 = /\/\.\/|\/\.$/
-    NPATH2 = /\/([^\/]+)\/\.\.\/|\/([^\/]+)\/\.\.$/
-    NPATH3 = /^\.\.?\/?/
-    NPATH4 = /^\/\.\.?\/|^(\/\.\.?)+\/?$/
-
     def self.normalize_path(path)
       # Section 5.2.4 of RFC 3986
 
@@ -2206,16 +2214,23 @@ module Addressable
       normalized_path = path.dup
       begin
         mod = nil
-        mod ||= normalized_path.gsub!(NPATH1, SLASH)
-
-        parent = normalized_path.match(NPATH2)
-        if parent && ((parent[1] != PARENT1 && parent[1] != PARENT2) \
-                      || (parent[2] != PARENT1 && parent[2] != PARENT2))
-          mod ||= normalized_path.gsub!(/\/#{Regexp.escape(parent[1].to_s)}\/\.\.\/|(\/#{Regexp.escape(parent[2].to_s)}\/\.\.$)/, SLASH)
+        mod ||= normalized_path.gsub!(RULE_2A, SLASH)
+
+        pair = normalized_path.match(RULE_2B_2C)
+        parent, current = pair[1], pair[2] if pair
+        if pair && ((parent != SELF_REF && parent != PARENT) ||
+            (current != SELF_REF && current != PARENT))
+          mod ||= normalized_path.gsub!(
+            Regexp.new(
+              "/#{Regexp.escape(parent.to_s)}/\\.\\./|" +
+              "(/#{Regexp.escape(current.to_s)}/\\.\\.$)"
+            ), SLASH
+          )
         end
 
-        mod ||= normalized_path.gsub!(NPATH3, EMPTYSTR)
-        mod ||= normalized_path.gsub!(NPATH4, SLASH)
+        mod ||= normalized_path.gsub!(RULE_2D, EMPTY_STR)
+        # Non-standard, removes prefixed dotted segments from path.
+        mod ||= normalized_path.gsub!(RULE_PREFIXED_PARENT, SLASH)
       end until mod.nil?
 
       return normalized_path

data/lib/addressable/version.rb

@@ -22,7 +22,7 @@ if !defined?(Addressable::VERSION)
     module VERSION
       MAJOR = 2
       MINOR = 2
-      TINY  = 7
+      TINY  = 8
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/addressable/uri_spec.rb

@@ -1920,6 +1920,51 @@ describe Addressable::URI, "when parsed from " +
   end
 end
 
+describe Addressable::URI, "when parsed from '/a/b/c/./../../g'" do
+  before do
+    @uri = Addressable::URI.parse("/a/b/c/./../../g")
+  end
+
+  it "should not be considered to be in normal form" do
+    @uri.normalize.should_not be_eql(@uri)
+  end
+
+  # Section 5.2.4 of RFC 3986
+  it "should normalize to '/a/g'" do
+    @uri.normalize.should === "/a/g"
+  end
+end
+
+describe Addressable::URI, "when parsed from 'mid/content=5/../6'" do
+  before do
+    @uri = Addressable::URI.parse("mid/content=5/../6")
+  end
+
+  it "should not be considered to be in normal form" do
+    @uri.normalize.should_not be_eql(@uri)
+  end
+
+  # Section 5.2.4 of RFC 3986
+  it "should normalize to 'mid/6'" do
+    @uri.normalize.should === "mid/6"
+  end
+end
+
+describe Addressable::URI, "when parsed from " +
+    "'http://www.example.com///../'" do
+  before do
+    @uri = Addressable::URI.parse('http://www.example.com///../')
+  end
+
+  it "should not be considered to be in normal form" do
+    @uri.normalize.should_not be_eql(@uri)
+  end
+
+  it "should normalize to 'http://www.example.com//'" do
+    @uri.normalize.should === "http://www.example.com//"
+  end
+end
+
 describe Addressable::URI, "when parsed from " +
     "'http://example.com/path/to/resource/'" do
   before do
@@ -4286,7 +4331,7 @@ end
 describe Addressable::URI, "when form encoding a hash" do
   it "should result in correct percent encoded sequence" do
     Addressable::URI.form_encode(
-      {"&one" => "/1", "=two" => "?2", ":three" => "#3"}
+      [["&one", "/1"], ["=two", "?2"], [":three", "#3"]]
     ).should == "%26one=%2F1&%3Dtwo=%3F2&%3Athree=%233"
   end
 
@@ -4302,6 +4347,12 @@ describe Addressable::URI, "when form encoding a hash" do
     ).should == "key="
   end
 
+  it "should result in correct percent encoded sequence" do
+    Addressable::URI.form_encode(
+      {"q" => ["one", "two", "three"]}
+    ).should == "q=one&q=two&q=three"
+  end
+
   it "should result in correctly encoded newlines" do
     Addressable::URI.form_encode(
       {"text" => "one\ntwo\rthree\r\nfour\n\r"}
@@ -4818,7 +4869,7 @@ describe Addressable::URI, "when assigning query values" do
   end
 
   it "should preserve query string order" do
-    query_string = (('a'..'z').to_a.shuffle.map { |e| "#{e}=#{e}" }).join("&")
+    query_string = (('a'..'z').to_a.reverse.map { |e| "#{e}=#{e}" }).join("&")
     @uri.query = query_string
     original_uri = @uri.to_s
     @uri.query_values = @uri.query_values(:notation => :flat_array)

data/tasks/gem.rake

@@ -1,4 +1,4 @@
-require "rake/gempackagetask"
+require "rubygems/package_task"
 
 namespace :gem do
   GEM_SPEC = Gem::Specification.new do |s|
@@ -19,9 +19,8 @@ namespace :gem do
     end
 
     s.add_development_dependency("rake", ">= 0.7.3")
-    s.add_development_dependency("rspec", ">= 1.0.8")
+    s.add_development_dependency("rspec", ">= 2.9.0")
     s.add_development_dependency("launchy", ">= 0.3.2")
-    s.add_development_dependency("diff-lcs", ">= 1.1.2")
 
     s.require_path = "lib"
 
@@ -31,7 +30,7 @@ namespace :gem do
     s.rubyforge_project = RUBY_FORGE_PROJECT
   end
 
-  Rake::GemPackageTask.new(GEM_SPEC) do |p|
+  Gem::PackageTask.new(GEM_SPEC) do |p|
     p.gem_spec = GEM_SPEC
     p.need_tar = true
     p.need_zip = true

data/tasks/git.rake

@@ -10,7 +10,7 @@ namespace :git do
 
     desc "Create a new tag in the Git repository"
     task :create do
-      changelog = File.open("CHANGELOG", "r") { |file| file.read }
+      changelog = File.open("CHANGELOG.md", "r") { |file| file.read }
       puts "-" * 80
       puts changelog
       puts "-" * 80

data/tasks/{spec.rake → rspec.rake}

@@ -1,8 +1,9 @@
+require "rspec/core/rake_task"
+
 namespace :spec do
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.libs = %w[lib spec]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--color', '--format', 'specdoc']
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rspec_opts = ['--color', '--format', 'documentation']
 
     t.rcov = RCOV_ENABLED
     t.rcov_opts = [
@@ -17,31 +18,28 @@ namespace :spec do
     ]
   end
 
-  Spec::Rake::SpecTask.new(:normal) do |t|
-    t.libs = %w[lib spec]
-    t.spec_files = FileList['spec/**/*_spec.rb'].exclude(/compat/)
-    t.spec_opts = ['--color', '--format', 'specdoc']
+  RSpec::Core::RakeTask.new(:normal) do |t|
+    t.pattern = FileList['spec/**/*_spec.rb'].exclude(/compat/)
+    t.rspec_opts = ['--color', '--format', 'documentation']
     t.rcov = false
   end
 
-  Spec::Rake::SpecTask.new(:all) do |t|
-    t.libs = %w[lib spec]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--color', '--format', 'specdoc']
+  RSpec::Core::RakeTask.new(:all) do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rspec_opts = ['--color', '--format', 'documentation']
     t.rcov = false
   end
 
   desc "Generate HTML Specdocs for all specs"
-  Spec::Rake::SpecTask.new(:specdoc) do |t|
+  RSpec::Core::RakeTask.new(:specdoc) do |t|
     specdoc_path = File.expand_path(
-      File.join(File.dirname(__FILE__), '..', 'specdoc')
+      File.join(File.dirname(__FILE__), '..', 'documentation')
     )
     Dir.mkdir(specdoc_path) if !File.exist?(specdoc_path)
 
     output_file = File.join(specdoc_path, 'index.html')
-    t.libs = %w[lib spec]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ["--format", "\"html:#{output_file}\"", "--diff"]
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rspec_opts = ["--format", "\"html:#{output_file}\"", "--diff"]
     t.fail_on_error = false
   end
 

data/tasks/rubyforge.rake

@@ -13,7 +13,7 @@ namespace :gem do
     rf.login
 
     c = rf.userconfig
-    changelog = File.open("CHANGELOG") { |file| file.read }
+    changelog = File.open("CHANGELOG.md") { |file| file.read }
     c['release_changes'] = changelog
     c['preformatted'] = true
 

data/tasks/yard.rake

@@ -10,7 +10,8 @@ begin
       yardoc.name = "yard"
       yardoc.options = ["--verbose", "--markup", "markdown"]
       yardoc.files = FileList[
-        "lib/**/*.rb", "ext/**/*.c", "README.md", "CHANGELOG", "LICENSE"
+        "lib/**/*.rb", "ext/**/*.c",
+        "README.md", "CHANGELOG.md", "LICENSE.txt"
       ].exclude(/idna/)
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 7
-  version: 2.2.7
+  - 8
+  version: 2.2.8
 platform: ruby
 authors: 
 - Bob Aman
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-16 00:00:00 +03:00
+date: 2012-05-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,20 +36,22 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
+        - 2
+        - 9
         - 0
-        - 8
-        version: 1.0.8
+        version: 2.9.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: launchy
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -59,20 +62,6 @@ dependencies:
         version: 0.3.2
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  type: :development
-  version_requirements: *id004
 description: |
   Addressable is a replacement for the URI implementation that is part of
   Ruby's standard library. It more closely conforms to the relevant RFCs and
@@ -100,13 +89,14 @@ files:
 - tasks/gem.rake
 - tasks/git.rake
 - tasks/metrics.rake
-- tasks/rdoc.rake
+- tasks/rspec.rake
 - tasks/rubyforge.rake
-- tasks/spec.rake
 - tasks/yard.rake
 - website/index.html
-- CHANGELOG
-- LICENSE
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
 - Rakefile
 - README.md
 has_rdoc: true
@@ -120,6 +110,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -127,6 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -136,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: addressable
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: URI Implementation

data/tasks/rdoc.rake

@@ -1,26 +0,0 @@
-require "rake/rdoctask"
-
-namespace :doc do
-  desc "Generate RDoc documentation"
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = "doc"
-    rdoc.title    = "#{PKG_NAME}-#{PKG_VERSION} Documentation"
-    rdoc.options << "--line-numbers" << "--inline-source" <<
-      "--accessor" << "cattr_accessor=object" << "--charset" << "utf-8"
-    rdoc.template = "#{ENV["template"]}.rb" if ENV["template"]
-    rdoc.rdoc_files.include("README.md", "CHANGELOG", "LICENSE")
-    rdoc.rdoc_files.include("lib/**/*.rb")
-  end
-
-  desc "Generate ri locally for testing"
-  task :ri do
-    sh "rdoc --ri -o ri ."
-  end
-
-  desc "Remove ri products"
-  task :clobber_ri do
-    rm_r "ri" rescue nil
-  end
-end
-
-task "clobber" => ["doc:clobber_rdoc", "doc:clobber_ri"]