rack-rscript 0.4.3 → 0.4.4

data/lib/rack-rscript.rb

@@ -5,12 +5,15 @@
 
 require 'rscript'
 require 'app-routes'
+require 'requestor'
+require 'logger'
 
 class RackRscript
   include AppRoutes
 
   def initialize(raw_opts={})
-    
+    @params = {}
+
     opts = {logfile: '', logrotate: 'daily', pkg_src: ''}.merge(raw_opts)
     @url_base = opts[:pkg_src] # web server serving the RSF files
     @url_base += '/' unless @url_base[-1] == '/'
@@ -28,9 +31,13 @@ class RackRscript
   def call(env)
     request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
 
-    log Time.now.to_s + ": " + request
+    log Time.now.to_s + ": " + request.inspect
     content, content_type, status_code = run_route(request)
-    content, status_code  = "404: page not found", 404 if content.nil?
+    if content.nil? then
+      e = $!
+      log(e) if e
+      content, status_code  = "404: page not found", 404 
+    end
 
     content_type ||= 'text/html'
     status_code ||= 200
@@ -39,28 +46,36 @@ class RackRscript
 
 
   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| 
+
+    if @params[:splat] and @params[:splat].length > 0 then
+      h = @params[:splat].first[1..-1].split('&').inject({}) do |r,x| 
         k, v = x.split('=')
         r.merge(k.to_sym => v)
       end
-      params.merge! h
+      @params.merge! h
     end
 
+
     result, args = RScript.new.read([url, jobs.split(/\s/), \
       qargs].flatten)
     rws = self
     
     begin
       r = eval result
-      # jr040612 @params = {}
+      #@params = {}
       return r
 
     rescue Exception => e  
-
+      @params = {}
       err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")      
       log(err_label)
-      ($!).to_s
+    end
+    
+  end
+  
+  def log(msg)
+    if @log == true then
+      @logger.debug msg
     end
   end
   
@@ -79,9 +94,5 @@ class RackRscript
     end        
   end
   
-  def log(msg)
-    if @log == true then
-      @logger.debug msg
-    end
-  end
+   
 end

metadata

@@ -2,7 +2,7 @@
 name: rack-rscript
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-04 00:00:00 Z
+date: 2012-07-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack