uniform_resource_identifier 0.1.21 → 0.1.22

data/Gemfile.lock

@@ -1,26 +1,23 @@
 PATH
   remote: .
   specs:
-    uniform_resource_identifier (0.1.14)
-      activesupport (>= 3.0.0)
-      addressable (~> 2.2.6)
-      i18n (~> 0.6.0)
-      public_suffix_service (~> 0.9.0)
+    uniform_resource_identifier (0.1.21)
+      activesupport (>= 3.0)
+      addressable (~> 2.2)
+      i18n (~> 0.6)
+      public_suffix (~> 1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
+    addressable (2.2.7)
     diff-lcs (1.1.3)
-    fuubar (0.0.6)
-      rspec (~> 2.0)
-      rspec-instafail (~> 0.1.8)
-      ruby-progressbar (~> 0.0.10)
     i18n (0.6.0)
-    multi_json (1.0.3)
-    public_suffix_service (0.9.0)
+    multi_json (1.3.1)
+    public_suffix (1.1.0)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -28,17 +25,15 @@ GEM
     rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.9)
     rspec-mocks (2.6.0)
-    ruby-progressbar (0.0.10)
     watchr (0.7)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  fuubar (~> 0.0.6)
-  rspec (~> 2.6.0)
+  bundler (~> 1.0)
+  rspec (~> 2.6)
   uniform_resource_identifier!
-  watchr (~> 0.7.0)
+  watchr (~> 0.7)

data/VERSION

@@ -1 +1 @@
-0.1.21
+0.1.22

data/lib/uniform_resource_identifier/domain.rb

@@ -1,13 +1,13 @@
 require 'uniform_resource_identifier/parsable'
 require 'active_support/core_ext/hash'
-require 'public_suffix_service'
+require 'public_suffix'
 
 class UniformResourceIdentifier
   class Domain
     extend Parsable
     
     def initialize(domain=nil)
-      if domain.respond_to?(:to_str) 
+      if domain.respond_to?(:to_str)
         begin
           pss = PublicSuffix.parse(domain)
           

data/lib/uniform_resource_identifier/host.rb

@@ -1,7 +1,7 @@
 require 'uniform_resource_identifier/parsable'
 require 'uniform_resource_identifier/domain'
 require 'active_support/core_ext/hash'
-require 'public_suffix_service'
+require 'public_suffix'
 
 class UniformResourceIdentifier
   class Host

data/lib/uniform_resource_identifier/relative.rb

@@ -25,9 +25,10 @@ class UniformResourceIdentifier
     end
     
     def to_s
-      query = "/#{@path}" if @path.blank? || !@path.to_s.starts_with?("/")
+      query = "/#{@path}" if @path.blank? || !@path.to_s[/^\//]
       query = "?#{@query}" unless @query.blank?
       anchor = "##{@anchor}" unless @anchor.blank?
+      
       "#{path}#{query}#{anchor}"
     end
     

data/lib/uniform_resource_identifier/rspec_matcher.rb

@@ -4,7 +4,6 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
     false.should == true if uri_specification == {}
     
     url = UniformResourceIdentifier.parse(uri_string)
-    # uri_specification = uri_specification.to_hash # TODO: Needed?
     
     # ======================================================================= #
     # = Protocol/Scheme                                                     = #
@@ -16,6 +15,7 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.scheme.class.should == String                      # Alias
       url.scheme.to_s.should == uri_specification[:protocol] # Alias
     end
+    
     # ======================================================================= #
     # = Authority                                                           = #
     # ======================================================================= #
@@ -147,5 +147,7 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.anchor.class.should == String                    # Delegate
       url.anchor.to_s.should == uri_specification[:anchor] # Delegate
     end
+    
+    true.should == true
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
+print "#{RUBY_VERSION} - #{RUBY_PLATFORM} - #{RUBY_RELEASE_DATE} -=- "
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'uniform_resource_identifier'
-require 'uniform_resource_identifier/rspec_matcher'
+require 'uniform_resource_identifier/rspec_matcher'

data/spec/uniform_resource_identifier_spec.rb

@@ -38,146 +38,143 @@ describe UniformResourceIdentifier do
   subject { UniformResourceIdentifier }
   
   let(:url) do
-    "http://usr:pwd@www.test.com:81/dir/dir.2/foo/bar/index.htm?q1=0&&test1&test2=value&arr[]=one&arr[]=two&hsh[foo]=bar&test3=val3#top"  
+    'http://usr:pwd@www.test.com:81/dir/dir.2/foo/bar/index.htm?q1=0&&test1&test2=value&arr[]=one&arr[]=two&hsh[foo]=bar&test3=val3#top'  
   end
   
-  describe "#parse" do
-    it "should correctly parse the given URL" do
+  describe '#parse' do
+    it 'should correctly parse the given URL' do
       url.should have_uri_specification(
-        :protocol  => "http",
-        :authority => "usr:pwd@www.test.com:81",
-        :user_info => "usr:pwd",
-        :username  => "usr",
-        :password  => "pwd",
-        :host      => "www.test.com",
-        :subdomain => "www",
-        :domain    => "test.com",
-        :sld       => "test",
-        :tld       => "com",
-        :port      => "81",
-        # :relative  => "/dir/dir.2/foo/bar/index.htm?q1=0&test1=true&test2=value&arr[]=one&arr[]=two&hsh[foo]=bar&test3=val3#top",
-        :path      => "/dir/dir.2/foo/bar/index.htm",
-        :directory => "/dir/dir.2/foo/bar/",
-        :file      => "index.htm",
-        # :query     => "q1=0&test1=true&test2=value&arr[]=one&arr[]=two&hsh[foo]=bar&test3=val3",
-        :anchor    => "top"
+        :protocol  => 'http',
+        :authority => 'usr:pwd@www.test.com:81',
+        :user_info => 'usr:pwd',
+        :username  => 'usr',
+        :password  => 'pwd',
+        :host      => 'www.test.com',
+        :subdomain => 'www',
+        :domain    => 'test.com',
+        :sld       => 'test',
+        :tld       => 'com',
+        :port      => '81',
+        :relative  => '/dir/dir.2/foo/bar/index.htm?arr%5B%5D=one&arr%5B%5D=two&hsh%5Bfoo%5D=bar&q1=0&test1=true&test2=value&test3=val3#top',
+        :path      => '/dir/dir.2/foo/bar/index.htm',
+        :directory => '/dir/dir.2/foo/bar/',
+        :file      => 'index.htm',
+        :query     => 'arr%5B%5D=one&arr%5B%5D=two&hsh%5Bfoo%5D=bar&q1=0&test1=true&test2=value&test3=val3',
+        :anchor    => 'top'
       )
       
-      url.should have_uri_specification(
-        :host => "www.test.com"
-      )
+      url.should have_uri_specification(:host => 'www.test.com')
     end
   end
   
-  describe "#to_s" do
-    it "should return the normalized URI" do
-      # subject.parse(url).to_s.should == "http://usr:pwd@www.test.com:81/dir/dir.2/foo/bar/index.htm?q1=0&test1=true&test2=value&arr[]=one&arr[]=two&hsh[foo]=bar&test3=val3#top"
-      subject.parse(url).to_s.should == "http://usr:pwd@www.test.com:81/dir/dir.2/foo/bar/index.htm?arr%5B%5D=one&arr%5B%5D=two&hsh%5Bfoo%5D=bar&q1=0&test1=true&test2=value&test3=val3#top"
+  describe '#to_s' do
+    it 'should return the normalized URI' do
+      subject.parse(url).to_s.should == 'http://usr:pwd@www.test.com:81/dir/dir.2/foo/bar/index.htm?arr%5B%5D=one&arr%5B%5D=two&hsh%5Bfoo%5D=bar&q1=0&test1=true&test2=value&test3=val3#top'
     end
   end
   
-  describe "#to_h" do
-    it "should return the correct Hash result" do
+  describe '#to_h' do
+    it 'should return the correct Hash result' do
       subject.parse(url).to_h.should == {
-        :protocol =>"http",
+        :protocol =>'http',
         :authority => {
           :user_info => {
-            :username => "usr", 
-            :password => "pwd"
+            :username => 'usr', 
+            :password => 'pwd'
           },
           :host => {
-            :subdomain => "www", 
+            :subdomain => 'www', 
             :domain => {
-              :sld => "test", 
-              :tld => "com"
+              :sld => 'test', 
+              :tld => 'com'
             }
           },
           :port => 81
         }, 
         :relative => {
           :path => { 
-            :directory => "/dir/dir.2/foo/bar/", 
-            :file => "index.htm"
+            :directory => '/dir/dir.2/foo/bar/', 
+            :file => 'index.htm'
           }, 
           :query => { # TODO: Should the query_values be strings?
-            "q1" => "0", 
-            "test1" => true, 
-            "test2" => "value", 
-            "arr" => ["one", "two"], 
-            "hsh" => {
-              "foo" => "bar"
+            'q1' => '0', 
+            'test1' => true, 
+            'test2' => 'value', 
+            'arr' => ['one', 'two'], 
+            'hsh' => {
+              'foo' => 'bar'
             },
-            "test3" => "val3"
+            'test3' => 'val3'
           }, 
-          :anchor=>"top"
+          :anchor=>'top'
         }
       }
     end
   end
   
-  describe "The example from the README" do
-    it "should be correct, to say the least." do
-      url = "foo://usr:pwd@www.example.co.uk:8042/over/there.htm?name=ferret#nose"
+  describe 'The example from the README' do
+    it 'should be correct, to say the least.' do
+      url = 'foo://usr:pwd@www.example.co.uk:8042/over/there.htm?name=ferret#nose'
       uri = UniformResourceIdentifier.parse(url)
       
-      uri.protocol.should == "foo"
+      uri.protocol.should == 'foo'
       
-      uri.authority.to_s.should == "usr:pwd@www.example.co.uk:8042"
+      uri.authority.to_s.should == 'usr:pwd@www.example.co.uk:8042'
       
-      uri.authority.user_info.to_s.should == "usr:pwd"
-      uri.user_info.to_s.should == "usr:pwd"
+      uri.authority.user_info.to_s.should == 'usr:pwd'
+      uri.user_info.to_s.should == 'usr:pwd'
       
-      uri.authority.user_info.username.should == "usr"
-      uri.authority.user_info.password.should == "pwd"
-      uri.user_info.username.should == "usr"
-      uri.user_info.password.should == "pwd"
-      uri.username.should == "usr"
-      uri.password.should == "pwd"
+      uri.authority.user_info.username.should == 'usr'
+      uri.authority.user_info.password.should == 'pwd'
+      uri.user_info.username.should == 'usr'
+      uri.user_info.password.should == 'pwd'
+      uri.username.should == 'usr'
+      uri.password.should == 'pwd'
       
-      uri.authority.host.to_s.should == "www.example.co.uk"
-      uri.host.to_s.should == "www.example.co.uk"
+      uri.authority.host.to_s.should == 'www.example.co.uk'
+      uri.host.to_s.should == 'www.example.co.uk'
       
-      uri.authority.host.subdomain.should == "www"
-      uri.authority.subdomain.should == "www"
-      uri.subdomain.should == "www"
+      uri.authority.host.subdomain.should == 'www'
+      uri.authority.subdomain.should == 'www'
+      uri.subdomain.should == 'www'
       
-      uri.authority.host.domain.to_s.should == "example.co.uk"
-      uri.authority.domain.to_s.should == "example.co.uk"
-      uri.domain.to_s.should == "example.co.uk"
+      uri.authority.host.domain.to_s.should == 'example.co.uk'
+      uri.authority.domain.to_s.should == 'example.co.uk'
+      uri.domain.to_s.should == 'example.co.uk'
       
-      uri.authority.host.domain.sld.should == "example"
-      uri.authority.domain.sld.should == "example"
-      uri.domain.sld.should == "example"
-      uri.sld.should == "example"
+      uri.authority.host.domain.sld.should == 'example'
+      uri.authority.domain.sld.should == 'example'
+      uri.domain.sld.should == 'example'
+      uri.sld.should == 'example'
       
-      uri.authority.host.domain.tld.should == "co.uk"
-      uri.authority.domain.tld.should == "co.uk"
-      uri.domain.tld.should == "co.uk"
-      uri.tld.should == "co.uk"
+      uri.authority.host.domain.tld.should == 'co.uk'
+      uri.authority.domain.tld.should == 'co.uk'
+      uri.domain.tld.should == 'co.uk'
+      uri.tld.should == 'co.uk'
       
       uri.authority.port.should == 8042
       uri.port.should == 8042
       
-      uri.relative.to_s.should == "/over/there.htm?name=ferret#nose"
+      uri.relative.to_s.should == '/over/there.htm?name=ferret#nose'
       
-      uri.relative.path.to_s.should == "/over/there.htm"
-      uri.path.to_s.should == "/over/there.htm"
+      uri.relative.path.to_s.should == '/over/there.htm'
+      uri.path.to_s.should == '/over/there.htm'
       
-      uri.relative.path.directory.to_s.should == "/over/"
-      uri.relative.directory.to_s.should == "/over/"
-      uri.directory.to_s.should == "/over/"
+      uri.relative.path.directory.to_s.should == '/over/'
+      uri.relative.directory.to_s.should == '/over/'
+      uri.directory.to_s.should == '/over/'
       
-      uri.relative.path.file.to_s.should == "there.htm"
-      uri.relative.file.to_s.should == "there.htm"
-      uri.file.to_s.should == "there.htm"
+      uri.relative.path.file.to_s.should == 'there.htm'
+      uri.relative.file.to_s.should == 'there.htm'
+      uri.file.to_s.should == 'there.htm'
       
-      uri.relative.query.to_h.should == { "name" => "ferret" }
-      uri.relative.query.to_s.should == "name=ferret"
-      uri.query.to_h.should == { "name" => "ferret" }
-      uri.query.to_s.should == "name=ferret"
+      uri.relative.query.to_h.should == { 'name' => 'ferret' }
+      uri.relative.query.to_s.should == 'name=ferret'
+      uri.query.to_h.should == { 'name' => 'ferret' }
+      uri.query.to_s.should == 'name=ferret'
       
-      uri.relative.anchor.should == "nose"
-      uri.anchor.should == "nose"
+      uri.relative.anchor.should == 'nose'
+      uri.anchor.should == 'nose'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uniform_resource_identifier
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
-  requirement: &70138700565880 !ruby/object:Gem::Requirement
+  requirement: &70228205651440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70138700565880
+  version_requirements: *70228205651440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70138700565400 !ruby/object:Gem::Requirement
+  requirement: &70228205650960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138700565400
+  version_requirements: *70228205650960
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70138700564940 !ruby/object:Gem::Requirement
+  requirement: &70228205650500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70138700564940
+  version_requirements: *70228205650500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70138700564480 !ruby/object:Gem::Requirement
+  requirement: &70228205650040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70138700564480
+  version_requirements: *70228205650040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70138700564020 !ruby/object:Gem::Requirement
+  requirement: &70228205649580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70138700564020
+  version_requirements: *70228205649580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70138700563560 !ruby/object:Gem::Requirement
+  requirement: &70228205649120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70138700563560
+  version_requirements: *70228205649120
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70138700563100 !ruby/object:Gem::Requirement
+  requirement: &70228205648660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,9 +87,9 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70138700563100
+  version_requirements: *70228205648660
 description: ! '`uniform_resource_identifier` splits URIs according to RFC 3986 using
-  regexp, attempts to check the public suffix using `public_suffix_service`, and serializes
+  regexp, attempts to check the public suffix using `public_suffix`, and serializes
   the query string using `active_support` and `addressable`'
 email: c00lryguy@gmail.com
 executables: []