Changeset 19028 for lang/ruby

Timestamp:

09/09/08 02:14:21 (2 months ago)

Author:

drry

Message:

• fixed regexps.
  

Location:

lang/ruby/nicovideo-post-ext/lib

Files:

• nicovideo-post-ext.rb (modified) (2 diffs)
• nicovideo-wayback-ext.rb (modified) (2 diffs)

lang/ruby/nicovideo-post-ext/lib/nicovideo-post-ext.rb

@@ -20 +20 @@
         # getpostkey
         content = @agent.get_file(BASE_URL + "/api/getpostkey?thread=#{@params['thread_id']}&block_no=0")
-        @params.merge!(content.scan(/([^&]+)=([^&]*)/).inject({}){|h, v| h[v[0]] = v[1]; h})
+        @params.merge!(content.scan(/([^&=]+)=([^&]*)/).inject({}){|h, v| h[v[0]] = v[1]; h})
         raise "no postkey (#{content})" unless @params.key?('postkey')
 
@@ -28 +28 @@
 
         vpos = case time
-               when /(\d+):(\d+\.\d+|\d+)/
+               when /(\d+):(\d+(?:\.\d+)?)/
                  ($1.to_i * 6000) + ($2.to_f * 100).to_i
-               when /(\d+\.\d+|\d+)/
-                 ($1.to_f * 100).to_i
+               when /\d+(?:\.\d+)?/
+                 ($&.to_f * 100).to_i
                end
 

lang/ruby/nicovideo-post-ext/lib/nicovideo-wayback-ext.rb

@@ -13 +13 @@
         @params = get_params unless @params
         thread_id = @params['thread_id']
-        body = %!<thread res_from="-#{num}" version="20061206" thread="#{thread_id}" />!
+        body = %!<thread res_from="-#{num}" version="20061206" thread="#{thread_id}"/>!
 
         if time
@@ -24 +24 @@
           @params.merge!(content.scan(/([^&]+)=([^&]*)/).inject({}){|h, v| h[v[0]] = v[1]; h})
           raise ArgError, "no waybackkey: #{content}" unless @params.key?('waybackkey')
-          body.sub!(/( \/>)/, {
+          body.sub!(%r{(?=/>)}, {
             :user_id => @params['user_id'],
             :when => time.to_i,
             :waybackkey => @params['waybackkey']
-          }.map{|k,v| %! #{k}="#{v}"!}.join + ' />')
+          }.map{|k,v| %! #{k}="#{v}"!}.join)
         end