rack-rscript 0.1.1 → 0.3.1

data/lib/rack_rscript.rb

@@ -0,0 +1,28 @@
+require 'rcscript'
+
+class RackRscript
+  
+  def initialize(url='http://rorbuilder.info/r/heroku-rack/')
+    @@version = '0.3.1'
+    @url_base = url
+  end
+
+  def run_rcscript(rsf_url, jobs, arg='')
+    args = [jobs.map {|x| "//job:" + x}.join("\n"), rsf_url]
+    rs = RScript.new()
+    rs.run(args)
+  end
+
+  def call(env)
+    req = Rack::Request.new(env)
+    package_id, *jobs = req.params['package'], req.params['job']
+    *args = req.params['arg']
+
+    url = "%s%s.rsf" % [@url_base, package_id] 
+    @content_type = "text/html"
+
+    code = run_rcscript(url, jobs, args).first
+    content = eval(code)    
+    [200, {"Content-Type" => @content_type}, [content]]
+  end
+end

metadata

@@ -1,40 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: rack-rscript
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.1
+  version: 0.3.1
 platform: ruby
-authors: 
-- James Robertson
+authors: []
+
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-02-26 00:00:00 +00:00
+date: 2010-01-15 00:00:00 +00:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: app-routes
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rscript
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
+dependencies: []
+
 description: 
 email: 
 executables: []
@@ -44,7 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/rack-rscript.rb
+- lib/rack_rscript.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -55,23 +33,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.
+summary: rack-rscript
 test_files: []
 

data/lib/rack-rscript.rb

@@ -1,86 +0,0 @@
-#!/usr/bin/env ruby
-
-# file: rack-rscript.rb
-
-
-require 'rscript'
-require 'app-routes'
-
-class RackRscript
-  include AppRoutes
-
-  def initialize(raw_opts={})
-    
-    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] == '/'
-    @log = false
-
-    if opts[:logfile].length > 0 then
-      @log = true
-      @logger = Logger.new(opts[:logfile], opts[:logrotate])
-    end
-
-    super() # required for app-routes initialize method to exectue
-    default_routes(@params)
-  end
-
-	def call(env)
-    request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
-
-    log Time.now.to_s + ": " + request
-    content, content_type, status_code = run_route(request)
-    content, status_code  = "404: page not found", 404 if content.nil?
-
-    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        
-  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| 
-        k, v = x.split('=')
-        r.merge(k.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  
-
-      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
-end