Changeset 2260 for lang/ruby/ssb

Timestamp:

12/02/07 00:54:52 (13 months ago)

Author:

tokuhirom

Message:

lang/ruby/ssb: refactoring.

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb.rb (modified) (3 diffs)
• test/filter_test.rb (added)

lang/ruby/ssb/trunk/libs/ssb.rb

@@ -146 +146 @@
       end
 
-
+      page = SSB::Application.filter_html(page, request_uri, term, ssb)
+
+      page = NKF::nkf('-w', page)
+
+      # タイトル
+      page =~ /<title>(.+)<\/title>/
+      title = $1
+
+      page_js = page.gsub(/(\r|\n|\")/im) { |s|
+        case $1
+        when "\r"
+          "\\r"
+        when "\n"
+          "\\n"
+        # when "\""
+        #  "\\" + $1
+        else
+          $1
+        end
+      }
+
+      begin
+        erb = ERB.new(template)
+        res.body = erb.result(binding)
+      rescue => e
+        res.body = e
+      end
+    end
+
+    def self.filter_html(page, request_uri, term, ssb)
       # <?xml をけす。IEのバグ対応
       page.gsub!(/<\?([^\?]+)\?>/) { |s|
@@ -153 +182 @@
 
       # form action と a href と img src のURLを書き換え
-      page.gsub!(/ (action|href|src|data)[ ]*=[ ]*[\"']?([^>\"' ]+)[\"']?([^>]*)>/im) { |s|
+      page = page.gsub(/ (action|href|src|data)[ ]*=[ ]*[\"']?([^>\"' ]+)[\"']?([^>]*)>/im) { |s|
         begin
           tag = $1.downcase
@@ -184 +213 @@
       page = Emoji::emoji_conv(term, page)
 
-      page = NKF::nkf('-w', page)
-
-      # タイトル
-      page =~ /<title>(.+)<\/title>/
-      title = $1
-
-      page_js = page.gsub(/(\r|\n|\")/im) { |s|
-        case $1
-        when "\r"
-          "\\r"
-        when "\n"
-          "\\n"
-        # when "\""
-        #  "\\" + $1
-        else
-          $1
-        end
-      }
-
-      begin
-        erb = ERB.new(template)
-        res.body = erb.result(binding)
-      rescue => e
-        res.body = e
-      end
-    end
-
+      page
+    end
   end