rack-cgi 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 554dbd13cd048c0f09a1f67f40b881aef41b5263
-  data.tar.gz: b03db17b76eb11c8c5de58fc55bcda9e0e91de95
+  metadata.gz: a23ac17c5c6d553b31d4845dcd426004f8a38217
+  data.tar.gz: 0cbe4eb000b84c81bcc0c19b82085d4a6d4ba838
 SHA512:
-  metadata.gz: 59a84174fd826479e906bac88891a2d0d14664f51c040f4e0383f9e6809efbc4d37ab9accdaa70aee1a5e629cc93112fbc2e718125e0f7575c5fcc53687d1d3c
-  data.tar.gz: d920cd369e448e4460fab470fb9505554cdcd6a3a3cd3c81c1ab3afda5ff5d76329fbb9bada68324a183beb4c5c9116d4e2e292ae75820a206b13959f3de1f7c
+  metadata.gz: 52fb4c084f8afbd23f7842fb7b4f83620ecb2d4ef6960bedc6e2d88074db715a17c549ab308b01a0896e843e989f05e83db0c7fadb60a302f82d864a2cceffc6
+  data.tar.gz: 16486670e4b74e6617303a3550fee17223ef909fa93c5862d46fc84849d500269b59f89c8f7d786846dec2ce60f1b416e0b3c00163d0e473556706d8f03f9c26

data/README.md

@@ -54,6 +54,16 @@ If you special `nil`, nothing will happened, as if not matched.
 If you special `""`, script will be launched directly. Ensure script is executable.  
 If you special `path_to_application`, application will be launched with script name.
 
+### Directory redirect
+
+In some programs(such as phpBB), when you visit a dir without ending '/'. (Such as 'http://wps-community.org/forum')
+All relative resource will cannot accessed. In this case, we have to redirect 'http://wps-community.org/forum' to 
+'http://wps-community.org/forum/' to avoid this problem.
+
+You can use following code to open this feature.
+
+    use Rack::CGI, ..., dir_redirect: true, ...
+
 TODO
 ----
 

data/lib/rack/cgi/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Cgi
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/lib/rack/cgi.rb

@@ -7,7 +7,7 @@ module Rack
         ::File.executable? rhs
       end
     end
-
+    
     def initialize app, args = {}
       @app = app
       @opts = args.select {|k, _| k.is_a? Symbol}
@@ -20,6 +20,8 @@ module Rack
 
       @index = @opts[:index] || []
       @index = [@index] if not @index.is_a? Array
+
+      @dir_redirect = @opts[:dir_redirect]
     end
 
     def solve_path path
@@ -27,7 +29,13 @@ module Rack
       if ::File.directory? path
         @index.each do |f|
           path2 = ::File.join(path, f)
-          return path2 if ::File.file? path2
+          if ::File.file? path2
+            if @dir_redirect and path !~ %r{/$}
+              throw :rack_cgi_result, [302, {'Location' => path + '/'}, [""]]
+            else
+              return path2
+            end
+          end
         end
       else
         return path if ::File.file? path
@@ -142,31 +150,35 @@ module Rack
     end
 
     def call(env)
-      path = solve_path env["PATH_INFO"]
-      if not path
-        return @app.call(env)
-      end
+      catch :rack_cgi_result do
+        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
+        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
+        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
     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
+      catch :rack_cgi_result do
+        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

metadata

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