addressable 2.7.0 → 2.8.0

data/spec/spec_helper.rb

@@ -16,6 +16,15 @@ rescue LoadError
     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|

data/tasks/gem.rake

@@ -11,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"]
 

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

@@ -5,7 +5,7 @@ require "rspec/core/rake_task"
 namespace :spec do
   RSpec::Core::RakeTask.new(:simplecov) do |t|
     t.pattern = FileList['spec/**/*_spec.rb']
-    t.rspec_opts = ['--color', '--format', 'documentation']
+    t.rspec_opts = %w[--color --format documentation] unless ENV["CI"]
   end
 
   namespace :simplecov do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: addressable
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
@@ -65,6 +65,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- addressable.gemspec
 - data/unicode.data
 - lib/addressable.rb
 - lib/addressable/idna.rb
@@ -75,7 +76,6 @@ files:
 - lib/addressable/version.rb
 - spec/addressable/idna_spec.rb
 - spec/addressable/net_http_compat_spec.rb
-- spec/addressable/rack_mount_compat_spec.rb
 - spec/addressable/security_spec.rb
 - spec/addressable/template_spec.rb
 - spec/addressable/uri_spec.rb
@@ -84,6 +84,7 @@ files:
 - tasks/gem.rake
 - tasks/git.rake
 - tasks/metrics.rake
+- tasks/profile.rake
 - tasks/rspec.rake
 - tasks/yard.rake
 homepage: https://github.com/sporkmonger/addressable
@@ -107,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: URI Implementation

data/spec/addressable/rack_mount_compat_spec.rb

@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-# coding: utf-8
-# Copyright (C) Bob Aman
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-
-require "spec_helper"
-
-require "addressable/uri"
-require "addressable/template"
-require "rack/mount"
-
-describe Rack::Mount do
-  let(:app_one) do
-    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 1'] }
-  end
-  let(:app_two) do
-    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 2'] }
-  end
-  let(:app_three) do
-    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 3'] }
-  end
-  let(:routes) do
-    s = Rack::Mount::RouteSet.new do |set|
-      set.add_route(app_one, {
-        :request_method => 'GET',
-        :path_info => Addressable::Template.new('/one/{id}/')
-      }, {:id => 'unidentified'}, :one)
-      set.add_route(app_two, {
-        :request_method => 'GET',
-        :path_info => Addressable::Template.new('/two/')
-      }, {:id => 'unidentified'}, :two)
-      set.add_route(app_three, {
-        :request_method => 'GET',
-        :path_info => Addressable::Template.new('/three/{id}/').to_regexp
-      }, {:id => 'unidentified'}, :three)
-    end
-    s.rehash
-    s
-  end
-
-  it "should generate from routes with Addressable::Template" do
-    path, _ = routes.generate(:path_info, :one, {:id => '123'})
-    expect(path).to eq '/one/123/'
-  end
-
-  it "should generate from routes with Addressable::Template using defaults" do
-    path, _ = routes.generate(:path_info, :one, {})
-    expect(path).to eq '/one/unidentified/'
-  end
-
-  it "should recognize routes with Addressable::Template" do
-    request = Rack::Request.new(
-      'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/one/123/'
-    )
-    route, _, params = routes.recognize(request)
-    expect(route).not_to be_nil
-    expect(route.app).to eq app_one
-    expect(params).to eq({id: '123'})
-  end
-
-  it "should generate from routes with Addressable::Template" do
-    path, _ = routes.generate(:path_info, :two, {:id => '654'})
-    expect(path).to eq '/two/'
-  end
-
-  it "should generate from routes with Addressable::Template using defaults" do
-    path, _ = routes.generate(:path_info, :two, {})
-    expect(path).to eq '/two/'
-  end
-
-  it "should recognize routes with Addressable::Template" do
-    request = Rack::Request.new(
-      'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/two/'
-    )
-    route, _, params = routes.recognize(request)
-    expect(route).not_to be_nil
-    expect(route.app).to eq app_two
-    expect(params).to eq({id: 'unidentified'})
-  end
-
-  it "should recognize routes with derived Regexp" do
-    request = Rack::Request.new(
-      'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/three/789/'
-    )
-    route, _, params = routes.recognize(request)
-    expect(route).not_to be_nil
-    expect(route.app).to eq app_three
-    expect(params).to eq({id: '789'})
-  end
-end