url_parser 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d88f4309a1787a5ed3f004e60a85e5f4a5e26765
-  data.tar.gz: 78146dbfb19dbec7f5f9169fef026a7b2448c43d
+  metadata.gz: d5650a4eee893c20d6109ba81727dee86207dd9a
+  data.tar.gz: 2d91d7efec1239d3bfdd56fc61b36d3274a3c8bc
 SHA512:
-  metadata.gz: 99801e22611a0d7c78b576e01aacb097c32852fa99775674524b2bf1f000988e64cb00766eaeec083ce16b0cb7c10c9b29745dff7186fca43135276e467c8a05
-  data.tar.gz: 4df106696e71b773da7bc7e7997ac8ade0cb4002327cbb107c1b436c420373b1ce55abcd0eed67d0b328385c7d35d190bc921e5e64d264ef26c4ce7232817389
+  metadata.gz: 6dd4c33a39b4dcbada0f21f52551df48ca1d514860c81caf64b1aa184eacc7dc1d707f705b41f6331d79d9588ebec9ae30144df7dc4ea9c0abd223532da31328
+  data.tar.gz: 98edd4c481f0494f5238601053947fc86d2d7a5e02ce6fc8a537d94ef57213bcdb5fb816813761cdb6be8b9845bf7c9cd52702eadee803d97285debc0a96d9f4

data/lib/url_parser/version.rb

@@ -1,3 +1,3 @@
 module UrlParser
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/url_parser.rb

@@ -62,6 +62,18 @@ module UrlParser
       end
     end
 
+    def clean!
+      @preserve = false
+      @parser = nil
+      @uri = nil
+      @url = PostRank::URI.clean(url)
+      self
+    end
+
+    def to_s
+      url
+    end
+
     def schemes
       Array.wrap(@schemes)
     end
@@ -136,6 +148,11 @@ module UrlParser
       end
     end
 
+    def join(relative_path)
+      joined_url = Addressable::URI.join(url, relative_path).to_s
+      UrlParser.new(joined_url, preserve: true)
+    end
+
     private
 
     def tag_errors

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require "rspec"
+begin
+  require "pry"
+rescue LoadError; end
 
 require "url_parser"
 

data/spec/url_parser_spec.rb

@@ -71,6 +71,31 @@ describe UrlParser do
 
   end
 
+  context "#clean!" do
+
+    let(:link) { 'link.to?a=b&utm_source=FeedBurner#stuff' }
+    let(:parser) { UrlParser.new(link, preserve: true) }
+
+    before { parser.clean! }
+
+    it "normalizes the url" do
+      expect(parser.url).to eq 'http://link.to/?a=b'
+    end
+
+    it "resets the uri" do
+      expect(parser.instance_variable_get(:@uri)).to be_nil
+    end
+
+    it "resets the parser" do
+      expect(parser.instance_variable_get(:@parser)).to be_nil
+    end
+
+  end
+
+  context "#to_s" do
+
+  end
+
   context "#uri" do
 
     it "returns a parsed uri" do
@@ -173,4 +198,41 @@ describe UrlParser do
 
   end
 
+  # Thanks to http://stackoverflow.com/a/4864170
+  #
+  context "#join" do
+
+    let(:link) { 'http://foo.com/zee/zaw/zoom.html' }
+
+    it "properly combines a url and and relative url" do
+      {
+        'http://zork.com/'                 => 'http://zork.com/',
+        'http://zork.com/#id'              => 'http://zork.com/#id',
+        'http://zork.com/bar'              => 'http://zork.com/bar',
+        'http://zork.com/bar#id'           => 'http://zork.com/bar#id',
+        'http://zork.com/bar/'             => 'http://zork.com/bar/',
+        'http://zork.com/bar/#id'          => 'http://zork.com/bar/#id',
+        'http://zork.com/bar/jim.html'     => 'http://zork.com/bar/jim.html',
+        'http://zork.com/bar/jim.html#id'  => 'http://zork.com/bar/jim.html#id',
+        '/bar'                             => 'http://foo.com/bar',
+        '/bar#id'                          => 'http://foo.com/bar#id',
+        '/bar/'                            => 'http://foo.com/bar/',
+        '/bar/#id'                         => 'http://foo.com/bar/#id',
+        '/bar/jim.html'                    => 'http://foo.com/bar/jim.html',
+        '/bar/jim.html#id'                 => 'http://foo.com/bar/jim.html#id',
+        'jim.html'                         => 'http://foo.com/zee/zaw/jim.html',
+        'jim.html#id'                      => 'http://foo.com/zee/zaw/jim.html#id',
+        '../jim.html'                      => 'http://foo.com/zee/jim.html',
+        '../jim.html#id'                   => 'http://foo.com/zee/jim.html#id',
+        '../'                              => 'http://foo.com/zee/',
+        '../#id'                           => 'http://foo.com/zee/#id',
+        '#id'                              => 'http://foo.com/zee/zaw/zoom.html#id'
+      }.each do |relative_url, expected_result|
+        expect(parser.join(relative_url).to_s).to eq expected_result
+      end
+
+    end
+
+  end
+
 end

data/url_parser.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry"
 
   spec.add_dependency "domainatrix", ">= 0.0.11"
   spec.add_dependency "postrank-uri", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Solt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: domainatrix
   requirement: !ruby/object:Gem::Requirement