postrank-uri 1.0.9 → 1.0.10

data/lib/postrank-uri.rb

@@ -134,7 +134,7 @@ module PostRank
     end
 
     def hash(uri, opts = {})
-      Digest::MD5.hexdigest(opts[:skip_clean] ? uri : clean(uri))
+      Digest::MD5.hexdigest(opts[:clean] == false ? uri : clean(uri))
     end
 
     def normalize(uri)
@@ -161,6 +161,10 @@ module PostRank
         u.path = $1
       end
 
+      if u.host =~ /tumblr\.com$/
+        u.path = u.path.gsub(/[^\/]+$/, '')
+      end
+
       u
     end
 

data/lib/postrank-uri/version.rb

@@ -1,5 +1,5 @@
 module PostRank
   module URI
-    VERSION = "1.0.9"
+    VERSION = "1.0.10"
   end
 end

data/spec/postrank-uri_spec.rb

@@ -132,6 +132,12 @@ describe PostRank::URI do
       end
     end
 
+    context "tumblr" do
+      it "should strip slug" do
+        c('http://test.tumblr.com/post/4533459403/some-text').should == 'http://test.tumblr.com/post/4533459403/'
+      end
+    end
+
     context "embedded links" do
       it "should extract embedded redirects from Google News" do
         u = c('http://news.google.com/news/url?sa=t&fd=R&&url=http://www.ctv.ca/CTVNews/Politics/20110111/')
@@ -167,6 +173,8 @@ describe PostRank::URI do
 
       c('igvita.com?id=<>').should == 'http://igvita.com/?id=%3C%3E'
       c('igvita.com?id="').should == 'http://igvita.com/?id=%22'
+
+      c('test.tumblr.com/post/23223/text-stub').should == 'http://test.tumblr.com/post/23223'
     end
 
     it "should clean host specific parameters" do
@@ -193,8 +201,8 @@ describe PostRank::URI do
     it "should not clean the URI if requested" do
       hash = '55fae8910d312b7878a3201ed653b881'
 
-      h('http://everburning.com/feed/post/1', :skip_clean => true).should == hash
-      h('everburning.com/feed/post/1', :skip_clean => true).should_not == hash
+      h('http://everburning.com/feed/post/1', :clean => false).should == hash
+      h('everburning.com/feed/post/1', :clean => false).should_not == hash
     end
   end
 
@@ -273,30 +281,31 @@ describe PostRank::URI do
       end
     end
 
-    context 'domain extraction' do
-      url_list = {"http://alex.pages.example.com" => "example.com",
-                  "alex.pages.example.com" => "example.com",
-                  "http://example.com/2011/04/01/blah" => "example.com",
-                  "http://example.com" => "example.com",
-                  "example.com" => "example.com",
-                  "ExampLe.com" => "example.com",
-                  "ExampLe.com:3000" => "example.com",
-                  "http://alex.pages.example.COM" => "example.com",
-                  "http://www.example.ag.it/2011/04/01/blah" => "example.ag.it",
-                  "ftp://www.example.com/2011/04/01/blah" => nil,
-                  "http://com" => nil,
-                  "http://alex.pages.examplecom" => nil,
-                  "example" => nil,
-                  "http://127.0.0.1" => nil,
-                  "localhost" => nil
-                  }
-
-       url_list.each_pair do |url, expected_result|
-         it "should extract #{expected_result.inspect} from #{url}" do
-            u = PostRank::URI.clean(url, :raw => true)
-            u.domain.should == expected_result
-         end
-       end
+    context "domain extraction" do
+      url_list = {
+        "http://alex.pages.example.com" => "example.com",
+        "alex.pages.example.com" => "example.com",
+        "http://example.com/2011/04/01/blah" => "example.com",
+        "http://example.com" => "example.com",
+        "example.com" => "example.com",
+        "ExampLe.com" => "example.com",
+        "ExampLe.com:3000" => "example.com",
+        "http://alex.pages.example.COM" => "example.com",
+        "http://www.example.ag.it/2011/04/01/blah" => "example.ag.it",
+        "ftp://www.example.com/2011/04/01/blah" => nil,
+        "http://com" => nil,
+        "http://alex.pages.examplecom" => nil,
+        "example" => nil,
+        "http://127.0.0.1" => nil,
+        "localhost" => nil
+      }
+
+      url_list.each_pair do |url, expected_result|
+        it "should extract #{expected_result.inspect} from #{url}" do
+          u = PostRank::URI.clean(url, :raw => true)
+          u.domain.should == expected_result
+        end
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: postrank-uri
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -04:00
+date: 2011-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency