uniform_resource_identifier 0.1.14 → 0.1.15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uniform_resource_identifier (0.1.13)
+    uniform_resource_identifier (0.1.14)
       activesupport (>= 3.0.0)
       addressable (~> 2.2.6)
       i18n (~> 0.6.0)

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/lib/uniform_resource_identifier/authority.rb

@@ -45,6 +45,10 @@ class UniformResourceIdentifier
       }
     end
     
+    def blank?
+      @user_info.blank? && @host.blank? && @port.blank?
+    end
+    
     # ======================================================================= #
     # = Attributes                                                          = #
     # ======================================================================= #

data/lib/uniform_resource_identifier/domain.rb

@@ -32,6 +32,11 @@ class UniformResourceIdentifier
     def to_h
       { :sld => @sld, :tld => @tld }
     end
+    
+    def blank?
+      @sld.blank? && @tld.blank?
+    end
+    
     # ======================================================================= #
     # = Attributes                                                          = #
     # ======================================================================= #

data/lib/uniform_resource_identifier/host.rb

@@ -40,6 +40,10 @@ class UniformResourceIdentifier
       }
     end
     
+    def blank?
+      @subdomain.blank && @domain.blank?
+    end
+    
     # ======================================================================= #
     # = Attributes                                                          = #
     # ======================================================================= #

data/lib/uniform_resource_identifier/path.rb

@@ -28,6 +28,10 @@ class UniformResourceIdentifier
         :file => @file
       }
     end
+    
+    def blank?
+      @directory.blank? && @file.blank?
+    end
     # ======================================================================= #
     # = Attributes                                                          = #
     # ======================================================================= #

data/lib/uniform_resource_identifier/query.rb

@@ -18,8 +18,12 @@ class UniformResourceIdentifier
       end
     end
     
-    def blank?
-      @query.blank?
+    def [](key)
+      @query[key]
+    end
+    
+    def []=(key, value)
+      @query[key] = value
     end
     
     def to_s
@@ -30,12 +34,8 @@ class UniformResourceIdentifier
       @query
     end
     
-    def [](key)
-      @query[key]
-    end
-    
-    def []=(key, value)
-      @query[key] = value
+    def blank?
+      @query.blank?
     end
   end
 end

data/lib/uniform_resource_identifier/relative.rb

@@ -38,6 +38,10 @@ class UniformResourceIdentifier
       }
     end
     
+    def blank?
+      @path.blank? && @query.blank? && @anchor.blank?
+    end
+    
     # ======================================================================= #
     # = Attributes                                                          = #
     # ======================================================================= #

data/lib/uniform_resource_identifier/rspec_matcher.rb

@@ -1,17 +1,15 @@
 RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
   match do |uri_string|
-    
-    
     false.should == true unless uri_specification.respond_to?(:to_hash)
     false.should == true if uri_specification == {}
-
+    
     url = UniformResourceIdentifier.parse(uri_string)
     # uri_specification = uri_specification.to_hash # TODO: Needed?
-
+    
     # ======================================================================= #
     # = Protocol/Scheme                                                     = #
     # ======================================================================= #
-
+    
     if uri_specification.has_key?(:protocol)
       url.protocol.class.should == String
       url.protocol.to_s.should == uri_specification[:protocol]
@@ -21,19 +19,19 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
     # ======================================================================= #
     # = Authority                                                           = #
     # ======================================================================= #
-
+    
     if uri_specification.has_key?(:authority)
       url.authority.class.should == UniformResourceIdentifier::Authority
       url.authority.to_s.should == uri_specification[:authority]
     end
-
+    
     if uri_specification.has_key?(:user_info)
       url.authority.user_info.class.should == UniformResourceIdentifier::UserInfo
       url.authority.user_info.to_s.should == uri_specification[:user_info]
       url.user_info.class.should == UniformResourceIdentifier::UserInfo # Delegate
       url.user_info.to_s.should == uri_specification[:user_info]        # Delegate
     end
-
+    
     if uri_specification.has_key?(:username)
       url.authority.user_info.username.class.should == String
       url.authority.user_info.username.to_s.should == uri_specification[:username]
@@ -42,7 +40,7 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.username.class.should == String                                # Delegate
       url.username.to_s.should == uri_specification[:username]           # Delegate
     end
-
+    
     if uri_specification.has_key?(:password)
       url.authority.user_info.password.class.should == String
       url.authority.user_info.password.to_s.should == uri_specification[:password]
@@ -51,14 +49,14 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.password.class.should == String                                # Delegate
       url.password.to_s.should == uri_specification[:password]           # Delegate
     end
-
+    
     if uri_specification.has_key?(:host)
       url.authority.host.class.should == UniformResourceIdentifier::Host
       url.authority.host.to_s.should == uri_specification[:host]
       url.host.class.should == UniformResourceIdentifier::Host # Delegate
       url.host.to_s.should == uri_specification[:host]         # Delegate
     end
-
+    
     if uri_specification.has_key?(:subdomain)
       url.authority.host.subdomain.class.should == String
       url.authority.host.subdomain.to_s.should == uri_specification[:subdomain]
@@ -67,7 +65,7 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.subdomain.class.should == String                            # Delegate
       url.subdomain.to_s.should == uri_specification[:subdomain]      # Delegate
     end
-
+    
     if uri_specification.has_key?(:domain)
       url.authority.host.domain.class.should == UniformResourceIdentifier::Domain
       url.authority.host.domain.to_s.should == uri_specification[:domain]
@@ -76,7 +74,7 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.domain.class.should == UniformResourceIdentifier::Domain      # Delegate
       url.domain.to_s.should == uri_specification[:domain]              # Delegate
     end
-
+    
     if uri_specification.has_key?(:sld)
       url.authority.host.domain.sld.class.should == String
       url.authority.host.sld.to_s.should == uri_specification[:sld]
@@ -85,7 +83,7 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.sld.class.should == String                      # Delegate
       url.sld.to_s.should == uri_specification[:sld]      # Delegate
     end
-
+    
     if uri_specification.has_key?(:tld)
       url.authority.host.domain.tld.class.should == String
       url.authority.host.tld.to_s.should == uri_specification[:tld]
@@ -94,30 +92,30 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.tld.class.should == String                      # Delegate
       url.tld.to_s.should == uri_specification[:tld]      # Delegate
     end
-
+    
     if uri_specification.has_key?(:port)
       url.authority.port.class.should == Fixnum
       url.authority.port.to_s.should == uri_specification[:port]
       url.port.class.should == Fixnum                  # Delegate
       url.port.to_s.should == uri_specification[:port] # Delegate
     end
-
+    
     # ======================================================================= #
     # = Relative                                                            = #
     # ======================================================================= #
-
+    
     if uri_specification.has_key?(:relative)
       url.relative.class.should == UniformResourceIdentifier::Relative
       url.relative.to_s.should == uri_specification[:relative]
     end
-
+    
     if uri_specification.has_key?(:path)
       url.relative.path.class.should == UniformResourceIdentifier::Path
       url.relative.path.to_s.should == uri_specification[:path]
       url.path.class.should == UniformResourceIdentifier::Path # Delegate
       url.path.to_s.should == uri_specification[:path]         # Delegate
     end
-
+    
     if uri_specification.has_key?(:directory)
       url.relative.path.directory.class.should == String
       url.relative.path.directory.to_s.should == uri_specification[:directory]
@@ -126,7 +124,7 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.directory.class.should == String                                # Delegate
       url.directory.to_s.should == uri_specification[:directory]          # Delegate
     end
-
+    
     if uri_specification.has_key?(:file)
       url.relative.path.file.class.should == String
       url.relative.path.file.to_s.should == uri_specification[:file]
@@ -135,14 +133,14 @@ RSpec::Matchers.define(:have_uri_specification) do |uri_specification|
       url.file.class.should == String                                # Delegate
       url.file.to_s.should == uri_specification[:file]               # Delegate
     end
-
+    
     if uri_specification.has_key?(:query)
       url.relative.query.class.should == UniformResourceIdentifier::Query
       url.relative.query.to_s.should == uri_specification[:query]
       url.query.class.should == UniformResourceIdentifier::Query # Delegate
       url.query.to_s.should == uri_specification[:query]         # Delegate
     end
-
+    
     if uri_specification.has_key?(:anchor)
       url.relative.anchor.class.should == String
       url.relative.anchor.to_s.should == uri_specification[:anchor]

data/lib/uniform_resource_identifier/user_info.rb

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

data/spec/uniform_resource_identifier_spec.rb

@@ -62,6 +62,10 @@ describe UniformResourceIdentifier do
         # :query     => "q1=0&test1=true&test2=value&arr[]=one&arr[]=two&hsh[foo]=bar&test3=val3",
         :anchor    => "top"
       )
+      
+      url.should have_uri_specification(
+        :host => "www.test.com"
+      )
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uniform_resource_identifier
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix_service
-  requirement: &70309375717880 !ruby/object:Gem::Requirement
+  requirement: &70151749127200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309375717880
+  version_requirements: *70151749127200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70309375717280 !ruby/object:Gem::Requirement
+  requirement: &70151749126720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309375717280
+  version_requirements: *70151749126720
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70309375716720 !ruby/object:Gem::Requirement
+  requirement: &70151749126180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70309375716720
+  version_requirements: *70151749126180
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70309375716140 !ruby/object:Gem::Requirement
+  requirement: &70151749125720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309375716140
+  version_requirements: *70151749125720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70309375715620 !ruby/object:Gem::Requirement
+  requirement: &70151749125260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70309375715620
+  version_requirements: *70151749125260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309375715140 !ruby/object:Gem::Requirement
+  requirement: &70151749124780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70309375715140
+  version_requirements: *70151749124780
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70309375714640 !ruby/object:Gem::Requirement
+  requirement: &70151749124260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *70309375714640
+  version_requirements: *70151749124260
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70309375688880 !ruby/object:Gem::Requirement
+  requirement: &70151749123780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *70309375688880
+  version_requirements: *70151749123780
 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`'