addressable 2.2.4 → 2.2.5

data/lib/addressable/version.rb

@@ -1,34 +1,28 @@
 # encoding:utf-8
 #--
-# Addressable, Copyright (c) 2006-2010 Bob Aman
+# Copyright (C) 2006-2011 Bob Aman
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+#    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
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#    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.
 #++
 
+
 # Used to prevent the class/module from being loaded more than once
 if !defined?(Addressable::VERSION)
   module Addressable
-    module VERSION #:nodoc:
+    module VERSION
       MAJOR = 2
       MINOR = 2
-      TINY  = 4
+      TINY  = 5
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/addressable/idna_spec.rb

@@ -1,30 +1,24 @@
-# encoding:utf-8
-#--
-# Addressable, Copyright (c) 2006-2007 Bob Aman
+# Copyright (C) 2006-2011 Bob Aman
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+#    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
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
+#    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.
+
+
+# Have to use RubyGems to load the idn gem.
+require "rubygems"
 
 require "addressable/idna"
 
-describe Addressable::IDNA, "when converting from unicode to ASCII" do
+shared_examples_for "converting from unicode to ASCII" do
   it "should convert 'www.google.com' correctly" do
     Addressable::IDNA.to_ascii("www.google.com").should == "www.google.com"
   end
@@ -131,7 +125,7 @@ describe Addressable::IDNA, "when converting from unicode to ASCII" do
   end
 end
 
-describe Addressable::IDNA, "when converting from ASCII to unicode" do
+shared_examples_for "converting from ASCII to unicode" do
   it "should convert 'www.google.com' correctly" do
     Addressable::IDNA.to_unicode("www.google.com").should == "www.google.com"
   end
@@ -192,3 +186,30 @@ describe Addressable::IDNA, "when converting from ASCII to unicode" do
     ).should == "\341\206\265"
   end
 end
+
+describe Addressable::IDNA, "when using the pure-Ruby implementation" do
+  before do
+    Addressable.send(:remove_const, :IDNA)
+    load "addressable/idna/pure.rb"
+  end
+
+  it_should_behave_like "converting from unicode to ASCII"
+  it_should_behave_like "converting from ASCII to unicode"
+end
+
+begin
+  require "idn"
+
+  describe Addressable::IDNA, "when using the native-code implementation" do
+    before do
+      Addressable.send(:remove_const, :IDNA)
+      load "addressable/idna/native.rb"
+    end
+
+    it_should_behave_like "converting from unicode to ASCII"
+    it_should_behave_like "converting from ASCII to unicode"
+  end
+rescue LoadError
+  # Cannot test the native implementation without libidn support.
+  warn('Could not load native IDN implementation.')
+end

data/spec/addressable/template_spec.rb

@@ -1,26 +1,17 @@
-# encoding:utf-8
-#--
-# Addressable, Copyright (c) 2006-2007 Bob Aman
+# Copyright (C) 2006-2011 Bob Aman
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+#    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
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
+#    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 "addressable/template"
 

data/spec/addressable/uri_spec.rb

@@ -1,26 +1,17 @@
-# encoding: utf-8
-#--
-# Addressable, Copyright (c) 2006-2007 Bob Aman
+# Copyright (C) 2006-2011 Bob Aman
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+#    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
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
+#    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 "addressable/uri"
 
@@ -328,18 +319,24 @@ describe Addressable::URI, "when created with a path that hasn't been " +
 end
 
 describe Addressable::URI, "when parsed from an Addressable::URI object" do
-  it "should return the object" do
-    uri = Addressable::URI.parse("http://example.com/")
-    (lambda do
-      Addressable::URI.parse(uri).object_id.should == uri.object_id
-    end).should_not raise_error
+  it "should not have unexpected side-effects" do
+    original_uri = Addressable::URI.parse("http://example.com/")
+    new_uri = Addressable::URI.parse(original_uri)
+    new_uri.host = 'www.example.com'
+    new_uri.host.should == 'www.example.com'
+    new_uri.to_s.should == 'http://www.example.com/'
+    original_uri.host.should == 'example.com'
+    original_uri.to_s.should == 'http://example.com/'
   end
 
-  it "should return the object" do
-    uri = Addressable::URI.parse("http://example.com/")
-    (lambda do
-      Addressable::URI.heuristic_parse(uri).object_id.should == uri.object_id
-    end).should_not raise_error
+  it "should not have unexpected side-effects" do
+    original_uri = Addressable::URI.parse("http://example.com/")
+    new_uri = Addressable::URI.heuristic_parse(original_uri)
+    new_uri.host = 'www.example.com'
+    new_uri.host.should == 'www.example.com'
+    new_uri.to_s.should == 'http://www.example.com/'
+    original_uri.host.should == 'example.com'
+    original_uri.to_s.should == 'http://example.com/'
   end
 end
 
@@ -2662,6 +2659,71 @@ describe Addressable::URI, "when parsed from " +
   end
 end
 
+describe Addressable::URI, "when parsed from " +
+  "'http://example.com/search?q=Q%26A'" do
+
+  before do
+    @uri = Addressable::URI.parse("http://example.com/search?q=Q%26A")
+  end
+
+  it "should have a query of 'q=Q%26A'" do
+    @uri.query.should == "q=Q%26A"
+  end
+
+  it "should have query_values of {'q' => 'Q&A'}" do
+    @uri.query_values.should == { 'q' => 'Q&A' }
+  end
+
+  it "should normalize to the original uri (with the ampersand properly percent-encoded)" do
+    @uri.normalize.to_s.should == "http://example.com/search?q=Q%26A"
+  end
+end
+
+describe Addressable::URI, "when parsed from " +
+    "'http://example.com/?&x=b'" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com/?&x=b")
+  end
+
+  it "should have a query of '&x=b'" do
+    @uri.query.should == "&x=b"
+  end
+
+  it "should have query_values of {'x' => 'b'}" do
+    @uri.query_values.should == {'x' => 'b'}
+  end
+end
+
+describe Addressable::URI, "when parsed from " +
+    "'http://example.com/?&&x=b'" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com/?&&x=b")
+  end
+
+  it "should have a query of '&&x=b'" do
+    @uri.query.should == "&&x=b"
+  end
+
+  it "should have query_values of {'x' => 'b'}" do
+    @uri.query_values.should == {'x' => 'b'}
+  end
+end
+
+describe Addressable::URI, "when parsed from " +
+    "'http://example.com/?q=a&&x=b'" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com/?q=a&&x=b")
+  end
+
+  it "should have a query of 'q=a&&x=b'" do
+    @uri.query.should == "q=a&&x=b"
+  end
+
+  it "should have query_values of {'q' => 'a, 'x' => 'b'}" do
+    @uri.query_values.should == {'q' => 'a', 'x' => 'b'}
+  end
+end
+
 describe Addressable::URI, "when parsed from " +
     "'http://example.com/?q&&x=b'" do
   before do

data/tasks/gem.rake

@@ -10,8 +10,8 @@ namespace :gem do
     s.files = PKG_FILES.to_a
 
     s.has_rdoc = true
-    s.extra_rdoc_files = %w( README )
-    s.rdoc_options.concat ["--main",  "README"]
+    s.extra_rdoc_files = %w( README.md )
+    s.rdoc_options.concat ["--main",  "README.md"]
 
     if !s.respond_to?(:add_development_dependency)
       puts "Cannot build Gem with this version of RubyGems."

data/tasks/rdoc.rake

@@ -8,7 +8,7 @@ namespace :doc do
     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", "CHANGELOG", "LICENSE")
+    rdoc.rdoc_files.include("README.md", "CHANGELOG", "LICENSE")
     rdoc.rdoc_files.include("lib/**/*.rb")
   end
 

data/tasks/spec.rake

@@ -3,13 +3,13 @@ namespace :spec do
     t.libs = %w[lib spec]
     t.spec_files = FileList['spec/**/*_spec.rb']
     t.spec_opts = ['--color', '--format', 'specdoc']
-    
+
     t.rcov = RCOV_ENABLED
     t.rcov_opts = [
       '--exclude', 'spec',
       '--exclude', '1\\.8\\/gems',
       '--exclude', '1\\.9\\/gems',
-      '--exclude', 'addressable\\/idna\\.rb', # unicode tables too big
+      '--exclude', 'addressable\\/idna' # environment dependant
     ]
   end
 
@@ -22,7 +22,9 @@ namespace :spec do
 
   desc "Generate HTML Specdocs for all specs"
   Spec::Rake::SpecTask.new(:specdoc) do |t|
-    specdoc_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'specdoc'))
+    specdoc_path = File.expand_path(
+      File.join(File.dirname(__FILE__), '..', 'specdoc')
+    )
     Dir.mkdir(specdoc_path) if !File.exist?(specdoc_path)
 
     output_file = File.join(specdoc_path, 'index.html')

data/tasks/yard.rake

@@ -8,10 +8,10 @@ begin
     desc "Generate Yardoc documentation"
     YARD::Rake::YardocTask.new do |yardoc|
       yardoc.name = "yard"
-      yardoc.options = ["--verbose"]
-      yardoc.files = [
-        "lib/**/*.rb", "ext/**/*.c", "README", "CHANGELOG", "LICENSE"
-      ]
+      yardoc.options = ["--verbose", "--markup", "markdown"]
+      yardoc.files = FileList[
+        "lib/**/*.rb", "ext/**/*.c", "README.md", "CHANGELOG", "LICENSE"
+      ].exclude(/idna/)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: addressable
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: 13
+  prerelease: false
   segments: 
   - 2
   - 2
-  - 4
-  version: 2.2.4
+  - 5
+  version: 2.2.5
 platform: ruby
 authors: 
 - Bob Aman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -08:00
+date: 2011-04-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,8 +93,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 files: 
+- lib/addressable/idna/native.rb
+- lib/addressable/idna/pure.rb
 - lib/addressable/idna.rb
 - lib/addressable/template.rb
 - lib/addressable/uri.rb
@@ -114,7 +116,7 @@ files:
 - CHANGELOG
 - LICENSE
 - Rakefile
-- README
+- README.md
 has_rdoc: true
 homepage: http://addressable.rubyforge.org/
 licenses: []
@@ -122,7 +124,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -146,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: addressable
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: URI Implementation

data/README

@@ -1,60 +0,0 @@
-== About
-
-Homepage::  Addressable[http://addressable.rubyforge.org/]
-Authors::   Bob Aman (mailto:bob@sporkmonger.com)
-Copyright:: Copyright 2010 Bob Aman
-License::   MIT
-
-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.  Additionally, it provides extensive
-support for URI templates.
-
-== Classes
-- {Addressable::URI}
-- {Addressable::Template}
-
-== Example usage
-  require "addressable/uri"
-
-  uri = Addressable::URI.parse("http://example.com/path/to/resource/")
-  uri.scheme
-  #=> "http"
-  uri.host
-  #=> "example.com"
-  uri.path
-  #=> "/path/to/resource/"
-
-  uri = Addressable::URI.parse("http://www.詹姆斯.com/")
-  uri.normalize
-  #=> #<Addressable::URI:0xc9a4c8 URI:http://www.xn--8ws00zhy3a.com/>
-
-  require "addressable/template"
-
-  template = Addressable::Template.new("http://example.com/{-list|+|query}/")
-  template.expand({
-    "query" => "an example query".split(" ")
-  })
-  #=> #<Addressable::URI:0xc9d95c URI:http://example.com/an+example+query/>
-
-  template = Addressable::Template.new(
-    "http://example.com/{-join|&|one,two,three}/"
-  )
-  template.partial_expand({"one" => "1", "three" => 3}).pattern
-  #=> "http://example.com/?one=1{-prefix|&two=|two}&three=3"
-
-  template = Addressable::Template.new(
-    "http://{host}/{-suffix|/|segments}?{-join|&|one,two,bogus}\#{fragment}"
-  )
-  uri = Addressable::URI.parse(
-    "http://example.com/a/b/c/?one=1&two=2#foo"
-  )
-  template.extract(uri)
-  #=>
-  # {
-  #   "host" => "example.com",
-  #   "segments" => ["a", "b", "c"],
-  #   "one" => "1",
-  #   "two" => "2",
-  #   "fragment" => "foo"
-  # }