uniform_resource_identifier 0.1.18 → 0.1.19

data/VERSION

@@ -1 +1 @@
-0.1.18
+0.1.19

data/lib/uniform_resource_identifier/domain.rb

@@ -12,13 +12,16 @@ class UniformResourceIdentifier
           pss = PublicSuffixService.parse(domain)
           
           @sld, @tld = pss.sld, pss.tld
+          @valid = true
         rescue PublicSuffixService::DomainInvalid
           # We couldn't parse your tld (public suffix) =(
           @tld = domain
+          @valid = false
         end
       elsif domain.respond_to?(:to_hash)
         domain.to_hash.symbolize_keys
         @sld, @tld = domain.values_at(:sld, :tld)
+        @valid = domain[:valid]
       else
         raise(TypeError, "domain must either be a String or a Hash") unless domain.nil?
       end
@@ -44,6 +47,10 @@ class UniformResourceIdentifier
     attr_reader :sld
     attr_reader :tld
     
+    def valid?
+      @valid
+    end
+    
     def sld=(sld)
       @sld = sld.nil? ? nil : sld.to_s
     end

data/lib/uniform_resource_identifier/host.rb

@@ -13,10 +13,10 @@ class UniformResourceIdentifier
           pss = PublicSuffixService.parse(host)
           
           @subdomain = pss.trd
-          @domain = Domain.new(:sld => pss.sld, :tld => pss.tld)
+          @domain = Domain.new(:sld => pss.sld, :tld => pss.tld, :valid => true)
         rescue PublicSuffixService::DomainInvalid
           # We couldn't parse your tld (public suffix) =(
-          @domain = Domain.new(:sld => nil, :tld => host) # TODO: is this proper? see Domain#to_s
+          @domain = Domain.new(:sld => nil, :tld => host, :valid => false) # TODO: is this proper? see Domain#to_s
         end
       elsif host.respond_to?(:to_hash)
         host = host.to_hash.symbolize_keys

data/lib/uniform_resource_identifier/parser.rb

@@ -10,8 +10,10 @@ class UniformResourceIdentifier
       
       regexp = mode == :loose ? LOOSE : STRICT
       match  = uri.match(regexp)
-      keys   = [:protocol, :authority, :user_info, :username, :password, :host,
-                :port, :relative, :path, :directory, :file, :query, :anchor]
+      keys   = [
+        :protocol, :authority, :user_info, :username, :password, :host,
+        :port, :relative, :path, :directory, :file, :query, :anchor
+      ]
       
       keys.each.with_index.inject({}) do |memo, (key, index)|
         memo[key] = match.captures[index]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uniform_resource_identifier
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix_service
-  requirement: &70324823510920 !ruby/object:Gem::Requirement
+  requirement: &70095955141720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324823510920
+  version_requirements: *70095955141720
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70324823510380 !ruby/object:Gem::Requirement
+  requirement: &70095955140460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324823510380
+  version_requirements: *70095955140460
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70324823509840 !ruby/object:Gem::Requirement
+  requirement: &70095955139460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70324823509840
+  version_requirements: *70095955139460
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70324823509340 !ruby/object:Gem::Requirement
+  requirement: &70095955138140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324823509340
+  version_requirements: *70095955138140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70324823508820 !ruby/object:Gem::Requirement
+  requirement: &70095955137520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70324823508820
+  version_requirements: *70095955137520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70324823508320 !ruby/object:Gem::Requirement
+  requirement: &70095955136460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70324823508320
+  version_requirements: *70095955136460
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70324823507780 !ruby/object:Gem::Requirement
+  requirement: &70095955135800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *70324823507780
+  version_requirements: *70095955135800
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70324823507240 !ruby/object:Gem::Requirement
+  requirement: &70095955135080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *70324823507240
+  version_requirements: *70095955135080
 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`'