rack-rscript 0.4.0 → 0.4.2

data/lib/rack-rscript.rb

@@ -25,7 +25,7 @@ class RackRscript
     default_routes(@params)
   end
 
-	def call(env)
+  def call(env)
     request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
 
     log Time.now.to_s + ": " + request
@@ -34,24 +34,10 @@ class RackRscript
 
     content_type ||= 'text/html'
     status_code ||= 200
-	  [status_code, {"Content-Type" => content_type}, [content]]
-	end
-
-  private
-
-  def default_routes(params)
-
-    get '/do/:package/:job' do |package,job|
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params)  
-    end
-    
-    get '/do/:package/:job/*' do |package, job|
-      raw_args = params[:splat]
-      args = raw_args.join.split('/')[1..-1]
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
-    end        
+    [status_code, {"Content-Type" => content_type}, [content]]
   end
 
+
   def run_job(url, jobs, params={}, *qargs)
     if params[:splat] and params[:splat].length > 0 then
       h = params[:splat].first[1..-1].split('&').inject({}) do |r,x| 
@@ -77,7 +63,22 @@ class RackRscript
       ($!).to_s
     end
   end
+  
+  private
+
+  def default_routes(params)
 
+    get '/do/:package/:job' do |package,job|
+      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params)  
+    end
+    
+    get '/do/:package/:job/*' do |package, job|
+      raw_args = params[:splat]
+      args = raw_args.join.split('/')[1..-1]
+      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
+    end        
+  end
+  
   def log(msg)
     if @log == true then
       @logger.debug msg

metadata

@@ -2,7 +2,7 @@
 name: rack-rscript
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors: 
 - James Robertson
@@ -10,11 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-26 00:00:00 +00:00
-default_executable: 
+date: 2012-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: app-routes
+  name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -25,7 +24,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rscript
+  name: app-routes
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -35,6 +34,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rscript
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: 
 executables: []
@@ -45,7 +55,6 @@ extra_rdoc_files: []
 
 files: 
 - lib/rack-rscript.rb
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -69,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.