Changeset 37413 for platform/tdiary

Timestamp:

05/07/10 01:44:49 (3 years ago)

Author:

drry

Message:

• 
  

Files:

• platform/tdiary/plugin/blackbird-pie.rb (modified) (7 diffs)

platform/tdiary/plugin/blackbird-pie.rb

@@ -3 +3 @@
 # blackbird-pie.rb - BlackBird plugin for tDiary
 #
-# Copyright (C) 2009, hb <smallstyle@gmail.com>
+# Copyright (C) 2010, hb <smallstyle@gmail.com>
 #
 # usage:
@@ -16 +16 @@
 require 'rexml/document'
 require 'time'
+require 'uri'
 
 def twitter_statuses_show_api( tweet_id )
@@ -34 +35 @@
 
 def blackbird_pie( src )
-        if %r|http://twitter.com/(.{1,15})/status(es)?/([0-9]{3,15})|i =~ src.to_s
-                src = $3
+        if %r|http://twitter.com/[^/]{1,15}/status(?:es)?/([0-9]+)| =~ src.to_s.downcase
+                src = $1
         end
-                
-        return unless /([0-9]{3,15})/i =~ src.to_s
+
+        return unless /\A[0-9]+\z/ =~ src.to_s
 
         cache = "#{@cache_path}/blackbird.pstore"
@@ -45 +46 @@
         db = PStore.new( cache )
         db.transaction do
-                key = src 
+                key = src
                 db[key] ||= {}
                 if db[key][:xml]
@@ -60 +61 @@
 
         doc = REXML::Document::new( REXML::Source.new( xml ) ).root
-        
+
         tweet_id = doc.elements['//id'].text
         screen_name = doc.elements['//user/screen_name'].text
@@ -70 +71 @@
         timestamp = Time.parse( doc.elements['//created_at'].text ).to_s
         content = doc.elements['//text'].text
-        content.gsub!( %r|(http://\S+)| ){ %Q|<a href="#{$1}">#{$1}</a>| }
-        content.gsub!( /@([a-z0-9_-]{1,15})/ ){ %Q|<a href="http://twitter.com/#{$1}">@#{$1}</a>| }
-        content.gsub!( /\s*\#([a-zA-Z0-9]*)[\s\r]*/ ){ %Q|<a href="http://twitter.com/search?q=%23#{$1}">##{$1}</a>| }
-        
+        content.gsub!( URI.regexp( %w|http https| ) ){ %Q|<a href="#{$&}">#{$&}</a>| }
+        content = content.split( /(<[^>]*>)/ ).map do |s|
+                next s if s[/\A</]
+                s.gsub!( /@(?>([a-zA-Z0-9_]{1,15}))(?![a-zA-Z0-9_])/ ){ %Q|<a href="http://twitter.com/#{$1}">#{$&}</a>| }
+                s.gsub( /#([a-zA-Z0-9]{1,16})/ ){ %Q|<a href="http://twitter.com/search?q=%23#{$1}">#{$&}</a>| }
+        end.join
+
         r = <<-HTML
         <!-- http://twitter.com/#{screen_name}/status/#{tweet_id} -->
         <div class="bbpBox" style=
         "background:url(#{background_url}) #{profile_background_color};padding:20px;">
-        <p class='bbpTweet' style=
+        <p class="bbpTweet" style=
                 "background:#fff;padding:10px 12px 10px 12px;margin:0;min-height:48px;color:#000;font-size:16px !important;line-height:22px;-moz-border-radius:5px;-webkit-border-radius:5px;">
                 #{content} <span class="bbpTimestamp" style=
@@ -88 +92 @@
                 "http://twitter.com/#{screen_name}"><img alt="#{name}" src=
                 "#{avatar}" style=
-                "float:left;margin:0 7px 0 0px;width:38px;height:38px;"></a>
+                "float:left;margin:0 7px 0 0;width:38px;height:38px;"></a>
                 <strong><a href=
                 "http://twitter.com/#{screen_name}">#{screen_name}</a></strong><br>