Changeset 2653 for lang/ruby/ssb

Timestamp:

12/06/07 18:57:36 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: HTTPS support

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb/ktai_spec.rb (modified) (1 diff)
• libs/ssb/request.rb (modified) (3 diffs)
• public_html/stylesheets/ssb.css (modified) (2 diffs)

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

@@ -108 +108 @@
     def get_transformed_uri(uri)
       return nil if uri.nil?
-      uri = URI.parse(uri) unless uri.instance_of?(URI::HTTP)
+      uri = URI.parse(uri) unless uri.kind_of?(URI)
 
       return uri unless get_carrier == CARRIER_DOCOMO

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

@@ -8 +8 @@
 require 'cgi'
 require 'net/http'
+require 'net/https'
 require 'nkf'
 require 'ssb/misc'
@@ -59 +60 @@
     def execute
       response = nil
-      http_class(@http_proxy).start(@uri.host.untaint, @uri.port.untaint) do |http|
+
+      http = http_class(@http_proxy).new(@uri.host.untaint, @uri.port.untaint)
+      if @uri.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      http.start do
         case method
         when 'GET'
@@ -91 +98 @@
 
       uri_base = SSB::CONFIG[:default_uri] if uri_base.nil? || uri_base == ''
-      uri_base = 'http://' + uri_base unless uri_base =~ /http:\/\//i
+      uri_base = 'http://' + uri_base unless uri_base =~ %r|https?://|
 
       begin

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

@@ -78 +78 @@
 #client #sidebar #status_bar {
   width: 240px;
-  height: 100px;
+  min-height: 100px;
+  margin-bottom: 10px;
   float: left;
   font-size: x-small;
@@ -85 +86 @@
 #client #sidebar #status_bar #qrcode {
   float: left;
-  width: 100px;
-  height: 120px;
+  min-width: 100px;
+  min-height: 100px;
 }