rack-rscript 0.4.4 → 0.4.5

data/lib/rack-rscript.rb

@@ -47,22 +47,26 @@ class RackRscript
 
   def run_job(url, jobs, params={}, *qargs)
 
+    if @params[:splat] then
+      @params.each do  |k,v|
+        @params.delete k unless k == :splat or k == :package or k == :job or k == :captures
+      end
+    end  
+    
     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)
+        r.merge(k[/\w+$/].to_sym => v)
       end
       @params.merge! h
     end
 
-
     result, args = RScript.new.read([url, jobs.split(/\s/), \
       qargs].flatten)
     rws = self
     
     begin
       r = eval result
-      #@params = {}
       return r
 
     rescue Exception => e  
@@ -89,7 +93,7 @@ class RackRscript
     
     get '/do/:package/:job/*' do |package, job|
       raw_args = params[:splat]
-      args = raw_args.join.split('/')[1..-1]
+      args = raw_args.first[1..-1][/.[\/\w]+/].split('/')
       run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
     end        
   end

metadata

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