atig 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f52437a64db888b7a72bfcb418fdfe62222e0380
-  data.tar.gz: 064c715ba416098c2602455f2d637f662a63b06d
+  metadata.gz: 4fa3205294dc32a30048fe0bb019a00ee64b993b
+  data.tar.gz: af811c86345b7f465ea7d461332a24f929054c3a
 SHA512:
-  metadata.gz: 2d7094055345ec00bebe4b8a2ea7a8f36c26500dfc8530c9fc25c5d8d353c584209dd11c25b66b921c1d76b5e3e6f14bdc85c0a3176e1458806a7813963754ec
-  data.tar.gz: 28ecc6f10e97b88ffd6215d9c6e1688a9a4572edbeda0479a526fde67c33f97d4d81aec4d958e53f8f191d6909a4803fade7e0b3d876fb5041c71c62ad872413
+  metadata.gz: b527ca8c8e5526320297014377b0ff46979622c846bb459b064e32e8dd1c5f6a394645a6521240693677d57d20fd614ae26e5d0fa88ce7c259862167b79b56cb
+  data.tar.gz: 30616c567a4fe5359fe331de8ecd3f12acfa088d262a4d97baa5457bc1a5903312fb61234490be3018a85811efb7638bb524dccdfaec471b5f2049a42cae2520

data/lib/atig/ifilter/expand_url.rb

@@ -17,10 +17,11 @@ module Atig
 
       def call(status)
         target = short_url_regexp
-        entities = status.entities
+        entities = (entities = status.entities).nil? ? [] : entities.urls
         status.merge :text => status.text.gsub(target) {|url|
-          unless entities.nil? or (entities = entities.urls).empty?
+          unless entities.nil? or entities.empty?
             @cache[url] ||= search_url_from_entities(url, entities)
+            url = @cache[url] if @cache[url] =~ target
           end
           @cache[url] ||= resolve_http_redirect(URI(url)).to_s || url
         }
@@ -32,11 +33,19 @@ module Atig
         return URI.regexp(%w[http https]) if @opts.untiny_whole_urls
         %r{
           https?:// (?:
-                    (?: bit\.ly | (?: tin | rub) yurl\.com | j\.mp | t\.co
-                      | htn.to
-                      | is\.gd | cli\.gs | tr\.im | u\.nu | airme\.us
-                      | ff\.im | twurl.nl | bkite\.com | tumblr\.com
-                      | pic\.gd | sn\.im | digg\.com | goo\.gl)
+                    (?: t (?: mblr )? \.co
+                      | (?: bitly | bkite | digg | tumblr | (?: tin | rub ) yurl ) \.com
+                      | (?: is | pic ) \.gd
+                      | goo\.gl
+                      | cli\.gs
+                      | (?: ff | sn | tr ) \.im
+                      | bit\.ly
+                      | j\.mp
+                      | nico\.ms
+                      | airme\.us
+                      | twurl\.nl
+                      | u\.nu
+                      | htn\.to)
                     / [0-9a-z=-]+ |
                     blip\.fm/~ (?> [0-9a-z]+) (?! /) |
                     flic\.kr/[a-z0-9/]+

data/lib/atig/version.rb

@@ -1,3 +1,3 @@
 module Atig
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/ifilter/expand_url_spec.rb

@@ -16,6 +16,20 @@ describe Atig::IFilter::ExpandUrl, "when disable whole url" do
 
   it "should expand bit.ly" do
     filtered("This is http://bit.ly/hoge").should be_text("This is [http://bit.ly/hoge]")
+    filtered("This is http://bitly.com/hoge").should be_text("This is [http://bitly.com/hoge]")
+  end
+
+  it "should expand htn.to" do
+    filtered("This is http://htn.to/TZdkXg").should be_text("This is [http://htn.to/TZdkXg]")
+    filtered("This is http://htnnto/TZdkXg").should be_text("This is http://htnnto/TZdkXg")
+  end
+
+  it "should expand tmblr.co" do
+    filtered("This is http://tmblr.co/Z0rNbyxhxUK5").should be_text("This is [http://tmblr.co/Z0rNbyxhxUK5]")
+  end
+
+  it "should expand nico.ms" do
+    filtered("This is http://nico.ms/sm11870888").should be_text("This is [http://nico.ms/sm11870888]")
   end
 
   it "should through other url" do
@@ -57,9 +71,26 @@ describe Atig::IFilter::ExpandUrl, "when has urls entities" do
         "urls" => [{
           "url" => "http://t.co/1Vyoux4kB8",
           "expanded_url" => "http://example.com/"
+        }, {
+          "url" => "http://t.co/V1441ye6g2",
+          "expanded_url" => "http://example.org/"
         }]
       }
     }
     filtered("http://t.co/1Vyoux4kB8", opts).should be_text("http://example.com/")
+    filtered("http://t.co/1Vyoux4kB8 http://t.co/V1441ye6g2", opts).should
+      be_text("http://example.com/ http://expmaple.org/")
+  end
+
+  it "should expand recursive shorten URL" do
+    opts = {
+      "entities" => {
+        "urls" => [{
+          "url" => "http://t.co/h8sqL5ZMuz",
+          "expanded_url" => "http://bit.ly/1LM4fW"
+        }]
+      }
+    }
+    filtered("http://t.co/h8sqL5ZMuz", opts).should be_text("[http://bit.ly/1LM4fW]")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atig
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Atig.rb is forked from cho45's tig.rb. We improve some features of tig.rb.
@@ -366,4 +366,3 @@ test_files:
 - spec/sized_hash_spec.rb
 - spec/spec_helper.rb
 - spec/update_checker_spec.rb
-has_rdoc: