Changeset 19599 for lang/ruby

Timestamp:

09/19/08 15:47:16 (2 months ago)

Author:

drry

Message:

• fixed regexes.
  

Files:

• lang/ruby/citrus/trunk/plugins/weather_search.rb (modified) (4 diffs)

lang/ruby/citrus/trunk/plugins/weather_search.rb

@@ -7 +7 @@
   def initialize(*args)
     super
-    @prefix = @config['prefix'] || 'ws '
+    @prefix = @config['prefix'] || 'ws'
     @channel = ''
     @area = ''
   end
-  
+
   def on_privmsg(prefix, channel, message)
     case message
-    when /^#{@prefix}([^\s]+)(\s(\++))?$/i
+    when /^#{@prefix}\s+(\S+)(?:\s+(\++))?$/i
       @channel = channel
       @area = $1
-      notice(@channel, weather_search(@area, $3))
+      notice(@channel, weather_search(@area, $2))
     end
   end
-  
+
   def weather_search(area, after_days)
     return help() if area == 'help'
     list = list()
-    
+
     if area == 'list'
       notice(@channel, 'Area list from weather search')
-      str = ""
+      str = ''
       group = []
       list['city'].each_with_index do |r,i|
@@ -38 +38 @@
       end
       notice(@channel, group.join(' / ')) if group.size > 0
-      return "ended."
+      return 'ended.'
     end
-    
-    return ws_get(list,@area,after_days)
+
+    return ws_get(list, @area, after_days)
   end
-  
+
   def help()
     'usage: ws (list | help | AREANAME) [ "+" 1-6 nums ]. Powered by livedoor.'
   end
-  
+
   def list()
     data = { 'city' => [], 'source' => [] }
@@ -59 +59 @@
           return str
         end
-        
+
         xml = REXML::Document.new(res.body)
-        
-        REXML::XPath.each(xml,'//city/@title') { |t| data['city'] <<  t.to_s }
-        REXML::XPath.each(xml,'//city/@source') { |t| data['source'] <<  t.to_s }
+
+        REXML::XPath.each(xml, '//city/@title') { |t| data['city'] <<  t.to_s }
+        REXML::XPath.each(xml, '//city/@source') { |t| data['source'] <<  t.to_s }
       end
     end
     data
   end
-  
-  def ws_get(data,area,after_days)
-    return 'Oops! retry typing!!' unless data["city"].include? area
-    /http:\/\/weather.livedoor.com(.+)/ =~ data["source"][data["city"].index(area)]
+
+  def ws_get(data, area, after_days)
+    return 'Oops! retry typing!!' unless data['city'].include? area
+    %r{http://weather\.livedoor\.com(.+)} =~ data['source'][data['city'].index(area)]
     url = $1
-    
+
     Net::HTTP.start('weather.livedoor.com', 80) do |http|
       begin
@@ -79 +79 @@
         res = http.request(get)
         log res.code.inspect
-        
+
         if str = code_message(!res.code.to_i)
           return str
         end
-        
+
         xml = REXML::Document.new(res.body)
         title = []
         REXML::XPath.each(xml, '//item/title') { |t| title << t.text }
         after_num = after_days.nil? ? 0 : after_days.split('').size
-        return title[1+after_num] ? title[1+after_num] : "Nothing data!!"
+        return title[1+after_num] ? title[1+after_num] : 'Nothing data!!'
       end
     end
-    return "This plugin is testing now. Just a moment, please..."
+    return 'This plugin is testing now. Just a moment, please...'
   end
-    
+
   def code_message(str)
     case str
     when 400
-      return "http request error."
+      return 'http request error.'
     when 401
-      return "oops,Unauthorized."
+      return 'oops, Unauthorized.'
     when 404
-      return "this area is not found."
+      return 'this area is not found.'
     end
   end