ajp-rails 0.0.4 → 0.1.0

data/NEWS.en

@@ -1,4 +1,7 @@
 = NEWS
+== 0.1.0 (2006-01-31)
+ * The `first' release.
+ * Reviewed at "Rails Meeting Tokyo"
 == 0.0.4 (2006-01-27)
  * The `0.4th' release
  * Daemonizing support.
@@ -7,6 +10,6 @@
  * Sticky session support.
 == 0.0.2 (2006-01-24)
 Status: unstable
- * The `0th' release to be reviewed by "2nd Rails Meeting @ Tokyo".
+ * The `0th' release to be reviewed by "2nd Rails Meeting Tokyo".
  * The first release -- v.0.1.0 -- will be done by the end of Jan, 2006.
    This will be include the result of the review.

data/NEWS.ja

@@ -1,5 +1,8 @@
 = NEWS
-== 0.0.4 (2006.01-27)
+== 0.1.0 (2006-01-31)
+ * `���'��꡼��
+ * Rails�ٶ���@����ǥ�ӥ塼���줿
+== 0.0.4 (2006-01-27)
  * ����äȽ���`��0.4��'��꡼��
  * �ǡ�����������ݡ���
 == 0.0.3 (2006-01-25)

data/ajp-rails.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |spec|
   spec.name = "ajp-rails"
-  spec.version = "0.0.4"
+  spec.version = "0.1.0"
   spec.required_ruby_version = ">= 1.8.3"
-  spec.add_dependency('ruby-ajp', '>= 0.2.0')
+  spec.add_dependency('ruby-ajp', '>= 0.2.1')
   spec.add_dependency('rails', '>= 0.14')
   spec.summary = "Ruby on Rails Runner, which uses AJP(Apache JServ Protocol) to cooperate with a HTTPd, instead of CGI or FastCGI"
   spec.author = "Yugui"

data/lib/ajp-rails/rails-wrapper.rb

@@ -50,6 +50,8 @@
 #++
 
 require 'forwardable'
+require 'cgi'
+require 'action_controller/cgi_ext/raw_post_data_fix'
 require 'action_controller/cgi_ext/cgi_methods'
 
 class Net::AJP13::Request
@@ -68,21 +70,81 @@ class Net::AJP13::Request
   attr_reader :output_cookies
 end
 
+
 # Wraps Net::AJP13::Request to adapt it to request object in rails.
 class AjpRailsRequest < ActionController::AbstractRequest
+  AJP_PACKET_EMBED_VARIABLES = [
+    'remote_addr', 'remote_host', 'server_name', 'server_port'
+  ]
+
+  # Modifies implementation for AjpRailsRequest
+  QueryExtension = CGI::QueryExtension.dup
+  module QueryExtension #:nodoc: all
+    private
+
+    def read_params_from_post
+      content = raw_post
+      content.chop! if content[-1] == 0
+      content
+    end
+    def read_params_from_query
+      query_string || ''
+    end
+
+    #--
+    # Uses AjpRails's own implementation
+    #++
+    remove_method :server_software, :query_string, :cookies, :host,
+      *AJP_PACKET_EMBED_VARIABLES
+  end
+
   DEFAULT_SESSION_OPTIONS = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS.merge('session_key' => 'JSESSIONID')
 
   extend Forwardable
 
+  #--
+  # methods for CGI::QueryExtension
+  #++
+  def stdinput
+    if @req.body_stream
+      @req.body_stream
+    elsif @req.body
+      StringIO.new(@req.body)
+    else
+      nil
+    end
+  end
+  private :stdinput
+
+  #
+  # +ajp_request+:: Net::AJP13::Request object to wrap
+  # +session_options+:: Options to manage sessions. It is compatible for CGI::SEssion.new's options.
+  # +server_environments+::
   def initialize(ajp_request, session_options, server_environments)
     @req = ajp_request
     @session_options = session_options
     @server_environments = server_environments
     @session_options['session_path'] ||= @server_environments['APP_LOCATION']
 
-    if server_environments['LOAD_BALANCE_ID'] and @req.cookies['JSESSIONID']
-      balance_id = server_environments['LOAD_BALANCE_ID']
-      @req.cookies['JSESSIONID'].each do |value|
+    # simulates environment hash.
+    @env = self.class.instance_method(:environment).bind(self)
+    # Object#method is overridden by AbstractRequest#method
+    class << @env
+      def include?(key) !call(key).nil? end
+      alias :key? :include?
+    end
+
+    extend QueryExtension
+    initialize_query
+
+    @cookies = nil
+    fix_cookies
+  end
+
+  # removes jvm-route suffix from session id.
+  def fix_cookies
+    if balance_id = @server_environments['LOAD_BALANCE_ID'] and cookies = @req.cookies['JSESSIONID']
+      cookies.each do |value|
         case value
 	when String
 	  value.gsub!(/\.#{Regexp.escape(balance_id)}\Z/, '')
@@ -93,33 +155,56 @@ class AjpRailsRequest < ActionController::AbstractRequest
 	end
       end
     end
-
-    # simulates environment hash.
-    @env = self.class.instance_method(:environment).bind(self)
-    # Object#method is overridden by AbstractRequest#method
-
-    class << @env
-      def include?(key) !call(key).nil? end
-      alias :key? :include?
-    end
   end
-  attr_reader :env
+  private :fix_cookies
 
+  # option values for session management. The interface is compatible for
+  # CGI::Session.new's second argument
   attr_accessor :session_options
 
-  def method
-    @req.method.downcase.to_sym
-  end
+  # CGI#env compatible interface for ActionController::AbstractRequest
+  attr_reader :env #:nodoc:
+  alias :env_table :env
+  private :env_table
 
-  def environment(name)
-    case name
-    when /^\AHTTP_(\w+)\Z/
+  # The implementation of #env
+  def environment(name) #:nodoc:
+    case name.downcase
+    when /^\Ahttp_(\w+)\Z/o
       name = $1.tr('_', '-')
       @req[name]
+    when AJP_PACKET_EMBED_VARIABLES.include?(name)
+      @req.send(name)
+    when 'query_string'
+      self.query_string
+    when 'server_protocol'
+      @req.protocol
+    when 'request_method'
+      @req.method
     else
-      @req[name] or @server_environments[name]
+      @req[name.tr('_', '-')] or @server_environments[name]
     end
   end
+  private :environment
+
+
+  def server_software
+    val = @req.get_attributes('server_software')
+    val and val[0] and /([A-Za-z]+)/ =~ val[0] and $1.downcase
+  end
+
+  def query_string
+    val = @req.get_attributes('query_string')
+    val and val[0]
+  end
+
+  def_delegators :@req,
+    :ssl?, :cookies, :cookes=, *AJP_PACKET_EMBED_VARIABLES
+
+  # HTTP method name as a Symbol
+  def method
+    @req.method.downcase.to_sym
+  end
 
   def raw_post
     if @req.body
@@ -151,32 +236,17 @@ class AjpRailsRequest < ActionController::AbstractRequest
     end
   end
 
-  def_delegators :@req, :ssl?, :cookies
-
-  def server_software
-    val = @req.get_attributes('server_software')
-    val and val[0] and /([A-Za-z]+)/ =~ val[0] and $1.downcase
-  end
-
-  def query_string
-    val = @req.get_attributes('query_string')
-    val and val[0]
-  end
-
+  # Overrides blank implementation in AbstractRequest
   def query_parameters
     (qs = self.query_string).blank? ? {} : CGIMethods.parse_query_parameters(qs)
   end
 
-  def post_params
-    @post_params ||= CGI.parse(raw_post)
-    @post_params
-  end
-
+  # Overrides blank implementation in AbstractRequest
   def request_parameters
     if formatted_post?
       CGIMethods.parse_formatted_request_parameters(post_format, raw_post)
     else
-      CGIMethods.parse_request_parameters(self.post_params)
+      CGIMethods.parse_request_parameters(self.params)
     end
   end
 
@@ -188,6 +258,8 @@ class AjpRailsRequest < ActionController::AbstractRequest
       (@req['host'] and @req['host'].split(':').first) ||
       ''
   end
+
+  # Overrides AbstractRequest's one
   def port
     @req['x-forwarded-host'] ? standard_port : (port_from_http_host || @req.server_port)
   end
@@ -196,6 +268,7 @@ class AjpRailsRequest < ActionController::AbstractRequest
     $1.to_i if @req['host'] && /:(\d+)$/ =~ @req['host']
   end
 
+  # Overrides blank implementation in AbstractRequest
   def session
     unless @session
       if @session_options == false
@@ -214,6 +287,7 @@ class AjpRailsRequest < ActionController::AbstractRequest
     @session
   end
 
+  # Overrides blank implementation in AbstractRequest
   def reset_session
     @session.delete if CGI::Session === @session
     @session = new_session

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajp-rails
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2006-01-27 00:00:00 +09:00
+  version: 0.1.0
+date: 2006-02-01 00:00:00 +09:00
 summary: Ruby on Rails Runner, which uses AJP(Apache JServ Protocol) to cooperate with a HTTPd, instead of CGI or FastCGI
 require_paths: 
 - lib
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails