uniform_resource_identifier 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/uniform_resource_identifier.rb

@@ -1,3 +1,7 @@
+require 'pathname'
+__LIB__ = Pathname.new(__FILE__).dirname.expand_path
+$:.unshift(__LIB__.to_s) unless $:.include?(__LIB__.to_s)
+
 require 'uniform_resource_identifier/authority'
 require 'uniform_resource_identifier/relative'
 

data/lib/uniform_resource_identifier/authority.rb

@@ -27,8 +27,8 @@ class UniformResourceIdentifier
     end
     
     def to_s
-      user_info = "#{@user_info}@" unless @user_info.nil?
-      port = ":#{@port}" unless @port.nil?
+      user_info = "#{@user_info}@" unless @user_info.blank?
+      port = ":#{@port}" unless @port.blank? || @port == 0 # TODO: Should match 0?
       "#{user_info}#{@host}#{port}"
     end
     

data/lib/uniform_resource_identifier/query.rb

@@ -1,5 +1,6 @@
 require 'uniform_resource_identifier/parsable'
 require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/object/blank'
 require 'addressable/uri'
 
 class UniformResourceIdentifier
@@ -17,8 +18,12 @@ class UniformResourceIdentifier
       end
     end
     
+    def blank?
+      @query.blank?
+    end
+    
     def to_s
-      @query.to_query
+      @query.blank? ? "" : @query.to_query
     end
     
     def to_h

data/lib/uniform_resource_identifier/relative.rb

@@ -3,6 +3,7 @@ require 'uniform_resource_identifier/parser'
 require 'uniform_resource_identifier/path'
 require 'uniform_resource_identifier/query'
 require 'active_support/core_ext/hash'
+require 'active_support/core_ext/object/blank'
 
 class UniformResourceIdentifier
   class Relative
@@ -24,8 +25,8 @@ class UniformResourceIdentifier
     end
     
     def to_s
-      query = "?#{@query}" unless @query.nil?
-      anchor = "##{@anchor}" unless @anchor.nil?
+      query = "?#{@query}" unless @query.blank?
+      anchor = "##{@anchor}" unless @anchor.blank?
       "#{@path}#{query}#{anchor}"
     end
     

data/lib/uniform_resource_identifier/user_info.rb

@@ -16,6 +16,10 @@ class UniformResourceIdentifier
       end
     end
     
+    def blank?
+      @username.blank? && @password.blank?
+    end
+    
     def to_s
       "#{@username}:#{@password}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uniform_resource_identifier
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix_service
-  requirement: &70135109505860 !ruby/object:Gem::Requirement
+  requirement: &70155155104580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70135109505860
+  version_requirements: *70155155104580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70135109504520 !ruby/object:Gem::Requirement
+  requirement: &70155155104100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70135109504520
+  version_requirements: *70155155104100
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70135109503760 !ruby/object:Gem::Requirement
+  requirement: &70155155103640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70135109503760
+  version_requirements: *70155155103640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70135109502980 !ruby/object:Gem::Requirement
+  requirement: &70155155103180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70135109502980
+  version_requirements: *70155155103180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70135109502180 !ruby/object:Gem::Requirement
+  requirement: &70155155102720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70135109502180
+  version_requirements: *70155155102720
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70135109501340 !ruby/object:Gem::Requirement
+  requirement: &70155155102260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *70135109501340
+  version_requirements: *70155155102260
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70135109500520 !ruby/object:Gem::Requirement
+  requirement: &70155149624920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *70135109500520
+  version_requirements: *70155149624920
 description: ! '`uniform_resource_identifier` splits URIs according to RFC 3986 using
   regexp, attempts to check the public suffix using `public_suffix_service`, and serializes
   the query string using `active_support` and `addressable`'