addressable 2.3.6 → 2.8.0

data/spec/spec_helper.rb

@@ -1,6 +1,33 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'rspec/its'
+
 begin
   require 'coveralls'
-  Coveralls.wear!
+  Coveralls.wear! do
+    add_filter "spec/"
+    add_filter "vendor/"
+  end
 rescue LoadError
   warn "warning: coveralls gem not found; skipping Coveralls"
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "spec/"
+    add_filter "vendor/"
+  end
+end if Gem.loaded_specs.key?("simplecov")
+
+class TestHelper
+  def self.native_supported?
+    mri = RUBY_ENGINE == "ruby"
+    windows = RUBY_PLATFORM.include?("mingw")
+
+    mri && !windows
+  end
+end
+
+RSpec.configure do |config|
+  config.warnings = true
+  config.filter_run_when_matching :focus
 end

data/tasks/clobber.rake

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 desc "Remove all build products"
 task "clobber"

data/tasks/gem.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubygems/package_task"
 
 namespace :gem do
@@ -9,7 +11,6 @@ namespace :gem do
 
     s.files = PKG_FILES.to_a
 
-    s.has_rdoc = true
     s.extra_rdoc_files = %w( README.md )
     s.rdoc_options.concat ["--main",  "README.md"]
 
@@ -18,17 +19,17 @@ namespace :gem do
       exit(1)
     end
 
-    s.add_development_dependency("rake", ">= 0.7.3")
-    s.add_development_dependency("rspec", ">= 2.9.0")
-    s.add_development_dependency("launchy", ">= 0.3.2")
+    s.required_ruby_version = ">= 2.0"
+
+    s.add_runtime_dependency "public_suffix", ">= 2.0.2", "< 5.0"
+    s.add_development_dependency "bundler", ">= 1.0", "< 3.0"
 
     s.require_path = "lib"
 
     s.author = "Bob Aman"
     s.email = "bob@sporkmonger.com"
-    s.homepage = RUBY_FORGE_URL
-    s.rubyforge_project = RUBY_FORGE_PROJECT
-    s.license = "Apache License 2.0"
+    s.homepage = "https://github.com/sporkmonger/addressable"
+    s.license = "Apache-2.0"
   end
 
   Gem::PackageTask.new(GEM_SPEC) do |p|
@@ -40,15 +41,8 @@ namespace :gem do
   desc "Generates .gemspec file"
   task :gemspec do
     spec_string = GEM_SPEC.to_ruby
-
-    begin
-      Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join
-    rescue
-      abort "unsafe gemspec: #{$!}"
-    else
-      File.open("#{GEM_SPEC.name}.gemspec", 'w') do |file|
-        file.write spec_string
-      end
+    File.open("#{GEM_SPEC.name}.gemspec", "w") do |file|
+      file.write spec_string
     end
   end
 
@@ -76,6 +70,18 @@ namespace :gem do
 
   desc "Reinstall the gem"
   task :reinstall => [:uninstall, :install]
+
+  desc "Package for release"
+  task :release => ["gem:package", "gem:gemspec"] do |t|
+    v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
+    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PKG_VERSION
+    pkg = "pkg/#{GEM_SPEC.full_name}"
+
+    changelog = File.open("CHANGELOG.md") { |file| file.read }
+
+    puts "Releasing #{PKG_NAME} v. #{PKG_VERSION}"
+    Rake::Task["git:tag:create"].invoke
+  end
 end
 
 desc "Alias to gem:package"

data/tasks/git.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :git do
   namespace :tag do
     desc "List tags from the Git repository"
@@ -20,7 +22,7 @@ namespace :git do
       abort "Versions don't match #{v} vs #{PKG_VERSION}" if v != PKG_VERSION
 
       git_status = `git status`
-      if git_status !~ /nothing to commit \(working directory clean\)/
+      if git_status !~ /^nothing to commit/
         abort "Working directory isn't clean."
       end
 

data/tasks/metrics.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :metrics do
   task :lines do
     lines, codelines, total_lines, total_codelines = 0, 0, 0, 0

data/tasks/profile.rake

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+namespace :profile do
+  desc "Profile Template match memory allocations"
+  task :template_match_memory do
+    require "memory_profiler"
+    require "addressable/template"
+
+    start_at = Time.now.to_f
+    template = Addressable::Template.new("http://example.com/{?one,two,three}")
+    report = MemoryProfiler.report do
+      30_000.times do
+        template.match(
+          "http://example.com/?one=one&two=floo&three=me"
+        )
+      end
+    end
+    end_at = Time.now.to_f
+    print_options = { scale_bytes: true, normalize_paths: true }
+    puts "\n\n"
+
+    if ENV["CI"]
+      report.pretty_print(print_options)
+    else
+      t_allocated = report.scale_bytes(report.total_allocated_memsize)
+      t_retained  = report.scale_bytes(report.total_retained_memsize)
+
+      puts "Total allocated: #{t_allocated} (#{report.total_allocated} objects)"
+      puts "Total retained:  #{t_retained} (#{report.total_retained} objects)"
+      puts "Took #{end_at - start_at} seconds"
+
+      FileUtils.mkdir_p("tmp")
+      report.pretty_print(to_file: "tmp/memprof.txt", **print_options)
+    end
+  end
+
+  desc "Profile URI parse memory allocations"
+  task :memory do
+    require "memory_profiler"
+    require "addressable/uri"
+    if ENV["IDNA_MODE"] == "pure"
+      Addressable.send(:remove_const, :IDNA)
+      load "addressable/idna/pure.rb"
+    end
+
+    start_at = Time.now.to_f
+    report = MemoryProfiler.report do
+      30_000.times do
+        Addressable::URI.parse(
+          "http://google.com/stuff/../?with_lots=of&params=asdff#!stuff"
+        ).normalize
+      end
+    end
+    end_at = Time.now.to_f
+    print_options = { scale_bytes: true, normalize_paths: true }
+    puts "\n\n"
+
+    if ENV["CI"]
+      report.pretty_print(**print_options)
+    else
+      t_allocated = report.scale_bytes(report.total_allocated_memsize)
+      t_retained  = report.scale_bytes(report.total_retained_memsize)
+
+      puts "Total allocated: #{t_allocated} (#{report.total_allocated} objects)"
+      puts "Total retained:  #{t_retained} (#{report.total_retained} objects)"
+      puts "Took #{end_at - start_at} seconds"
+
+      FileUtils.mkdir_p("tmp")
+      report.pretty_print(to_file: "tmp/memprof.txt", **print_options)
+    end
+  end
+end

data/tasks/rspec.rake

@@ -1,58 +1,23 @@
+# frozen_string_literal: true
+
 require "rspec/core/rake_task"
 
 namespace :spec do
-  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 = [
-      '--exclude', 'lib\\/compat',
-      '--exclude', 'spec',
-      '--exclude', '\\.rvm\\/gems',
-      '--exclude', '1\\.8\\/gems',
-      '--exclude', '1\\.9\\/gems',
-      '--exclude', '\\.rvm',
-      '--exclude', '\\/Library\\/Ruby',
-      '--exclude', 'addressable\\/idna' # environment dependant
-    ]
-  end
-
-  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
-
-  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"
-  RSpec::Core::RakeTask.new(:specdoc) do |t|
-    specdoc_path = File.expand_path(
-      File.join(File.dirname(__FILE__), '..', 'documentation')
-    )
-    Dir.mkdir(specdoc_path) if !File.exist?(specdoc_path)
-
-    output_file = File.join(specdoc_path, 'index.html')
+  RSpec::Core::RakeTask.new(:simplecov) do |t|
     t.pattern = FileList['spec/**/*_spec.rb']
-    t.rspec_opts = ["--format", "\"html:#{output_file}\"", "--diff"]
-    t.fail_on_error = false
+    t.rspec_opts = %w[--color --format documentation] unless ENV["CI"]
   end
 
-  namespace :rcov do
+  namespace :simplecov do
     desc "Browse the code coverage report."
-    task :browse => "spec:rcov" do
+    task :browse => "spec:simplecov" do
       require "launchy"
-      Launchy::Browser.run("coverage/index.html")
+      Launchy.open("coverage/index.html")
     end
   end
 end
 
-desc "Alias to spec:normal"
-task "spec" => "spec:normal"
+desc "Alias to spec:simplecov"
+task "spec" => "spec:simplecov"
 
-task "clobber" => ["spec:clobber_rcov"]
+task "clobber" => ["spec:clobber_simplecov"]

data/tasks/yard.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rake"
 
 begin

metadata

@@ -1,67 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: addressable
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.8.0
 platform: ruby
 authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+        version: 2.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.9.0
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '3.0'
 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
-  adds support for IRIs and URI templates.
+  Addressable is an alternative implementation to the URI implementation that is
+  part of Ruby's standard library. It is flexible, offers heuristic parsing, and
+  additionally provides extensive support for IRIs and URI templates.
 email: bob@sporkmonger.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- CHANGELOG.md
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- addressable.gemspec
+- data/unicode.data
+- lib/addressable.rb
 - lib/addressable/idna.rb
 - lib/addressable/idna/native.rb
 - lib/addressable/idna/pure.rb
@@ -70,46 +76,39 @@ files:
 - lib/addressable/version.rb
 - spec/addressable/idna_spec.rb
 - spec/addressable/net_http_compat_spec.rb
+- spec/addressable/security_spec.rb
 - spec/addressable/template_spec.rb
 - spec/addressable/uri_spec.rb
 - spec/spec_helper.rb
-- data/unicode.data
 - tasks/clobber.rake
 - tasks/gem.rake
 - tasks/git.rake
 - tasks/metrics.rake
+- tasks/profile.rake
 - tasks/rspec.rake
-- tasks/rubyforge.rake
 - tasks/yard.rake
-- website/index.html
-- CHANGELOG.md
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-homepage: http://addressable.rubyforge.org/
+homepage: https://github.com/sporkmonger/addressable
 licenses:
-- Apache License 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: addressable
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: URI Implementation

data/tasks/rubyforge.rake

@@ -1,73 +0,0 @@
-namespace :gem do
-  desc 'Package and upload to RubyForge'
-  task :release => ["gem:package", "gem:gemspec"] do |t|
-    require 'rubyforge'
-
-    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
-    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PKG_VERSION
-    pkg = "pkg/#{GEM_SPEC.full_name}"
-
-    rf = RubyForge.new
-    rf.configure
-    puts 'Logging in...'
-    rf.login
-
-    c = rf.userconfig
-    changelog = File.open("CHANGELOG.md") { |file| file.read }
-    c['release_changes'] = changelog
-    c['preformatted'] = true
-
-    files = ["#{pkg}.tgz", "#{pkg}.zip", "#{pkg}.gem"]
-
-    puts "Releasing #{PKG_NAME} v. #{PKG_VERSION}"
-    rf.add_release RUBY_FORGE_PROJECT, PKG_NAME, PKG_VERSION, *files
-  end
-end
-
-namespace :spec do
-  desc "Publish specdoc to RubyForge"
-  task :release => ["spec:specdoc"] do
-    require "rake/contrib/sshpublisher"
-    require "yaml"
-
-    config = YAML.load(
-      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = RUBY_FORGE_PATH + "/specdoc"
-    local_dir = "specdoc"
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-
-  namespace :rcov do
-    desc "Publish coverage report to RubyForge"
-    task :release => ["spec:rcov"] do
-      require "rake/contrib/sshpublisher"
-      require "yaml"
-
-      config = YAML.load(
-        File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-      )
-      host = "#{config['username']}@rubyforge.org"
-      remote_dir = RUBY_FORGE_PATH + "/coverage"
-      local_dir = "coverage"
-      Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-    end
-  end
-end
-
-namespace :website do
-  desc "Publish website to RubyForge"
-  task :release => ["doc:release", "spec:release", "spec:rcov:release"] do
-    require "rake/contrib/sshpublisher"
-    require "yaml"
-
-    config = YAML.load(
-      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = RUBY_FORGE_PATH
-    local_dir = "website"
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-end

data/website/index.html

@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <title>Addressable</title>
-    <style type="text/css">
-      * {
-        font-size: 100%;
-        margin: 0;
-        padding: 0;
-      }
-      
-      body {
-        font-family: lucida grande, verdana, sans-serif;
-        margin: 1em;
-      }
-      
-      a {
-        color: #880000;
-      }
-
-      a:visited {
-        color: #333333;
-      }
-      
-      h1 {
-        font-size: 2em;
-        margin: 0 0 0.8em 0;
-        text-align: center;
-      }
-      
-      h2 {
-        font-size: 1em;
-        margin: 0.8em 0;
-      }
-      
-      p {
-        margin: 0.8em 0;
-      }
-
-      ul {
-        font-size: 0.9em;
-        margin: 0 0 0 1.5em;
-      }
-      
-      div {
-        width: 50%;
-        margin: 0 auto;
-        padding: 0.8em;
-        background-color: #AA5852;
-        border: 2px solid #C2645D;
-      }
-
-      @media print {
-        body {
-          font-size: 0.9em;
-        }
-        
-        a {
-          text-decoration: none;
-          color: #000;
-        }
-      }
-    </style>
-  </head>
-  <body>
-    <h1>Addressable</h1>
-    <div>
-      <p>
-        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 adds support for IRIs and URI templates.
-      </p>
-      <ul>
-        <li>
-          <a href="http://rubyforge.org/projects/addressable/">
-            Project Page
-          </a>
-        </li>
-        <li>
-          <a href="http://github.com/sporkmonger/addressable">
-            GitHub Page
-          </a>
-        </li>
-        <li><a href="http://rubydoc.info/gems/addressable">API</a></li>
-        <li><a href="/specdoc/">Specifications</a></li>
-        <li><a href="/coverage/">Code Coverage</a></li>
-      </ul>
-      <p>
-        You know what to do:
-      </p>
-      <p>
-        <code>sudo gem install addressable</code>
-      </p>
-      <p>
-        Alternatively, you can:
-      </p>
-      <p>
-        <code>
-          git submodule add
-            git://github.com/sporkmonger/addressable.git
-            vendor/gems/addressable
-        </code>
-      </p>
-      <p>
-        Addressable works in Ruby 1.8.x, 1.9.x, and JRuby.
-      </p>
-    </div>
-  </body>
-</html>