fcgiwrap 0.1.5 → 0.1.6

data/ChangeLog

@@ -1,4 +1,9 @@
-06-10-16  Tatsuki Sugiura  <sugi@nemui.org>
+2007-09-01  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Speed tune for FCGIWrap.print 
+	* Use singleton in FCGIWrap, now works with ruby 1.9 
+
+2006-10-16  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* release 0.1.5
 	* add gemspec

data/lib/fcgiwrap.rb

@@ -12,9 +12,11 @@
 #    FCGIWrap.each {
 #      load '/path/to/original.cgi'
 #    }
+#
 
 require 'cgi'
 require 'fcgi'
+require 'singleton'
 
 # for ruby 1.8 blow
 if RUBY_VERSION.tr(".", "0").to_i < 10801
@@ -28,33 +30,49 @@ if RUBY_VERSION.tr(".", "0").to_i < 10801
 end
 
 class FCGIWrap
-  VERSION = "0.1.5"
-  @@cgi = nil
-  @@shutdown = false
+  include Singleton
+
+  VERSION = "0.1.6"
+
+  def initialize
+    cgi = nil
+    shutdown_p = false
+  end
+  attr_accessor :cgi, :shutdown_p
+
   class << self
     def cgi
-      @@cgi
+      FCGIWrap.instance.cgi
+    end
+
+    def shutdown?
+      FCGIWrap.instance.shutdown_p
+    end
+
+    def shutdown=(f)
+      FCGIWrap.instance.shutdown_p = f
     end
 
     def each_request
       trap(:PIPE){ exit } 
-      trap(:TERM){ @@cgi ? (@@shutdown = true) : exit } 
-      trap(:INT){ @@cgi ? (@@shutdown = true) : exit } 
-      FCGI.each_cgi { |@@cgi|
+      trap(:TERM){ self.cgi ? (shutdown = true) : exit } 
+      trap(:INT){ self.cgi ? (shutdown = true) : exit } 
+      FCGI.each_cgi { |cgi|
+        FCGIWrap.instance.cgi = cgi
 	ENV.clear
-	ENV.update(@@cgi.env_table)
+	ENV.update(self.cgi.env_table)
         begin
           yield
 	rescue SystemExit
-	  @@shutdown && raise
+	  shutdown? && raise
         ensure
-          @@cgi = nil
+          FCGIWrap.instance.cgi = nil
           #Thread.list.each { |t|
           #  Thread.current == t and next
           #  t.kill
           #}
         end
-	@@shutdown && exit
+	shutdown? && exit
       }
     end
     alias each each_request
@@ -85,3 +103,4 @@ class CGI
   end
 end
 
+# vim: set sts=2 sw=2 expandtab:

metadata

@@ -1,56 +1,63 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: fcgiwrap
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
-date: 2006-10-16 00:00:00 +09:00
-summary: A trick to wrap CGI in FastCGI easily
-require_paths: 
-- lib
-email: sugi@nemui.org
-homepage: 
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.6
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Tatsuki Sugiura
-files: 
-- lib/fcgiwrap.rb
-- README
-- ChangeLog
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-03-21 00:00:00 +09:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fcgi
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: 
+description: 
+email: sugi@nemui.org
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+files: 
+- lib/fcgiwrap.rb
+- README
+- ChangeLog
+has_rdoc: false
+homepage: 
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A trick to wrap CGI in FastCGI easily
+test_files: []
+