hprose 1.4.5 → 1.4.6

data/README.md

@@ -1,5 +1,7 @@
 # Hprose for Ruby
 
+[![Gem Version](https://badge.fury.io/rb/hprose.png)](http://badge.fury.io/rb/hprose)
+
 *Hprose* is a High Performance Remote Object Service Engine.
 
 It is a modern, lightweight, cross-language, cross-platform, object-oriented, high performance, remote dynamic communication middleware. It is not only easy to use, but powerful. You just need a little time to learn, then you can use it to easily construct cross language cross platform distributed application system.

data/lib/hprose/httpservice.rb

@@ -14,45 +14,73 @@
 #                                                          #
 # hprose http service for ruby                             #
 #                                                          #
-# LastModified: Mar 8, 2014                                #
+# LastModified: Mar 12, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
 
-require "hprose/io"
-require "hprose/service"
+require 'hprose/io'
+require 'hprose/service'
 
 module Hprose
   class HttpService < Service
-    attr_accessor :crossdomain
-    attr_accessor :p3p
-    attr_accessor :get
-    attr_accessor :on_send_header
     def initialize
       super
       @crossdomain = false
       @p3p = false
       @get = true
+      @crossdomain_xml_file = nil
+      @crossdomain_xml_content = nil
+      @client_access_policy_xml_file = nil
+      @client_access_policy_xml_content = nil
       @on_send_header = nil
     end
+    attr_accessor :crossdomain
+    attr_accessor :p3p
+    attr_accessor :get
+    attr_accessor :on_send_header
+    attr_reader :crossdomain_xml_file
+    attr_reader :crossdomain_xml_content
+    attr_reader :client_access_policy_xml_file
+    attr_reader :client_access_policy_xml_content
+    def crossdomain_xml_file=(filepath)
+      @crossdomain_xml_file = filepath
+      f = File.open(filepath)
+      begin
+        @crossdomain_xml_content = f.read
+      ensure
+        f.close
+      end
+    end
+    def crossdomain_xml_content=(content)
+      @crossdomain_xml_file = nil
+      @crossdomain_xml_content = content
+    end
+    def client_access_policy_xml_file=(filepath)
+      @client_access_policy_xml_file = filepath
+      f = File.open(filepath)
+      begin
+        @client_access_policy_xml_content = f.read
+      ensure
+        f.close
+      end
+    end
+    def client_access_policy_xml_content=(content)
+      @client_access_policy_xml_file = nil
+      @client_access_policy_xml_content = content
+    end
     def call(context)
-      header = {'Content-Type' => 'text/plain'}
-      header['P3P'] = 'CP="CAO DSP COR CUR ADM DEV TAI PSA PSD ' +
-        'IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi ' +
-        'PUBi IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT ' +
-        'STA POL HEA PRE GOV"' if @p3p
-      if @crossdomain then
-        origin = context["HTTP_ORIGIN"]
-        if (origin and origin != "null") then
-          header['Access-Control-Allow-Origin'] = origin
-          header['Access-Control-Allow-Credentials'] = 'true'
-        else
-          header['Access-Control-Allow-Origin'] = '*'
-        end
+      unless @client_access_policy_xml_content.nil? then
+        result = client_access_policy_xml_handler(context)
+        return result if result
+      end
+      unless @crossdomain_xml_content.nil? then
+        result = crossdomain_xml_handler(context)
+        return result if result
       end
+      header = default_header(context)
       begin
         statuscode = 200
-        @on_send_header.call(header) unless @on_send_header.nil?
         if (context['REQUEST_METHOD'] == 'GET') and @get then
           body = do_function_list
         elsif (context['REQUEST_METHOD'] == 'POST') then
@@ -72,5 +100,56 @@ module Hprose
       session = context['rack.session'] ? context['rack.session'] : {}
       ((arity > 0) and (args.length + 1 == arity)) ? args + [session] : args
     end
+    private
+    def crossdomain_xml_handler(context)
+      path = (context['SCRIPT_NAME'] << context['PATH_INFO']).downcase
+      if path == '/crossdomain.xml' then
+        if context['HTTP_IF_MODIFIED_SINCE'] == @last_modified and
+          context['HTTP_IF_NONE_MATCH'] == @etag then
+          return [304, {}, ['']]
+        else
+          header = {'Content-Type' => 'text/xml',
+                    'Last-Modified' => @last_modified,
+                    'Etag' => @etag,
+                    'Content-Length' => @crossdomain_xml_content.size.to_s}
+          return [200, header, [@crossdomain_xml_content]]
+        end
+      end
+      return false
+    end
+    def client_access_policy_xml_handler(context)
+      path = (context['SCRIPT_NAME'] << context['PATH_INFO']).downcase
+      if path == '/clientaccesspolicy.xml' then
+        if context['HTTP_IF_MODIFIED_SINCE'] == @last_modified and
+          context['HTTP_IF_NONE_MATCH'] == @etag then
+          return [304, {}, ['']]
+        else
+          header = {'Content-Type' => 'text/xml',
+                    'Last-Modified' => @last_modified,
+                    'Etag' => @etag,
+                    'Content-Length' => @client_access_policy_xml_content.size.to_s}
+          return [200, header, [@client_access_policy_xml_content]]
+        end
+      end
+      return false
+    end
+    def default_header(context)
+      header = {'Content-Type' => 'text/plain'}
+      header['P3P'] = 'CP="CAO DSP COR CUR ADM DEV TAI PSA PSD ' +
+        'IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi ' +
+        'PUBi IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT ' +
+        'STA POL HEA PRE GOV"' if @p3p
+      if @crossdomain then
+        origin = context['HTTP_ORIGIN']
+        if (origin and origin != 'null') then
+          header['Access-Control-Allow-Origin'] = origin
+          header['Access-Control-Allow-Credentials'] = 'true'
+        else
+          header['Access-Control-Allow-Origin'] = '*'
+        end
+      end
+      @on_send_header.call(header, context) unless @on_send_header.nil?
+      return header
+    end
   end # class HttpService
 end # module Hprose

data/lib/hprose/io.rb

@@ -690,7 +690,6 @@ module Hprose
         @stream.write(usec.modulo(1000).to_s.rjust(3, '0')) if usec % 1000 > 0
       end
     end
-    protected
     def write_ref(obj)
       return @refer.write(@stream, obj)
     end

data/lib/hprose/tcpserver.rb

@@ -14,7 +14,7 @@
 #                                                          #
 # hprose tcp server for ruby                               #
 #                                                          #
-# LastModified: Mar 11, 2014                               #
+# LastModified: Mar 12, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
@@ -37,18 +37,7 @@ module Hprose
       end
       @sockets = nil
     end
-    def host
-      @host
-    end
-    def host=(host)
-      @host = host
-    end
-    def port
-      @port
-    end
-    def port=(port)
-      @port = port
-    end
+    attr_accessor :host, :port
     def start
       begin
         @sockets = Socket.tcp_server_sockets(@host, @port)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hprose
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: andot@hprose.com