addressable 2.3.4 → 2.3.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7469c2a80add393372ae8c44de978834410a65fc
+  data.tar.gz: ff31775eb9800b5aa84260a06c7fb6b6c93c855e
+SHA512:
+  metadata.gz: d0542072bdbf9520eed193aa4b8fddb95bd8869662ec23566529bb6ecf9688ccaba3dd4b77bdcea889862d7947a71b9bf4770dbc6eb872cc84b976f781bfd5f2
+  data.tar.gz: 39ca65c92ecdc6d4891c794e56876e7a3923182c1de78691c9e0b794eea0d93ffe100766706825a5abefd911ac3f392687992eb04de9bbfd44d33b428fb2d6d4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Addressable 2.3.5
+- added Addressable::URI#empty? method
+- Addressable::URI#hostname methods now strip square brackets from IPv6 hosts
+- compatibility with Net::HTTP in Ruby 2.0.0
+- Addressable::URI#route_from should always give relative URIs
+
 # Addressable 2.3.4
 - fixed issue with encoding altering its inputs
 - query string normalization now leaves ';' characters alone

data/Gemfile

@@ -10,6 +10,7 @@ end
 group :test, :development do
   gem 'rake', '>= 0.7.3'
   gem 'rspec', '>= 2.9.0'
+  gem 'coveralls', :require => false
 end
 
 gem 'idn', :platform => :mri_18

data/README.md

@@ -3,12 +3,19 @@
 <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 © 2010 Bob Aman</dd>
+  <dt>Copyright</dt><dd>Copyright © 2006-2013 Bob Aman</dd>
   <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)
+[![Gem Version](https://badge.fury.io/rb/addressable.png)][gem]
+[![Build Status](https://secure.travis-ci.org/sporkmonger/addressable.png?branch=master)][travis]
+[![Dependency Status](https://gemnasium.com/sporkmonger/addressable.png?travis)][gemnasium]
+[![Coverage Status](https://coveralls.io/repos/sporkmonger/addressable/badge.png?branch=master)][coveralls]
+
+[gem]: https://rubygems.org/gems/addressable
+[travis]: http://travis-ci.org/sporkmonger/addressable
+[gemnasium]: https://gemnasium.com/sporkmonger/addressable
+[coveralls]: https://coveralls.io/r/sporkmonger/addressable
 
 # Description
 

data/lib/addressable/idna.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2011 Bob Aman
+# Copyright (C) 2006-2013 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-2011 Bob Aman
+# Copyright (C) 2006-2013 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-2011 Bob Aman
+# Copyright (C) 2006-2013 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-2011 Bob Aman
+# Copyright (C) 2006-2013 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -487,6 +487,7 @@ module Addressable
     #   #=> "http://example.com/?one=1{&two}&three=3"
     def partial_expand(mapping, processor=nil)
       result = self.pattern.dup
+      mapping = normalize_keys(mapping)
       result.gsub!( EXPRESSION ) do |capture|
         transform_partial_capture(mapping, capture, processor)
       end

data/lib/addressable/uri.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2011 Bob Aman
+# Copyright (C) 2006-2013 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -1089,12 +1089,32 @@ module Addressable
     end
 
     ##
+    # This method is same as URI::Generic#host except
+    # brackets for IPv6 (and 'IPvFuture') addresses are removed.
+    #
     # @see Addressable::URI#host
-    alias_method :hostname, :host
+    #
+    # @return [String] The hostname for this URI.
+    def hostname
+      v = self.host
+      /\A\[(.*)\]\z/ =~ v ? $1 : v
+    end
 
     ##
+    # This method is same as URI::Generic#host= except
+    # the argument can be a bare IPv6 address (or 'IPvFuture').
+    #
     # @see Addressable::URI#host=
-    alias_method :hostname=, :host=
+    #
+    # @param [String, #to_str] new_hostname The new hostname for this URI.
+    def hostname=(new_hostname)
+      if new_hostname && !new_hostname.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_hostname.class} into String."
+      end
+      v = new_hostname ? new_hostname.to_str : nil
+      v = "[#{v}]" if /\A\[.*\]\z/ !~ v && /:/ =~ v
+      self.host = v
+    end
 
     ##
     # The authority component for this URI.
@@ -1175,7 +1195,7 @@ module Addressable
 
     ##
     # The origin for this URI, serialized to ASCII, as per
-    # draft-ietf-websec-origin-00, section 5.2.
+    # RFC 6454, section 6.2.
     #
     # @return [String] The serialized origin.
     def origin
@@ -1771,7 +1791,7 @@ module Addressable
       end
       joined_fragment = uri.fragment
 
-      return Addressable::URI.new(
+      return self.class.new(
         :scheme => joined_scheme,
         :user => joined_user,
         :password => joined_password,
@@ -1827,7 +1847,7 @@ module Addressable
         end
       end
 
-      uri = Addressable::URI.new
+      uri = self.class.new
       uri.defer_validation do
         # Bunch of crazy logic required because of the composite components
         # like userinfo and authority.
@@ -1911,9 +1931,16 @@ module Addressable
               components[:query] = nil
             end
           else
-            if uri.path != SLASH
-              components[:path] = components[:path].gsub(
-                Regexp.new("^" + Regexp.escape(uri.path)), EMPTY_STR)
+            if uri.path != SLASH and components[:path]
+              self_splitted_path = split_path(components[:path])
+              uri_splitted_path = split_path(uri.path)
+              self_dir = self_splitted_path.shift
+              uri_dir = uri_splitted_path.shift
+              while !self_splitted_path.empty? && !uri_splitted_path.empty? and self_dir == uri_dir
+                self_dir = self_splitted_path.shift
+                uri_dir = uri_splitted_path.shift
+              end
+              components[:path] = (uri_splitted_path.fill('..') + [self_dir] + self_splitted_path).join(SLASH)
             end
           end
         end
@@ -1968,7 +1995,7 @@ module Addressable
         end
       end
 
-      return Addressable::URI.new(
+      return self.class.new(
         :scheme => normalized_scheme,
         :authority => normalized_authority,
         :path => normalized_path,
@@ -2065,7 +2092,7 @@ module Addressable
     #
     # @return [Addressable::URI] The cloned URI.
     def dup
-      duplicated_uri = Addressable::URI.new(
+      duplicated_uri = self.class.new(
         :scheme => self.scheme ? self.scheme.dup : nil,
         :user => self.user ? self.user.dup : nil,
         :password => self.password ? self.password.dup : nil,
@@ -2121,6 +2148,15 @@ module Addressable
       replace_self(self.omit(*components))
     end
 
+    ##
+    # Determines if the URI is an empty string.
+    #
+    # @return [TrueClass, FalseClass]
+    #   Returns <code>true</code> if empty, <code>false</code> otherwise.
+    def empty?
+      return self.to_s.empty?
+    end
+
     ##
     # Converts the URI to a <code>String</code>.
     #
@@ -2239,7 +2275,7 @@ module Addressable
     # Ensures that the URI is valid.
     def validate
       return if !!@validation_deferred
-      if self.scheme != nil &&
+      if self.scheme != nil && self.ip_based? &&
           (self.host == nil || self.host.empty?) &&
           (self.path == nil || self.path.empty?)
         raise InvalidURIError,
@@ -2283,5 +2319,19 @@ module Addressable
       @fragment = uri.fragment
       return self
     end
+
+    ##
+    # Splits path string with "/"(slash).
+    # It is considered that there is empty string after last slash when
+    # path ends with slash.
+    #
+    # @param [String] path The path to split.
+    #
+    # @return [Array<String>] An array of parts of path.
+    def split_path(path)
+      splitted = path.split(SLASH)
+      splitted << EMPTY_STR if path.end_with? SLASH
+      splitted
+    end
   end
 end

data/lib/addressable/version.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2011 Bob Aman
+# Copyright (C) 2006-2013 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  = 4
+      TINY  = 5
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/addressable/idna_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2011 Bob Aman
+# Copyright (C) 2006-2013 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 #    limitations under the License.
 
 
+require "spec_helper"
+
 # Have to use RubyGems to load the idn gem.
 require "rubygems"
 

data/spec/addressable/net_http_compat_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2011 Bob Aman
+# Copyright (C) 2006-2013 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 #    limitations under the License.
 
 
+require "spec_helper"
+
 require "addressable/uri"
 require "net/http"
 

data/spec/addressable/template_spec.rb

@@ -1,3 +1,21 @@
+# coding: utf-8
+# Copyright (C) 2006-2013 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/template"
 
 shared_examples_for 'expands' do |tests|
@@ -736,7 +754,45 @@ describe Addressable::Template do
       }
     end
   end
-  describe "Partial expand" do
+  describe "Partial expand with symbols" do
+    context "partial_expand with two simple values" do
+      subject{
+        Addressable::Template.new("http://example.com/{one}/{two}/")
+      }
+      it "builds a new pattern" do
+        subject.partial_expand(:one => "1").pattern.should ==
+          "http://example.com/1/{two}/"
+      end
+    end
+    context "partial_expand query with missing param in middle" do
+      subject{
+        Addressable::Template.new("http://example.com/{?one,two,three}/")
+      }
+      it "builds a new pattern" do
+        subject.partial_expand(:one => "1", :three => "3").pattern.should ==
+          "http://example.com/?one=1{&two}&three=3/"
+      end
+    end
+    context "partial_expand with query string" do
+      subject{
+        Addressable::Template.new("http://example.com/{?two,one}/")
+      }
+      it "builds a new pattern" do
+        subject.partial_expand(:one => "1").pattern.should ==
+          "http://example.com/{?two}&one=1/"
+      end
+    end
+    context "partial_expand with path operator" do
+      subject{
+        Addressable::Template.new("http://example.com{/one,two}/")
+      }
+      it "builds a new pattern" do
+        subject.partial_expand(:one => "1").pattern.should ==
+          "http://example.com/1{/two}/"
+      end
+    end
+  end
+  describe "Partial expand with strings" do
     context "partial_expand with two simple values" do
       subject{
         Addressable::Template.new("http://example.com/{one}/{two}/")

data/spec/addressable/uri_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2011 Bob Aman
+# Copyright (C) 2006-2013 Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 #    limitations under the License.
 
 
+require "spec_helper"
+
 require "addressable/uri"
 
 if !"".respond_to?("force_encoding")
@@ -41,14 +43,18 @@ if !"".respond_to?("force_encoding")
   end
 end
 
-module URI
-  class HTTP
-    def initialize(uri)
-      @uri = uri
-    end
+module Fake
+  module URI
+    class HTTP
+      def initialize(uri)
+        @uri = uri
+      end
 
-    def to_s
-      return @uri.to_s
+      def to_s
+        return @uri.to_s
+      end
+
+      alias :to_str :to_s
     end
   end
 end
@@ -179,6 +185,10 @@ describe Addressable::URI, "when created from nil components" do
     @uri.default_port.should == nil
   end
 
+  it "should be empty" do
+    @uri.should be_empty
+  end
+
   it "should raise an error if the scheme is set to whitespace" do
     (lambda do
       @uri.scheme = "\t \n"
@@ -333,11 +343,14 @@ describe Addressable::URI, "when initialized from individual components" do
       "http://user:password@example.com:8080/path?query=value#fragment"
   end
 
+  it "should not be empty" do
+    @uri.should_not be_empty
+  end
+
   it "should not be frozen" do
     @uri.should_not be_frozen
   end
 
-
   it "should allow destructive operations" do
     expect { @uri.normalize! }.not_to raise_error
   end
@@ -459,6 +472,10 @@ describe Addressable::URI, "when initialized from " +
       "http://user:password@example.com:8080/path?query=value#fragment"
   end
 
+  it "should not be empty" do
+    @uri.should_not be_empty
+  end
+
   it "should not be frozen" do
     @uri.should_not be_frozen
   end
@@ -576,6 +593,10 @@ describe Addressable::URI, "when parsed from a frozen string" do
       "http://user:password@example.com:8080/path?query=value#fragment"
   end
 
+  it "should not be empty" do
+    @uri.should_not be_empty
+  end
+
   it "should not be frozen" do
     @uri.should_not be_frozen
   end
@@ -690,6 +711,10 @@ describe Addressable::URI, "when frozen" do
     @uri.to_s.should == ''
   end
 
+  it "should be empty" do
+    @uri.should be_empty
+  end
+
   it "should be frozen" do
     @uri.should be_frozen
   end
@@ -822,6 +847,10 @@ describe Addressable::URI, "when frozen" do
     @uri.normalize.to_s.should == 'http://example.com/path?a=1#123'
   end
 
+  it "should not be empty" do
+    @uri.should_not be_empty
+  end
+
   it "should be frozen" do
     @uri.should be_frozen
   end
@@ -977,7 +1006,7 @@ end
 describe Addressable::URI, "when parsed from something that looks " +
     "like a URI object" do
   it "should parse without error" do
-    uri = Addressable::URI.parse(URI::HTTP.new("http://example.com/"))
+    uri = Addressable::URI.parse(Fake::URI::HTTP.new("http://example.com/"))
     (lambda do
       Addressable::URI.parse(uri)
     end).should_not raise_error
@@ -1210,6 +1239,50 @@ describe Addressable::URI, "when parsed from " +
   end
 end
 
+# Section 2 of RFC 6068
+describe Addressable::URI, "when parsed from " +
+    "'mailto:?to=addr1@an.example,addr2@an.example'" do
+  before do
+    @uri = Addressable::URI.parse(
+      "mailto:?to=addr1@an.example,addr2@an.example"
+    )
+  end
+
+  it "should use the 'mailto' scheme" do
+    @uri.scheme.should == "mailto"
+  end
+
+  it "should not be considered to be ip-based" do
+    @uri.should_not be_ip_based
+  end
+
+  it "should not have an inferred_port" do
+    @uri.inferred_port.should == nil
+  end
+
+  it "should have a path of ''" do
+    @uri.path.should == ""
+  end
+
+  it "should not have a request URI" do
+    @uri.request_uri.should == nil
+  end
+
+  it "should have the To: field value parameterized" do
+    @uri.query_values(Hash)["to"].should == (
+      "addr1@an.example,addr2@an.example"
+    )
+  end
+
+  it "should be considered to be in normal form" do
+    @uri.normalize.should be_eql(@uri)
+  end
+
+  it "should have a 'null' origin" do
+    @uri.origin.should == 'null'
+  end
+end
+
 # Section 1.1.2 of RFC 3986
 describe Addressable::URI, "when parsed from " +
     "'news:comp.infosystems.www.servers.unix'" do
@@ -1564,9 +1637,9 @@ describe Addressable::URI, "when parsed from " +
       Addressable::URI.parse("/path/")
   end
 
-  it "should have a route of '/' from 'http://example.com/path/'" do
+  it "should have a route of '..' from 'http://example.com/path/'" do
     @uri.route_from("http://example.com/path/").should ==
-      Addressable::URI.parse("/")
+      Addressable::URI.parse("..")
   end
 
   it "should have a route of '#' to 'http://example.com/'" do
@@ -1771,6 +1844,28 @@ describe Addressable::URI, "when parsing IPv6 addresses" do
   end
 end
 
+describe Addressable::URI, "when parsing IPv6 address" do
+  subject { Addressable::URI.parse("http://[3ffe:1900:4545:3:200:f8ff:fe21:67cf]/") }
+  its(:host) { should == '[3ffe:1900:4545:3:200:f8ff:fe21:67cf]' }
+  its(:hostname) { should == '3ffe:1900:4545:3:200:f8ff:fe21:67cf' }
+end
+
+describe Addressable::URI, "when assigning IPv6 address" do
+  it "should allow to set bare IPv6 address as hostname" do
+    uri = Addressable::URI.parse("http://[::1]/")
+    uri.hostname = '3ffe:1900:4545:3:200:f8ff:fe21:67cf'
+    uri.to_s.should == 'http://[3ffe:1900:4545:3:200:f8ff:fe21:67cf]/'
+  end
+
+  it "should not allow to set bare IPv6 address as host" do
+    uri = Addressable::URI.parse("http://[::1]/")
+    pending "not checked"
+    (lambda do
+      uri.host = '3ffe:1900:4545:3:200:f8ff:fe21:67cf'
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+end
+
 describe Addressable::URI, "when parsing IPvFuture addresses" do
   it "should not raise an error for " +
       "'http://[v9.3ffe:1900:4545:3:200:f8ff:fe21:67cf]/'" do
@@ -2438,10 +2533,10 @@ describe Addressable::URI, "when parsed from " +
       Addressable::URI.parse("http://example.com:8080/")
   end
 
-  it "should have a route of '/' from " +
+  it "should have a route of '../../' from " +
       "'http://example.com:8080/path/to/'" do
     @uri.route_from("http://example.com:8080/path/to/").should ==
-      Addressable::URI.parse("/")
+      Addressable::URI.parse("../../")
   end
 
   it "should have a route of 'http://example.com:8080/' from " +
@@ -2722,6 +2817,25 @@ describe Addressable::URI, "when parsed from " +
       Addressable::URI.parse("resource/")
   end
 
+  it "should have a route of '../' from " +
+    "'http://example.com/path/to/resource/sub'" do
+    @uri.route_from("http://example.com/path/to/resource/sub").should ==
+      Addressable::URI.parse("../")
+  end
+
+
+  it "should have a route of 'resource/' from " +
+    "'http://example.com/path/to/another'" do
+    @uri.route_from("http://example.com/path/to/another").should ==
+      Addressable::URI.parse("resource/")
+  end
+
+  it "should have a route of 'resource/' from " +
+      "'http://example.com/path/to/res'" do
+    @uri.route_from("http://example.com/path/to/res").should ==
+      Addressable::URI.parse("resource/")
+  end
+
   it "should have a route of 'resource/' from " +
       "'http://example.com:80/path/to/'" do
     @uri.route_from("http://example.com:80/path/to/").should ==
@@ -2740,10 +2854,10 @@ describe Addressable::URI, "when parsed from " +
       Addressable::URI.parse("http://example.com/path/to/resource/")
   end
 
-  it "should have a route of '/path/to/resource/' from " +
+  it "should have a route of '../../path/to/resource/' from " +
       "'http://example.com/to/resource/'" do
     @uri.route_from("http://example.com/to/resource/").should ==
-      Addressable::URI.parse("/path/to/resource/")
+      Addressable::URI.parse("../../path/to/resource/")
   end
 
   it "should correctly convert to a hash" do
@@ -3282,13 +3396,13 @@ describe Addressable::URI, "when parsed from " +
     @uri.normalize.should be_eql(@uri)
   end
 
-  it "should have a route of '/path/' to " +
+  it "should have a route of '../../' to " +
       "'http://user:pass@example.com/path/'" do
     @uri.route_to("http://user:pass@example.com/path/").should ==
-      Addressable::URI.parse("/path/")
+      Addressable::URI.parse("../../")
   end
 
-  it "should have a route of '/path/to/resource?query=x#fragment' " +
+  it "should have a route of 'to/resource?query=x#fragment' " +
       "from 'http://user:pass@example.com/path/'" do
     @uri.route_from("http://user:pass@example.com/path/").should ==
       Addressable::URI.parse("to/resource?query=x#fragment")
@@ -5694,3 +5808,29 @@ describe Addressable::URI, "when assigning path values" do
     end).should_not raise_error(Addressable::URI::InvalidURIError)
   end
 end
+
+describe Addressable::URI, "when initializing a subclass of Addressable::URI" do
+  before do
+    @uri = Class.new(Addressable::URI).new
+  end
+
+  it "should have the same class after being parsed" do
+    @uri.class.should == Addressable::URI.parse(@uri).class
+  end
+
+  it "should have the same class as its duplicate" do
+    @uri.class.should == @uri.dup.class
+  end
+
+  it "should have the same class after being normalized" do
+    @uri.class.should == @uri.normalize.class
+  end
+
+  it "should have the same class after being merged" do
+    @uri.class.should == @uri.merge(:path => 'path').class
+  end
+
+  it "should have the same class after being joined" do
+    @uri.class.should == @uri.join('path').class
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'coveralls'
+Coveralls.wear!

metadata

@@ -1,72 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: addressable
 version: !ruby/object:Gem::Version
-  version: 2.3.4
-  prerelease: 
+  version: 2.3.5
 platform: ruby
 authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
-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
-
+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.
-
-'
 email: bob@sporkmonger.com
 executables: []
 extensions: []
@@ -83,6 +72,7 @@ files:
 - spec/addressable/net_http_compat_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
@@ -100,6 +90,7 @@ files:
 homepage: http://addressable.rubyforge.org/
 licenses:
 - Apache License 2.0
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -107,21 +98,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: addressable
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: URI Implementation
 test_files: []