addressable 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 531a87b0fdf38663665568cd7e14775397618665
-  data.tar.gz: 88cc34caa61da92564835b0cf34a6e1ab8b7bb9c
+  metadata.gz: 42b16f73eeb6e9fe31be8acca16028ec89e5a083
+  data.tar.gz: 988538325db6737260f2ac394e84d349fdbe2f79
 SHA512:
-  metadata.gz: c6e81bbd48d26f2df9b2291e2fa8210d467172696e6e8cf9007326eab8efb5b9687cc6db21d40e96005006b3f2ce0b25abdd2bb26143c5f6833156e1f01b6a97
-  data.tar.gz: 05d5510dba6d0a581372c226bb5bc6d1e3f451b4a3b99e47f0ca26558368789706c5250dd3f755f0052a307f3e1562b343abfc33904b8cefd8d4a7f6f6f5e412
+  metadata.gz: be930a660ee582f6d780ab759085489652f9c5a68d51177247b1aff10e06df0e95a2d149f0c37206e1d5e4b2dc63fca24b6e46aaed3082c26e3b2ee9e3c718d8
+  data.tar.gz: 03eba1032a368e484693085431a5890cbec4c09290c69d06b71a5c59d088bd1be11632d9d32581f2f20d37939b466bcbc98dcfc1a870f086feb6267a8755eacf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Addressable 2.3.8
+- fix warnings
+- update dependency gems
+- support for 1.8.x officially deprecated
+
 # Addressable 2.3.7
 - fix scenario in which invalid URIs don't get an exception until inspected
 - handle hostnames with two adjacent periods correctly

data/Gemfile

@@ -1,14 +1,17 @@
 source 'https://rubygems.org'
 
+gemspec
+
 group :development do
-  gem 'launchy'
   gem 'yard'
   gem 'redcarpet', :platform => :mri_19
   gem 'rubyforge'
 end
 
 group :test, :development do
-  gem 'coveralls', :require => false
+  gem 'coveralls', :require => false, :platforms => [
+    :ruby_19, :ruby_20, :ruby_21, :rbx, :jruby
+  ]
 end
 
 gem 'idn', :platform => :mri_18
@@ -16,11 +19,9 @@ gem 'idn-ruby', :platform => :mri_19
 
 platforms :ruby_18 do
   gem 'mime-types', '~> 1.25'
-  gem 'rest-client', '~> 1.6.0'
+  gem 'rest-client', '~> 1.6.8'
 end
 
 platforms :rbx do
-  gem 'rubysl-openssl', '2.1.0'
+  gem 'rubysl-openssl', '2.2.1'
 end
-
-gemspec

data/README.md

@@ -3,7 +3,7 @@
 <dl>
   <dt>Homepage</dt><dd><a href="http://addressable.rubyforge.org/">addressable.rubyforge.org</a></dd>
   <dt>Author</dt><dd><a href="mailto:bob@sporkmonger.com">Bob Aman</a></dd>
-  <dt>Copyright</dt><dd>Copyright © 2006-2014 Bob Aman</dd>
+  <dt>Copyright</dt><dd>Copyright © 2006-2015 Bob Aman</dd>
   <dt>License</dt><dd>Apache 2.0</dd>
 </dl>
 
@@ -73,7 +73,7 @@ template.partial_expand({"one" => "1", "three" => 3}).pattern
 #=> "http://example.com/?one=1{&two}&three=3"
 
 template = Addressable::Template.new(
-  "http://{host}{/segments}/{?one,two,bogus}{#fragment}"
+  "http://{host}{/segments*}/{?one,two,bogus}{#fragment}"
 )
 uri = Addressable::URI.parse(
   "http://example.com/a/b/c/?one=1&two=2#foo"

data/Rakefile

@@ -10,11 +10,6 @@ PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME       = "REL #{PKG_VERSION}"
 
-RUBY_FORGE_PROJECT = PKG_NAME
-RUBY_FORGE_USER    = "sporkmonger"
-RUBY_FORGE_PATH    = "/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}"
-RUBY_FORGE_URL     = "http://#{RUBY_FORGE_PROJECT}.rubyforge.org/"
-
 PKG_SUMMARY        = "URI Implementation"
 PKG_DESCRIPTION    = <<-TEXT
 Addressable is a replacement for the URI implementation that is part of

data/addressable.gemspec

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+# stub: addressable 2.3.8 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "addressable"
+  s.version = "2.3.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Bob Aman"]
+  s.date = "2015-03-27"
+  s.description = "Addressable is a replacement for the URI implementation that is part of\nRuby's standard library. It more closely conforms to the relevant RFCs and\nadds support for IRIs and URI templates.\n"
+  s.email = "bob@sporkmonger.com"
+  s.extra_rdoc_files = ["README.md"]
+  s.files = ["CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "addressable.gemspec", "data/unicode.data", "lib/addressable/idna.rb", "lib/addressable/idna/native.rb", "lib/addressable/idna/pure.rb", "lib/addressable/template.rb", "lib/addressable/uri.rb", "lib/addressable/version.rb", "spec/addressable/idna_spec.rb", "spec/addressable/net_http_compat_spec.rb", "spec/addressable/template_spec.rb", "spec/addressable/uri_spec.rb", "spec/spec_helper.rb", "tasks/clobber.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/rspec.rake", "tasks/yard.rake", "website/index.html"]
+  s.homepage = "https://github.com/sporkmonger/addressable"
+  s.licenses = ["Apache License 2.0"]
+  s.rdoc_options = ["--main", "README.md"]
+  s.rubygems_version = "2.4.6"
+  s.summary = "URI Implementation"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>, [">= 10.4.2", "~> 10.4"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
+      s.add_development_dependency(%q<rspec-its>, ["~> 1.1"])
+      s.add_development_dependency(%q<launchy>, [">= 2.4.3", "~> 2.4"])
+    else
+      s.add_dependency(%q<rake>, [">= 10.4.2", "~> 10.4"])
+      s.add_dependency(%q<rspec>, ["~> 3.0"])
+      s.add_dependency(%q<rspec-its>, ["~> 1.1"])
+      s.add_dependency(%q<launchy>, [">= 2.4.3", "~> 2.4"])
+    end
+  else
+    s.add_dependency(%q<rake>, [">= 10.4.2", "~> 10.4"])
+    s.add_dependency(%q<rspec>, ["~> 3.0"])
+    s.add_dependency(%q<rspec-its>, ["~> 1.1"])
+    s.add_dependency(%q<launchy>, [">= 2.4.3", "~> 2.4"])
+  end
+end

data/lib/addressable/idna.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/addressable/idna/native.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/addressable/idna/pure.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/addressable/template.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/addressable/uri.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,6 +19,10 @@
 require "addressable/version"
 require "addressable/idna"
 
+if RUBY_VERSION =~ /^1.8/
+  warn('Support for Ruby 1.8.x in Addressable is deprecated.')
+end
+
 ##
 # Addressable is a library for processing links and URIs.
 module Addressable
@@ -262,7 +266,7 @@ module Addressable
           "/#{$1.downcase}:/"
         end
         uri.path.gsub!(/\\/, SLASH)
-        if File.exists?(uri.path) &&
+        if File.exist?(uri.path) &&
             File.stat(uri.path).directory?
           uri.path.gsub!(/\/$/, EMPTY_STR)
           uri.path = uri.path + '/'
@@ -1501,7 +1505,8 @@ module Addressable
     # @param [Class] return_type The return type desired. Value must be either
     #   `Hash` or `Array`.
     #
-    # @return [Hash, Array] The query string parsed as a Hash or Array object.
+    # @return [Hash, Array, nil] The query string parsed as a Hash or Array
+    #   or nil if the query string is blank.
     #
     # @example
     #   Addressable::URI.parse("?one=1&two=2&three=3").query_values
@@ -1510,6 +1515,10 @@ module Addressable
     #   #=> [["one", "two"], ["one", "three"]]
     #   Addressable::URI.parse("?one=two&one=three").query_values(Hash)
     #   #=> {"one" => "three"}
+    #   Addressable::URI.parse("?").query_values
+    #   #=> {}
+    #   Addressable::URI.parse("").query_values
+    #   #=> nil
     def query_values(return_type=Hash)
       empty_accumulator = Array == return_type ? [] : {}
       if return_type != Hash && return_type != Array

data/lib/addressable/version.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ if !defined?(Addressable::VERSION)
     module VERSION
       MAJOR = 2
       MINOR = 3
-      TINY  = 7
+      TINY  = 8
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/addressable/idna_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/spec/addressable/net_http_compat_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/spec/addressable/template_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 require "spec_helper"
 
+require "bigdecimal"
 require "addressable/template"
 
 shared_examples_for 'expands' do |tests|
@@ -75,8 +76,6 @@ describe "==" do
 end
 
 describe "Type conversion" do
-  require "bigdecimal"
-
   subject {
     {
       :var => true,
@@ -749,7 +748,7 @@ describe Addressable::Template do
     }
     context "first uri with ExampleTwoProcessor" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/search/{query}/"
         ).match(uri, ExampleTwoProcessor)
       }
@@ -759,7 +758,7 @@ describe Addressable::Template do
 
     context "second uri with ExampleTwoProcessor" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{first}/{+second}/"
         ).match(uri2, ExampleTwoProcessor)
       }
@@ -769,7 +768,7 @@ describe Addressable::Template do
 
     context "second uri with DumbProcessor" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{first}/{+second}/"
         ).match(uri2, DumbProcessor)
       }
@@ -779,7 +778,7 @@ describe Addressable::Template do
 
     context "second uri" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{first}{/second*}/"
         ).match(uri2)
       }
@@ -788,7 +787,7 @@ describe Addressable::Template do
     end
     context "third uri" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{;hash*,first}"
         ).match(uri3)
       }
@@ -801,7 +800,7 @@ describe Addressable::Template do
     # Semantically, a separate key is more likely, but both are possible.
     context "fourth uri" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{?hash*,first}"
         ).match(uri4)
       }
@@ -811,7 +810,7 @@ describe Addressable::Template do
     end
     context "fifth uri" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{path}{?hash*,first}"
         ).match(uri5)
       }

data/spec/addressable/uri_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) 2006-2015 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -173,6 +173,28 @@ describe Addressable::URI, "when created with an invalid host" do
   end
 end
 
+describe Addressable::URI, "when created with a host consisting of " +
+    "sub-delims characters" do
+  it "should not raise an error" do
+    expect(lambda do
+      Addressable::URI.new(
+        :host => Addressable::URI::CharacterClasses::SUB_DELIMS.gsub(/\\/, '')
+      )
+    end).not_to raise_error
+  end
+end
+
+describe Addressable::URI, "when created with a host consisting of " +
+    "unreserved characters" do
+  it "should not raise an error" do
+    expect(lambda do
+      Addressable::URI.new(
+        :host => Addressable::URI::CharacterClasses::UNRESERVED.gsub(/\\/, '')
+      )
+    end).not_to raise_error
+  end
+end
+
 describe Addressable::URI, "when created from nil components" do
   before do
     @uri = Addressable::URI.new

data/spec/spec_helper.rb

@@ -6,3 +6,7 @@ begin
 rescue LoadError
   warn "warning: coveralls gem not found; skipping Coveralls"
 end
+
+RSpec.configure do |config|
+  config.warnings = true
+end

data/tasks/gem.rake

@@ -18,17 +18,16 @@ namespace :gem do
       exit(1)
     end
 
-    s.add_development_dependency 'rake', '~> 0.7', '>= 0.7.3'
+    s.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
     s.add_development_dependency 'rspec', '~> 3.0'
     s.add_development_dependency 'rspec-its', '~> 1.1'
-    s.add_development_dependency 'launchy', '~> 0.3', '>= 0.3.2'
+    s.add_development_dependency 'launchy', '~> 2.4', '>= 2.4.3'
 
     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.homepage = "https://github.com/sporkmonger/addressable"
     s.license = "Apache License 2.0"
   end
 
@@ -77,6 +76,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/rspec.rake

@@ -32,7 +32,7 @@ namespace :spec do
     desc "Browse the code coverage report."
     task :browse => "spec:rcov" do
       require "launchy"
-      Launchy::Browser.run("coverage/index.html")
+      Launchy.open("coverage/index.html")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: addressable
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +64,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 2.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 2.4.3
 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
@@ -93,6 +93,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- addressable.gemspec
 - data/unicode.data
 - lib/addressable/idna.rb
 - lib/addressable/idna/native.rb
@@ -110,10 +111,9 @@ files:
 - tasks/git.rake
 - tasks/metrics.rake
 - tasks/rspec.rake
-- tasks/rubyforge.rake
 - tasks/yard.rake
 - website/index.html
-homepage: http://addressable.rubyforge.org/
+homepage: https://github.com/sporkmonger/addressable
 licenses:
 - Apache License 2.0
 metadata: {}
@@ -134,8 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: addressable
-rubygems_version: 2.4.1
+rubyforge_project: 
+rubygems_version: 2.4.6
 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