rscript-server 0.1.2 → 0.1.3

data/lib/rscript-server.rb

@@ -18,6 +18,7 @@ class RScriptServer
     params = {}
     @app = AppRoutes.new(params)
     application(params)
+    @rscript = RScript.new()
 
     @content_type = 'text/html'
 
@@ -53,7 +54,6 @@ class RScriptServer
 
         jobs = "//job:" + job
         url = "%s%s.rsf" % [@url_base, package] 
-
         run(url, jobs, params)
       end
 
@@ -63,7 +63,6 @@ class RScriptServer
         raw_args = params[:splat]
         args = raw_args.join.split('/')[1..-1]
         url = "%s%s.rsf" % [@url_base, package] 
-
         run(url, jobs, params, args)
       end
 
@@ -71,7 +70,6 @@ class RScriptServer
 
         url = "%s%s.rsf" % [@url_base, package]
         @content_type = 'text/plain'
-        puts 'url : ' + url
         open(url, "UserAgent" => 'RscriptServer').read
       end
 
@@ -92,21 +90,17 @@ class RScriptServer
     @app.get(arg, &block)
   end
 
-  def run_rcscript(rsf_url, jobs, arg='')
-    ajobs = jobs.split(/\s/)
-    args = [rsf_url, ajobs, arg].flatten
-    rs = RScript.new()
-    rs.run(args)
+  def run_rcscript(rsf_url, jobs, raw_args=[])
+    @rscript.read([rsf_url, jobs.split(/\s/), raw_args].flatten)
   end
 
-  def run(url, jobs, params={}, qargs=[])
+  def run(url, jobs, *qargs)
     result, args = run_rcscript(url, jobs, qargs)
-
+    
     begin
-      eval(result)
+      eval result
     rescue
       "rws error: " + ($!).to_s
     end
   end
-
 end

metadata

@@ -2,7 +2,7 @@
 name: rscript-server
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: []