Changeset 6006 for platform/tdiary/plugin/section_footer2.rb

Timestamp:

02/02/08 01:17:57 (5 years ago)

Author:

drry

Message:

platform/tdiary/plugin/section_footer2.rb: 文面等の細かい修整。正規表現の修正。ほか。

Files:

• platform/tdiary/plugin/section_footer2.rb (modified) (10 diffs)

platform/tdiary/plugin/section_footer2.rb

@@ -9 +9 @@
 require 'timeout'
 require 'yaml'
-require "pathname"
+require 'pathname'
 
 def permalink( date, index, escape = true )
@@ -31 +31 @@
         s = ''
         if subtitle then
-                s = subtitle.sub( /^(\[([^\[]+?)\])+/ ) do
+                s = subtitle.sub( /^(?:\[[^\[]+?\])+/ ) do
                         $&.scan( /\[(.*?)\]/ ) do |tag|
                                 @category_to_tag_list[tag] = false # false when diary
@@ -57 +57 @@
                 end
 
-                # 「このエントリを含む del.icio.us(json API)」
+                # 「このエントリの del.icio.us history (JSON API)」
                 r << add_delicious_json(date, index)
 
@@ -75 +75 @@
 def add_delicious_json(date, index)
         require 'json'
-        
+
         url_md5 = Digest::MD5.hexdigest(permalink(date, index, false))
         cache_dir = "#{@cache_path}/delicious/#{date.strftime( "%Y%m" )}/"
@@ -82 +82 @@
         update = false
         count = 0
-
-        r = " | "
-        r << %Q|<a href="http://del.icio.us/url/#{url_md5}"><img src="http://images.del.icio.us/static/img/delicious.small.gif" style="border: none;vertical-align: middle;" alt="このエントリを含む del.icio.us" title="このエントリを含む del.icio.us">|
+        r = ''
 
         begin
@@ -100 +98 @@
                         begin
                                 timeout(10) do
-                                        open( 'http://badges.del.icio.us/feeds/json/url/data?hash=' + url_md5 ) do |file|
+                                        open( "http://badges.del.icio.us/feeds/json/url/data?hash=#{url_md5}" ) do |file|
                                                 File::open( file_name, 'wb' ) do |f|
                                                         f.write( file.read )
@@ -115 +113 @@
         begin
                 File::open( file_name ) do |f|
-                                data = JSON.parse(@conf.to_native( f.read, 'utf-8' ))
+                        data = JSON.parse(@conf.to_native( f.read, 'utf-8' ))
                         unless data[0].nil?
                                 count = data[0]["total_posts"].to_i
@@ -124 +122 @@
 
         if count > 0
-                r << %Q| #{count} users|
+                r << ' | '
+                r << %Q{<a href="http://del.icio.us/url/#{url_md5}"><img src="http://images.del.icio.us/static/img/delicious.small.gif" style="border: none;vertical-align: middle;" alt="このエントリの del.icio.us history" title="このエントリの del.icio.us history"> #{count} user}
+                r << 's' if count > 1
+                r << '</a>'
         end
 
-        r << %Q|</a>|
-        
         return r
 end
@@ -135 +134 @@
         config = YAML.load(Pathname.new(file).expand_path.read)
 
-        r = " | "
+        r = ""
         unless config.nil? then
+                r << ' | '
                 r << %Q|<a href="#{config["url"]}#{permalink(date, index)}">|
                 r << %Q|<img src="#{config["src"]}" style="border: none;vertical-align: middle;" |
@@ -144 +144 @@
                         r << %Q| <img src="#{config["counter"]}#{permalink(date, index)}" style="border: none;vertical-align: middle;" />|
                 end
-                r << %Q|</a>|
+                r << '</a>'
         end