rack-cgi 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a57e39eb35e6fbd1bf45f61d55dc6573ebdfdd1d
-  data.tar.gz: 14ba6dbf2ba1a2de9f667af129677ec3631ddc6e
+  metadata.gz: 4618ec968b358ef35f6d1ea3399aa48229fadaec
+  data.tar.gz: 17b358d43485c6cacb06d371f1ce7d6b8873436f
 SHA512:
-  metadata.gz: 596e99e2e0f7e6cf232897087252457a72a0c44c434d0e9e3bd0e1f2825aa97eddbab57f7ce16ba4437dd6e2320cd495fe24eea7031d073e0b3698b42cd4c0d4
-  data.tar.gz: 25d98ca0ee4d4eed6e59baf8779e9f9d884cba91f98026b33a0dfdbbf843fcbb3fe043c165278c509f9cd34064395aa1a9cddd4f0b24587f9a9d2f1c80a54e45
+  metadata.gz: 4e401f35c930f09fbe29b44329b1c39b03be50df738891f2c1ab9b535d223c473cf3f92f82030a09c85fdd604c0717bafd88fbc209b49dad0fa4db8753c9814a
+  data.tar.gz: 8ef794dcd8a596bfda31a2967aba5583f6e0010af48e2320ecb00091383a6f5a334d201a23cef8b15206dcbcedf96ea6cb70264ca071091bbd9e538ff90c99ec

data/lib/rack/cgi/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Cgi
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

data/lib/rack/cgi.rb

@@ -1 +1,174 @@
-require 'rack-cgi'
+require 'childprocess'
+
+module Rack
+  class CGI
+    class Executable
+      def self.=~ rhs
+        ::File.executable? rhs
+      end
+    end
+
+    def initialize app, args = {}
+      @app = app
+      @opts = args.select {|k, _| k.is_a? Symbol}
+      @rules = args.select {|k, _| !k.is_a? Symbol}
+
+      @root = @opts[:cgi_path]
+      if @root !~ /^\//
+        @root = ::File.join(Dir.pwd, @root)
+      end
+
+      @index = @opts[:index] || []
+      @index = [@index] if not @index.is_a? Hash
+    end
+
+    def solve_path path
+      path = ::File.join(@root, path)
+      if ::File.directory? path
+        @index.each do |f|
+          path2 = ::File.join(path, f)
+          return path2 if ::File.file? path2
+        end
+      else
+        return path if ::File.file? path
+      end
+      nil
+    end
+
+    def cgi_env env, path
+      env = env.select {|k, _| k =~ /^[A-Z]/}
+      env['SCRIPT_FILENAME'] = path
+      env['DOCUMENT_ROOT'] = @root
+      env['REDIRECT_STATUS'] = "200"
+      env
+    end
+
+    def match_cgi_rule path
+      @rules.each do |m, r|
+        if m =~ path
+          return r
+        end
+      end
+      return nil
+    end
+
+    def run_cgi rule, path, env
+      if rule.empty?
+        args = [path]
+      else
+        args = [rule, path]
+      end
+
+      process = ChildProcess.build(*args)
+      process.io.stdout = Tempfile.new('rack-cgi-stdout')
+      process.io.stderr = Tempfile.new('rack-cgi-stderr')
+      env.each do |k, v|
+        process.environment[k] = v
+      end
+      process.cwd = Dir.pwd
+      process.start
+      process.wait
+
+      cont_out = ::File.read(process.io.stdout.path)
+      cont_err = ::File.read(process.io.stderr.path)
+      process.io.stdout.unlink
+      process.io.stderr.unlink
+
+      [process.exit_code, cont_out, cont_err]
+    end
+
+    def split_header_content output
+      lines = output.lines.to_a
+      header = []
+      
+      until lines.empty? 
+        l = lines.shift
+        if l == "\n" or l == "\r\n"
+          # find break line between header and content
+          return header.join, lines.join
+        elsif l =~ /:/
+          header << l
+        else
+          # content break header ruler, so deal as no header
+          return "", output
+        end
+      end
+
+      # deal all content as header
+      return output, ""
+    end
+
+    def parse_output output
+      header, content = split_header_content output
+     
+      h = {}
+      header.each_line do |l|
+        k, v = l.split ':', 2
+        k.strip!
+        v.strip!
+        h[k.downcase] = [k, v]
+      end
+
+      if h['status']
+        status = h['status'][1].to_i
+        h.delete 'status'
+      else
+        status = 200
+      end
+
+      header_hash = Hash[h.values]
+
+      [status, header_hash, [content]]
+    end
+
+    def report_error code, out, err, cgi_env
+      h = {'Content-Type' => 'text/plain'}
+      status = 500
+      reports = []
+      
+      reports << "CGI Error!\n\n"
+      reports << "stdout output:\n"
+      reports << out
+      reports << "\n"
+      reports << "stderr output:\n"
+      reports << err
+      reports << "\n"
+      reports << "environments:\n"
+      cgi_env.each do |k, v|
+        reports << "#{k} => #{v}\n"
+      end
+
+      [status, h, reports]
+    end
+
+    def call(env)
+      path = solve_path env["PATH_INFO"]
+      if not path
+        return @app.call(env)
+      end
+
+      rule = match_cgi_rule path
+      if not rule
+        return @app.call(env)
+      end
+
+      cgi_env = cgi_env(env, path)
+      code, out, err = run_cgi rule, path, cgi_env
+      if code == 0
+        parse_output out
+      else
+        report_error code, out, err, cgi_env
+      end
+    end
+    def run(env, rule, path)
+      cgi_env = cgi_env(env, path)
+      code, out, err = run_cgi rule, path, cgi_env
+      if code == 0
+        parse_output out
+      else
+        report_error code, out, err, cgi_env
+      end
+    end
+  end
+end
+

data/lib/rack-cgi.rb

@@ -1,165 +1 @@
-require 'childprocess'
-
-module Rack
-  class CGI
-    class Executable
-      def self.=~ rhs
-        ::File.executable? rhs
-      end
-    end
-
-    def initialize app, args = {}
-      @app = app
-      @opts = args.select {|k, _| k.is_a? Symbol}
-      @rules = args.select {|k, _| !k.is_a? Symbol}
-
-      @root = @opts[:cgi_path]
-      if @root !~ /^\//
-        @root = ::File.join(Dir.pwd, @root)
-      end
-
-      @index = @opts[:index] || []
-      @index = [@index] if not @index.is_a? Hash
-    end
-
-    def solve_path path
-      path = ::File.join(@root, path)
-      if ::File.directory? path
-        @index.each do |f|
-          path2 = ::File.join(path, f)
-          return path2 if ::File.file? path2
-        end
-      else
-        return path if ::File.file? path
-      end
-      nil
-    end
-
-    def cgi_env env, path
-      env = env.select {|k, _| k =~ /^[A-Z]/}
-      env['SCRIPT_FILENAME'] = path
-      env['DOCUMENT_ROOT'] = @root
-      env['REDIRECT_STATUS'] = "200"
-      env
-    end
-
-    def match_cgi_rule path
-      @rules.each do |m, r|
-        if m =~ path
-          return r
-        end
-      end
-      return nil
-    end
-
-    def run_cgi rule, path, env
-      if rule.empty?
-        args = [path]
-      else
-        args = [rule, path]
-      end
-
-      process = ChildProcess.build(*args)
-      process.io.stdout = Tempfile.new('rack-cgi-stdout')
-      process.io.stderr = Tempfile.new('rack-cgi-stderr')
-      env.each do |k, v|
-        process.environment[k] = v
-      end
-      process.cwd = Dir.pwd
-      process.start
-      process.wait
-
-      cont_out = ::File.read(process.io.stdout.path)
-      cont_err = ::File.read(process.io.stderr.path)
-      process.io.stdout.unlink
-      process.io.stderr.unlink
-
-      [process.exit_code, cont_out, cont_err]
-    end
-
-    def split_header_content output
-      lines = output.lines.to_a
-      header = []
-      
-      until lines.empty? 
-        l = lines.shift
-        if l == "\n" or l == "\r\n"
-          # find break line between header and content
-          return header.join, lines.join
-        elsif l =~ /:/
-          header << l
-        else
-          # content break header ruler, so deal as no header
-          return "", output
-        end
-      end
-
-      # deal all content as header
-      return output, ""
-    end
-
-    def parse_output output
-      header, content = split_header_content output
-     
-      h = {}
-      header.each_line do |l|
-        k, v = l.split ':', 2
-        k.strip!
-        v.strip!
-        h[k.downcase] = [k, v]
-      end
-
-      if h['status']
-        status = h['status'][1].to_i
-        h.delete 'status'
-      else
-        status = 200
-      end
-
-      header_hash = Hash[h.values]
-
-      [status, header_hash, [content]]
-    end
-
-    def report_error code, out, err, cgi_env
-      h = {'Content-Type' => 'text/plain'}
-      status = 500
-      reports = []
-      
-      reports << "CGI Error!\n\n"
-      reports << "stdout output:\n"
-      reports << out
-      reports << "\n"
-      reports << "stderr output:\n"
-      reports << err
-      reports << "\n"
-      reports << "environments:\n"
-      cgi_env.each do |k, v|
-        reports << "#{k} => #{v}\n"
-      end
-
-      [status, h, reports]
-    end
-
-    def call(env)
-      path = solve_path env["PATH_INFO"]
-      if not path
-        return @app.call(env)
-      end
-
-      rule = match_cgi_rule path
-      if not rule
-        return @app.call(env)
-      end
-
-      cgi_env = cgi_env(env, path)
-      code, out, err = run_cgi rule, path, cgi_env
-      if code == 0
-        parse_output out
-      else
-        report_error code, out, err, cgi_env
-      end
-    end
-  end
-end
-
+require_relative 'rack/cgi'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-cgi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Chizhong Jin