url_parser 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22e8debbc6c8c9b0a48ad0b3111f77c59a4300a3
-  data.tar.gz: 13a411e8114a2903636fe92b170f035db95c1c23
+  metadata.gz: 09b0929a6a38afe26b698634a884e309bbcd84a0
+  data.tar.gz: 70ec9fba2693c46a884878d59468c3ba85b50975
 SHA512:
-  metadata.gz: 47f2df87f79ebcf71d7c0c5e49b3983bdfe9277fbf8a413d9b96b1b7a2bdc387172aae7d942018081e0c25e7fde4444a38f0b04f9327c39e975685cce295e4e5
-  data.tar.gz: 45877a16f11ff89e67cda914c267573da564d4e9f121fc891f7307799339b3301892371d8395a224cb1fa38901b91e6f836d90ca017d918a3979ae3bcb4fca3a
+  metadata.gz: b6e85bfec45e2045ff22622b2d18dac0d8e36c04e4867e0b3436ae00ed80cc9275a270344adc19c406cbb5d433f81488c63e6f44d8a0281d68c08cbd68092043
+  data.tar.gz: bf8f1eeade03e380ac45f92d77da18577ee2ae58e9c3a2df27ceb88faed4cf841bd34e9d853f28f9c54ce7ca64d5b3478e0883777fc79a09082a1e102f79fabe

data/lib/url_parser/version.rb

@@ -1,3 +1,3 @@
 module UrlParser
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/url_parser.rb

@@ -139,32 +139,38 @@ module UrlParser
     end
 
     def www
-      return parser.subdomain if parser.subdomain.empty?
+      return nil if parser.subdomain.empty?
       parts = slice_domain.split('.')
-      parts.first =~ /www?\d*/ ? parts.shift : ""
+      parts.first =~ /www?\d*/ ? parts.shift : nil
     end
 
     def subdomain
-      return parser.subdomain if parser.subdomain.empty?
+      return nil if parser.subdomain.empty?
       parts = slice_domain.split('.')
       parts.shift if parts.first =~ /www?\d*/
       parts.compact.join('.')
     end
 
     def subdomains
+      return nil if parser.subdomain.empty?
       [ www, subdomain ].compact.join('.')
     end
 
     def domain_name
-      parser.domain
+      parser.domain.empty? ? nil : parser.domain
     end
 
     def domain
-      parser.domain_with_public_suffix
+      if parser.domain_with_public_suffix.empty?
+        nil
+      else
+        parser.domain_with_public_suffix
+      end
     end
 
     def tld
-      parser.public_suffix
+      tld = parser.public_suffix
+      tld.empty? ? nil : tld
     end
 
     def hostname
@@ -176,11 +182,12 @@ module UrlParser
     end
 
     def host
-      [ hostname, port ].compact.join(':')
+      name = [ hostname, port ].compact.join(':')
+      name.empty? ? nil : name
     end
 
     def origin
-      url.origin
+      url.origin == "null" ? nil : url.origin
     end
 
     def authority
@@ -193,8 +200,9 @@ module UrlParser
 
     def directory
       parts = path.split('/')
-      parts.pop unless segment.empty?
-      parts.unshift('') unless parts.first.empty?
+      return '/' if parts.empty?
+      parts.pop unless segment.to_s.empty?
+      parts.unshift('') unless parts.first.to_s.empty?
       parts.compact.join('/')
     end
 
@@ -203,19 +211,19 @@ module UrlParser
     end
 
     def segment
-      path =~ /\/\z/ ? '' : path.split('/').last
+      path =~ /\/\z/ ? nil : path.split('/').last
     end
 
     def filename
-      return 'index.html' if segment.empty?
-      return '' if suffix.empty?
+      return 'index.html' if segment.to_s.empty?
+      return '' if suffix.to_s.empty?
       segment
     end
 
     def suffix
       ext = File.extname(path)
       ext[0] = '' if ext[0] == '.'
-      ext
+      ext.empty? ? nil : ext
     end
 
     def query
@@ -231,7 +239,10 @@ module UrlParser
     end
 
     def resource
-      [ [ segment, query ].compact.join('?'), fragment ].compact.join('#')
+      name = [
+        [ segment, query ].compact.join('?'), fragment
+      ].compact.join('#')
+      name.empty? ? nil : name
     end
 
     def relative?

data/spec/url_parser_spec.rb

@@ -271,37 +271,75 @@ describe UrlParser do
   #
   context "uri components" do
 
-    let(:link) do
-      'foo://username:password@ww2.foo.bar.example.com:123/hello/world/there.html?name=ferret#foo'
-    end
-
     let(:parser) { UrlParser.new(link, clean: false) }
 
-    it { expect(parser.scheme).to eq 'foo' }
-    it { expect(parser.username).to eq 'username' }
-    it { expect(parser.password).to eq 'password' }
-    it { expect(parser.userinfo).to eq 'username:password' }
-    it { expect(parser.www).to eq 'ww2' }
-    it { expect(parser.subdomain).to eq 'foo.bar' }
-    it { expect(parser.subdomains).to eq 'ww2.foo.bar' }
-    it { expect(parser.domain_name).to eq 'example' }
-    it { expect(parser.domain).to eq 'example.com' }
-    it { expect(parser.tld).to eq 'com' }
-    it { expect(parser.hostname).to eq 'ww2.foo.bar.example.com' }
-    it { expect(parser.port).to eq 123 }
-    it { expect(parser.host).to eq 'ww2.foo.bar.example.com:123' }
-    it { expect(parser.origin).to eq 'foo://ww2.foo.bar.example.com:123' }
-    it { expect(parser.authority).to eq 'username:password@ww2.foo.bar.example.com:123' }
-    it { expect(parser.site).to eq 'foo://username:password@ww2.foo.bar.example.com:123' }
-    it { expect(parser.directory).to eq '/hello/world' }
-    it { expect(parser.path).to eq '/hello/world/there.html' }
-    it { expect(parser.segment).to eq 'there.html' }
-    it { expect(parser.filename).to eq 'there.html' }
-    it { expect(parser.suffix).to eq 'html' }
-    it { expect(parser.query).to eq 'name=ferret' }
-    it { expect(parser.query_values['name']).to eq 'ferret' }
-    it { expect(parser.fragment).to eq 'foo' }
-    it { expect(parser.resource).to eq 'there.html?name=ferret#foo' }
+    context "when present" do
+
+      let(:link) do
+        'foo://username:password@ww2.foo.bar.example.com:123/hello/world/there.html?name=ferret#foo'
+      end
+
+      it { expect(parser.scheme).to eq 'foo' }
+      it { expect(parser.username).to eq 'username' }
+      it { expect(parser.password).to eq 'password' }
+      it { expect(parser.userinfo).to eq 'username:password' }
+      it { expect(parser.www).to eq 'ww2' }
+      it { expect(parser.subdomain).to eq 'foo.bar' }
+      it { expect(parser.subdomains).to eq 'ww2.foo.bar' }
+      it { expect(parser.domain_name).to eq 'example' }
+      it { expect(parser.domain).to eq 'example.com' }
+      it { expect(parser.tld).to eq 'com' }
+      it { expect(parser.hostname).to eq 'ww2.foo.bar.example.com' }
+      it { expect(parser.port).to eq 123 }
+      it { expect(parser.host).to eq 'ww2.foo.bar.example.com:123' }
+      it { expect(parser.origin).to eq 'foo://ww2.foo.bar.example.com:123' }
+      it { expect(parser.authority).to eq 'username:password@ww2.foo.bar.example.com:123' }
+      it { expect(parser.site).to eq 'foo://username:password@ww2.foo.bar.example.com:123' }
+      it { expect(parser.directory).to eq '/hello/world' }
+      it { expect(parser.path).to eq '/hello/world/there.html' }
+      it { expect(parser.segment).to eq 'there.html' }
+      it { expect(parser.filename).to eq 'there.html' }
+      it { expect(parser.suffix).to eq 'html' }
+      it { expect(parser.query).to eq 'name=ferret' }
+      it { expect(parser.query_values['name']).to eq 'ferret' }
+      it { expect(parser.fragment).to eq 'foo' }
+      it { expect(parser.resource).to eq 'there.html?name=ferret#foo' }
+
+    end
+
+    context "when missing" do
+
+      let(:link) do
+        '/'
+      end
+
+      it { expect(parser.scheme).to be_nil }
+      it { expect(parser.username).to be_nil }
+      it { expect(parser.password).to be_nil }
+      it { expect(parser.userinfo).to be_nil }
+      it { expect(parser.www).to be_nil }
+      it { expect(parser.subdomain).to be_nil }
+      it { expect(parser.subdomains).to be_nil }
+      it { expect(parser.domain_name).to be_nil }
+      it { expect(parser.domain).to be_nil }
+      it { expect(parser.tld).to be_nil }
+      it { expect(parser.hostname).to be_nil }
+      it { expect(parser.port).to be_nil }
+      it { expect(parser.host).to be_nil }
+      it { expect(parser.origin).to be_nil }
+      it { expect(parser.authority).to be_nil }
+      it { expect(parser.site).to be_nil }
+      it { expect(parser.directory).to eq '/' }
+      it { expect(parser.path).to eq '/' }
+      it { expect(parser.segment).to be_nil }
+      it { expect(parser.filename).to eq 'index.html' }
+      it { expect(parser.suffix).to be_nil }
+      it { expect(parser.query).to be_nil }
+      it { expect(parser.query_values['name']).to be_nil }
+      it { expect(parser.fragment).to be_nil }
+      it { expect(parser.resource).to be_nil }
+
+    end
 
   end
 
@@ -343,9 +381,9 @@ describe UrlParser do
       expect(parser.subdomain).to eq 'foo.bar'
     end
 
-    it "returns an empty string if there is no subdomain" do
+    it "returns nil if there is no subdomain" do
       url = UrlParser.new('https://github.com/')
-      expect(url.subdomain).to eq ''
+      expect(url.subdomain).to be_nil
     end
 
     it "does not include www as part of the subdomain" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Matt Solt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler