Changeset 2826 for lang/ruby/ssb

Timestamp:

12/08/07 02:57:53 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: refactor configuration, about:blank URI, cleaned up HTML and remove some trashes.

Location:

lang/ruby/ssb/trunk

Files:

• config/common.rb (modified) (1 diff)
• config/config.yaml.default (modified) (1 diff)
• libs/ssb.rb (modified) (4 diffs)
• libs/ssb/misc.rb (modified) (1 diff)
• libs/ssb/qrcode.rb (modified) (1 diff)
• libs/ssb/request.rb (modified) (2 diffs)
• public_html/stylesheets/ssb.css (modified) (1 diff)
• templates/ssb.rhtml (modified) (1 diff)
• test/request_test.rb (modified) (1 diff)

lang/ruby/ssb/trunk/config/common.rb

@@ -19 +19 @@
   CONFIG[:config_file] = File.join(SSB::CONFIG[:config_dir], 'config.yaml')
   CONFIG[:dat_dir] = File.join(SSB::CONFIG[:home_dir], 'dat')
-  CONFIG[:default_uri] = 'http://localhost/'
+
+  @@config = nil
+
+  def self.config(force_reload = false)
+    if @@config.nil? or force_reload
+      begin
+        File.open(SSB::CONFIG[:config_file]) do |f|
+          @@config = YAML.load(f.read.untaint)
+        end
+      rescue =>e
+        @@config = {}
+      end
+    end
+
+    # useragent/homepage だけは設定がなくてもデフォルトで入れる
+    @@config['default'] ||= {}
+    @@config['default']['useragent'] ||= 'DoCoMo/2.0 P905i' unless @@config['useragent']
+    @@config['default']['homepage'] ||= 'about:blank'
+
+    @@config
+  end
 end
 
 $LOAD_PATH.concat SSB::CONFIG[:library_dir].map{|d| File.join(SSB::CONFIG[:home_dir], d)}
-

lang/ruby/ssb/trunk/config/config.yaml.default

@@ -1 +1 @@
 default:
-  useragent: "DoCoMo/2.0 F900iT(c100;TB;W22H12)"
+  useragent: "DoCoMo/2.0 P905i"
   uid: "010000000000"
   hid: "ser000000000000000"
   icc: "icc000000000000000"
-
+  homepage: 'about:blank'
+  exheader: 
+  mailaddr: 

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

@@ -3 +3 @@
 # Author:: MIZOGUCHI Coji <mizoguchi.coji at gmail.com>
 # License:: Distributes under the same terms as Ruby
- #
+#
 # $Id$
 #
@@ -20 +20 @@
   class Application
     def initialize
+      SSB::config
       @time_stamp = SSB::TimeStamper.new({
                                          :request_time => [:request_start, :request_finish],
@@ -115 +116 @@
 
     def output_template(request_uri, response, term, page, source, res)
-      tpl_file = 'ssb.rhtml'
-      template = open(File.join(SSB::CONFIG[:template_dir], tpl_file)).read.untaint
-
       # レスポンスヘッダ
       response_header = {}
       response.each do |k,v|
         response_header[k] = v
-      end
+      end unless response.nil?
 
+      # filter: 元の文字コードで
       page = SSB::Application.filter_html(page, request_uri, term, response)
 
+      # SJIS等からUTF-8へ
       page = NKF::nkf('-w', page)
 
@@ -139 +139 @@
 
       begin
+        template = open(File.join(SSB::CONFIG[:template_dir], 'ssb.rhtml')).read.untaint
         erb = ERB.new(template)
         res.body = erb.result(binding)

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

@@ -19 +19 @@
     # 端末情報の読み込み cookie or config.yaml
     def self.load_terminal_info(cookies)
-      # cookie をフラットに
-      params = { }
+      params = SSB::config['default'].dup
+
       cookies.each do |cookie|
-        params[cookie.name] = URI.unescape(cookie.value.untaint)
+        params[cookie.name.dup.untaint] = URI.unescape(cookie.value.untaint)
       end
 
-      if params.has_key?('useragent')
-        term = params
-      else
-        specs = YAML.load(open(SSB::CONFIG[:config_file]).read.untaint)
-        term = specs['default']
-      end
-
-      spec = SSB::KtaiSpec.new({ :useragent => term['useragent'],
-                                 :uid       => term['uid'],
-                                 :hid       => term['hid'],
-                                 :icc       => term['icc'],
-                                 :exheader  => term['exheader'],
-                               })
-
-      spec[:homepage] = params['homepage']
-      spec[:mailaddr] = params['mailaddr']
-
-      return spec
+      return SSB::KtaiSpec.new(params)
     end
   end

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

@@ -28 +28 @@
       $KCODE = ''
       q = ::Qrcode.new
-      if q.respond_to?('make_qrcode')
-        qrcode = q.make_qrcode(str)
-      else
+      begin
         qrcode = ''
+        qrcode = q.make_qrcode(str) if q.respond_to?('make_qrcode')
+      ensure
+        $KCODE = saved_kcode
+        return qrcode
       end
-      $KCODE = saved_kcode
-      return qrcode
     end
   end

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

@@ -55 +55 @@
     def execute
       response = nil
+      return nil if @uri.scheme == 'about'
 
       http = http_class(@http_proxy).new(@uri.host, @uri.port)
@@ -93 +94 @@
       end
 
-      uri_base = SSB::CONFIG[:default_uri] if uri_base.nil? || uri_base == ''
-      uri_base = 'http://' + uri_base unless uri_base =~ %r|https?://|
+      uri_base = SSB::config['default']['homepage'] unless uri_base
+      uri_base = 'http://' + uri_base unless uri_base =~ %r[https?://|about:blank]
 
       begin

lang/ruby/ssb/trunk/public_html/stylesheets/ssb.css

@@ -192 +192 @@
 
 #client #sidebar #pane_setting #term_form {
-  font-size: x-small;
-}
-
-#client #sidebar #pane_setting #termform fieldset.input_fields {
-  text-align: left;
-}
-
-#client #sidebar #pane_setting #term_form span.warning {
-  color: red;
-  font-size: x-small;
+  font-size: small;
+  margin: 4px;
+}
+
+#client #sidebar #pane_setting #term_form fieldset {
+  border: none;
+}
+
+#client #sidebar #pane_setting #term_form fieldset hr {
+  margin: 2px;
+  border: solid 1px gray;
+}
+
+#client #sidebar #pane_setting #term_form fieldset#term_input_field table {
+  width: 100%;
+}
+
+#client #sidebar #pane_setting #term_form fieldset#term_input_field td.term_param_input input,
+#client #sidebar #pane_setting #term_form fieldset#term_input_field td.term_param_input textarea {
+  width: 99%;
+}
+
+#client #sidebar #pane_setting #term_form fieldset#term_control_panel {
+  text-align: center;
+  margin-top: 20px;
 }
 

lang/ruby/ssb/trunk/templates/ssb.rhtml

@@ -131 +131 @@
       <div id="pane_setting" class="pane pane_close">
         <form id="term_form" action="">
-          <fieldset class="input_fields">
+          <fieldset id="term_input_field">
             <table>
               <tr>
-                <td><p>ホームページ</p></td>
-                <td><input id="field_homepage" type="text" size="50" name="homepage" value="<%= term[:homepage] %>"/></td>
-              </tr>
-              <tr>
-                <td><p>メールアドレス</p></td>
-                <td><input id="field_mailaddr" type="text" size="50" name="mailaddr" value="<%= term[:mailaddr] %>"/><br /><span class="warning">入力したメールアドレスが正しいか必ず確認してください。アドレスが偶然無関係のユーザのものになると、情報漏洩の可能性があります。</span></td>
-              </tr>
-              <tr>
-                <td><hr /></td><td></td>
-              </tr>
-              <tr>
-                <td><p>User-Agent</p></td>
-                <td><input id="field_useragent" type="text" size="50" name="useragent" value="<%= term[:useragent] %>"/></td>
-              </tr>
-              <tr>
-                <td><p>UID</p></td>
-                <td><input id="field_uid" type="text" size="50" name="uid" value="<%= term[:uid] %>" /><br /><span class="warning">入力したUIDが正しいか必ず確認してください。適当に入れると偶然無関係の一般ユーザと認識される可能性があり、危険です。</span></td>
-              </tr>
-              <tr>
-                <td><hr /></td>
-                <td></td>
-              </tr>
-              <tr>
-                <td><p>端末ID / HID</p></td>
-                <td><input id="field_hid" type="text" size="50" name="hid" value="<%= term[:hid] %>" /></td>
-              </tr>
-              <tr>
-                <td><p>FOMAカードID</p></td>
-                <td><input id="field_icc" type="text" size="50" name="icc" value="<%= term[:icc] %>" /></td>
-              </tr>
-              <tr>
-                <td><hr /></td>
-                <td></td>
-              </tr>
-              <tr>
-                <td><p>拡張リクエストヘッダ</p></td>
-                <td><textarea id="field_exheader" cols="50" rows="5" name="exheader"><%= term[:exheader] %></textarea></td>
+                <td class="term_param_label">ホームページ</td>
+                <td class="term_param_input"><input id="field_homepage" type="text" size="50" name="homepage" value="<%= term[:homepage] %>"/></td>
+              </tr>
+              <tr>
+                <td class="term_param_label">メールアドレス</td>
+                <td class="term_param_input">
+                                  <input id="field_mailaddr" type="text" size="50" name="mailaddr" value="<%= term[:mailaddr] %>"/>
+                                </td>
+              </tr>
+              <tr>
+                <td class="term_param_label"><hr /></td>
+                                <td class="term_param_input"></td>
+              </tr>
+              <tr>
+                <td class="term_param_label">User-Agent</td>
+                <td class="term_param_input"><input id="field_useragent" type="text" size="50" name="useragent" value="<%= term[:useragent] %>"/></td>
+              </tr>
+              <tr>
+                <td class="term_param_label"><hr /></td>
+                <td class="term_param_input"></td>
+              </tr>
+              <tr>
+                <td class="term_param_label">UID</td>
+                <td class="term_param_input"><input id="field_uid" type="text" size="50" name="uid" value="<%= term[:uid] %>" /></td>
+              </tr>
+              <tr>
+                <td class="term_param_label">端末ID / HID</td>
+                <td class="term_param_input"><input id="field_hid" type="text" size="50" name="hid" value="<%= term[:hid] %>" /></td>
+              </tr>
+              <tr>
+                <td class="term_param_label">FOMAカードID</td>
+                <td class="term_param_input"><input id="field_icc" type="text" size="50" name="icc" value="<%= term[:icc] %>" /></td>
+              </tr>
+              <tr>
+                <td class="term_param_label"><hr /></td>
+                <td class="term_param_input"></td>
+              </tr>
+              <tr>
+                <td class="term_param_label">拡張リクエストヘッダ</td>
+                <td class="term_param_input"><textarea id="field_exheader" cols="50" rows="5" name="exheader"><%= term[:exheader] %></textarea></td>
               </tr>
             </table>
           </fieldset>
-
-          <fieldset class="control_panel">
+          <fieldset id="term_control_panel">
             <input type="submit" name="action" value="save" /> ケータイ設定をcookieに保存する
             <input type="reset" name="action" value="clear" /> cookieを消去して初期設定に戻す

lang/ruby/ssb/trunk/test/request_test.rb

@@ -105 +105 @@
   end
 
+  test 'about:blank uri' do
+    @request = SSB::Request.new('GET', {'ssb_q'.taint, 'about:blank'.taint}, cookie)
+    assert_not_nil(@request.uri)
+    assert_instance_of(URI::Generic, @request.uri)
+    assert_equal(@request.uri.scheme, 'about')
+    assert_equal(@request.uri.opaque, 'blank')
+  end
+
   test 'test_request_should_success' do
     mock_server = MockServer.new