Changeset 18670 for lang/ruby

Timestamp:

09/02/08 22:52:35 (4 months ago)

Author:

drry

Message:

• 正規表現を修正しました。
  
• re コマンドを別名にして reply コマンドに改名しました。
  
• wig.rb に習って #api を変更しました。
  
• ほか。
  

Location:

lang/ruby/net-irc/trunk/examples

Files:

• iig.rb (modified) (1 diff)
• tig.rb (modified) (6 diffs)

lang/ruby/net-irc/trunk/examples/iig.rb

@@ -133 +133 @@
 
         def api_source
-                "iigrb"
+                "iig.rb"
         end
 

lang/ruby/net-irc/trunk/examples/tig.rb

@@ -95 +95 @@
 Force SSL for API.
 
+## Extended commands through the CTCP ACTION
+
+### list (ls)
+
+        /me list NICK_or_screen_name
+
+### fav (favorite, favourite, unfav, unfavorite, unfavourite)
+
+        /me fav ID [ID...]
+        /me unfav ID [ID...]
+
+### link (ln)
+
+        /me link ID [ID...]
+
+### destroy (del, delete, miss, oops, remove, rm)
+
+        /me destroy ID [ID...]
+
+### in (location)
+
+        /me in Tokyo, Japan
+
+### reply (re)
+
+        /me reply ID blah, blah...
+
+### utf7
+
+   /me utf7
+
 ## License
 
@@ -327 +358 @@
                                 require "iconv"
                                 @utf7 = !@utf7
-                                log "utf7 mode: #{@utf7 ? 'on' : 'off'}"
+                                log "UTF-7 mode: #{@utf7 ? 'on' : 'off'}"
                         rescue LoadError => e
                                 log "Can't load iconv."
@@ -397 +428 @@
                         location = location.empty? ? "nowhere" : "in #{location}"
                         post server_name, NOTICE, main_channel, "You are #{location} now."
-                when "re"
+                when /^re(?:ply)?$/
                         tid = args.first
                         st  = @tmap[tid]
@@ -722 +753 @@
 
                 q["source"] ||= api_source
-                q = q.inject([]) {|r,(k,v)| v ? r << "#{k}=#{URI.escape(v, /[^-.!~*'()\w]/n)}" : r }.join("&")
 
                 path = path.sub(%r{^/+}, "")
@@ -731 +761 @@
                 end
                 uri.path += "#{path}.json"
+                uri.query = q.inject([]) {|r,(k,v)| v ? r << "#{k}=#{URI.escape(v, /[^-.!~*'()\w]/n)}" : r }.join("&")
                 if require_post? path
-                        req = Net::HTTP::Post.new(uri.request_uri, headers)
-                        req.body = q
+                        req = Net::HTTP::Post.new(uri.path, headers)
+                        req.body = uri.query
                 else
-                        uri.query = q
                         req = Net::HTTP::Get.new(uri.request_uri, headers)
                 end
@@ -780 +810 @@
 
         def untinyurl(text)
-                text.gsub(%r"http://(?:(?:preview\.)?tinyurl\.com|rubyurl\.com)/[0-9a-z=]+"i) {|m|
+                text.gsub(%r"http://(?:(preview\.)?tin|rub)yurl\.com)/[0-9a-z=]+"i) {|m|
                         uri = URI(m)
                         uri.host = uri.host.sub($1, "") if $1