rack-rscript 1.1.7 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdeae576d55f3e549ed4a46a656c181e3b5c244a6c9cd771ff0cf533b7f756ee
-  data.tar.gz: 53a09962db6f0e4400d383e8ee8c1ccb8d7d70f916393437a35d9eeead75e084
+  metadata.gz: eb8f81937a9057df995fed0866db887efb7d3b51821c94fd8981be81443fc0fb
+  data.tar.gz: 4145e73c58a2ae1de7e636b576e33a51ac08a021b631e54aef864bc8e1753352
 SHA512:
-  metadata.gz: a29f4763ddd17c544d189b9c53e61a3361fdb6d08a65691ea46dec1b616a9d9e8395d9f72ab5e75d4239d941b884740c7d6f5287b46e0cdda5e442796354bb27
-  data.tar.gz: 23f13c255ead42a11644a8dd74a389920f84423b999e5f9d3a66e726ac56b71f8e4711fd08bdd8b024f7057a7e0b5b572556b5c03050ab3f9b5bf4945852265c
+  metadata.gz: b0775bf1401dc6bd0cb792065b9db9347254693e50934dd8ebe7c960692d4153935ebecb671d930994bb521fb2b194f76c2865c7dd498b0c7149fa283b9e9904
+  data.tar.gz: ca86b8dcc16acf51140b9e8ad375df2cb1949a35ef83ce871c62aa7b22dc5af6851f8e34c48956a0fda564c87f20f117751bad799ca64ca82889bcbb59faa25f

data/lib/rack-rscript.rb

@@ -17,7 +17,7 @@ require 'polyrex-links'
 
 class Redirect
   attr_reader :to_url
-  
+
   def initialize(url)
     @to_url = url
   end
@@ -33,232 +33,295 @@ class RackRscript
   include AppRoutes
   include RXFHelperModule
   using ColouredText
-  
-  def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: nil, 
+
+  attr_reader :req, :rsc
+
+
+  def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: nil,
+                 rsc: {host: rsc_host, port: '61000'},
                  pxlinks: nil, debug: false, root: '', static: {})
 
     @log, @debug, @static = log, debug, static
-    
+#=begin
     puts '@app_root: ' + @app_root.inspect if @debug
     puts 'root: ' + root.inspect if @debug
-    
+
     @params = {}
-    
+
     @templates = {}
-    
+
     @rscript = RScriptRW.new log: log, pkg_src: pkg_src, cache: cache, debug: true
-    
+    @render = NThrut.new(self)
+
     @url_base = pkg_src # web server serving the RSF files
-    @url_base += '/' unless @url_base[-1] == '/'    
-    
+    @url_base += '/' unless @url_base[-1] == '/'
+
     if pxlinks then
-      
+
       src, _ = RXFHelper.read(pxlinks)
-      
+
       if src =~ /^<\?/ then
-        
+
         @pxlinks = PolyrexLinks.new src
-        
+
       else
-        
+
         @pxlinks = PolyrexLinks.new
         @pxlinks.parse pxlinks
-        
-      end      
-      
+
+      end
+
     end
 
     super() # required for app-routes initialize method to exectue
-    default_routes(@env, @params)    
-    
+    default_routes(@env, @params || {})
+
     @rsc = nil
 
-    @rsc = RSC.new rsc_host if rsc_host
-    
+    if rsc[:host] and rsc[:host].length > 0 then
+      @rsc = RSC.new(rsc[:host], port: rsc[:port])
+    end
+
     @filetype = {xml: 'application/xml', html: 'text/html', png: 'image/png',
              jpg: 'image/jpeg', txt: 'text/plain', css: 'text/css',
-             xsl: 'application/xml', svg: 'image/svg+xml'}    
-    
-    @root, @static = root, static
+             xsl: 'application/xml', svg: 'image/svg+xml'}
 
+    @root, @static = root, static
+    @initialized = {}
+#=end
   end
 
-  def call(env)
-    
+  def call(env, testmode: false)
+
+
     @env = env
-    raw_request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
+    raw_request = env['REQUEST_URI'][/\/\/[^\/]+(.*)/,1]
+    #raw_request = env['REQUEST_PATH']
 
     @log.info 'RackRscript/call: ' + env.inspect if @log
-    @req = Rack::Request.new(env)
 
-    @req_params = @req.params
+    if testmode == false then
+
+      @req = Rack::Request.new(env)
+      @req_params = @req.params
+
+    end
+
     default_routes(env,@params)
-    
+
     request = if @pxlinks then
       found = @pxlinks.locate(raw_request)
       found ? found.join : raw_request
     else
       raw_request
     end
-    
+
+    @log.info 'RackRscript/call/request: ' + request.inspect if @log
+#=begin
+    puts 'request: ' + request.inspect if @debug
     run_request(request)
+#=end
+#    [200, {"Content-Type" => "text/plain"}, [env.inspect]]
 	end
 
   def clear_cache()
     @rscript.reset
   end
 
-  def run_job(url, jobs, params={}, type=:get, *qargs)
+  def run_job(url, job, params={}, type=:get, *qargs)
+
+    puts 'inside run_job' if @debug
+    @log.debug 'RackRscript/run_job/params: ' + params.inspect if @log
+    @log.debug 'RackRscript/run_job/qargs: ' + qargs.inspect if @log
 
     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  
-    
+    end
+
     if @params[:splat] and @params[:splat].length > 0 then
-      h = @params[:splat].first[1..-1].split('&').inject({}) do |r,x| 
+      h = @params[:splat].first[1..-1].split('&').inject({}) do |r,x|
         k, v = x.split('=')
         v ? r.merge(k[/\w+$/].to_sym => Rack::Utils.unescape(v)) : r
       end
       @params.merge! h
     end
-    
-    @params.merge! @req.params
+
+    @params.merge! @req.params if @req
     @rscript.type = type
-    result, args = @rscript.read([url, jobs.split(/\s/), \
+
+    if not @rscript.jobs(url).include?(job.to_sym) then
+
+      if @rscript.jobs(url).include?(:job_missing) then
+        job = 'job_missing'
+      else
+        [404, 'job not found']
+      end
+
+    end
+
+    result, args = @rscript.read([url, '//job:' + job, \
       qargs].flatten)
 
     rws = self
-    rsc = @rsc if @rsc    
+    rsc = @rsc if @rsc
     req = @req if @req
-    
+
     begin
+
+      if @debug then
+        puts @rscript.jobs(url).inspect
+        puts 'job: ' + job.inspect
+        puts 'url: ' + url.inspect
+        puts '@initialized: ' + @initialized.inspect
+        bflag = @rscript.jobs(url).include?(:initialize) and \
+            !@initialized[url] and job != 'initialize'
+        puts 'bflag: ' + bflag.inspect
+      end
+
+      if @rscript.jobs(url).include?(:initialize) and
+          !@initialized[url]  and job != 'initialize' then
+        puts 'before run initialize' if @debug
+        r2 = @rscript.read([url, '//job:initialize'])
+        puts 'r2: ' + r2.inspect if @debug
+        eval r2.join
+        @initialized[url] = true
+      end
+
+
       r = eval result
+
       return r
 
-    rescue Exception => e  
-      
+    rescue Exception => e
+
       @params = {}
-      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")      
+      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")
       raise RackRscriptError, err_label
 
       @log.debug 'RackRscript/run_job/error: ' + err_label if @log
     end
-    
+
   end
 
-  
+
   def redirect(url)
     Redirect.new url
   end
-  
+
   # jr 140616 not yet used and still needs to be tested
   def transform(xsl, xml)
     Rexslt.new(xsl, xml).to_s
   end
 
-  def haml(name,options={})    
-    render name, :haml, options
-  end            
-            
+  def haml(name,options={})
+    @render.haml name, options
+  end
+
   def slim(name,options={})
-    render name, :slim, options
-  end    
-  
+    @render.slim name, options
+  end
+
   protected
 
   def default_routes(env, params)
 
+    @log.info 'RackRscript/default_routes: ' + params.inspect if @log
 
     get '/do/:package/:job' do |package,job|
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params)  
-    end    
+      @log.info 'RackRscript/route/do/package/job: ' + [package, job].inspect if @log
+      run_job("%s%s.rsf" % [@url_base, package], job, params)
+    end
 
-    get /\/(.*)\/do\/(\w+)\/(\w+)/ do |d, package,job|
-      run_job(("%s%s/%s.rsf" % [@url_base, d, package]), 
-              "//job:" + job, params) 
-    end    
+    get /\/(.*)\/do\/(\w+)\/(\w+)$/ do |d, package,job|
+      run_job(("%s%s/%s.rsf" % [@url_base, d, package]), job, params)
+    end
+
+    get /\/(.*)\/do\/(\w+)\/(\w+)\/(.*)/ do |d, package, job, raw_args|
+      args = raw_args.split('/')
+      run_job(("%s%s/%s.rsf" % [@url_base, d, package]), job, params, :get, args)
+    end
 
     post '/do/:package/:job' do |package,job|
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, :post)  
+      run_job("%s%s.rsf" % [@url_base, package], job, params, :post)
     end
-    
+
     get '/do/:package/:job/*' do |package, job|
       raw_args = params[:splat]
       args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, :get, args)
+      run_job("%s%s.rsf" % [@url_base, package], job, params, :get, args)
     end
 
     post '/do/:package/:job/*' do |package, job|
       raw_args = params[:splat]
       args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, :post, args)
+      run_job("%s%s.rsf" % [@url_base, package], job, params, :post, args)
     end
 
     get '/source/:package/:job' do |package,job|
       url = "%s%s.rsf" % [@url_base, package]
-      [@rscript.read([url, '//job:' + job]).first, 'text/plain']
-    end    
+      [@rscript.read([url, job]).first, 'text/plain']
+    end
 
     get '/source/:package' do |package,job|
-       
+
       url = "%s%s.rsf" % [@url_base, package]
 
       begin
-        
+
         [RXFHelper.read(url).first,'text/plain']
 
       rescue
-        
+
         ['url: ' + url + '; ' + ($!).inspect + \
           'couldn\'t find that package', 'text/plain']
       end
 
-    end    
+    end
 
     get '/ls' do
-       
+
       FileX.exists? @url_base
       filepath = @url_base
-       
+
       [Dir.glob(filepath + '/*.rsf').map{|x| x[/([^\/]+)\.rsf$/,1]}.to_json,\
                                                             'application/json']
 
-    end    
-    
+    end
+
     if @static.any? then
-        
+
       get /^(\/(?:#{@static.keys.join('|')}).*)/ do |raw_path|
 
         _, file, tailpath = raw_path.split('/',3)
-        
+
         filepath = if @static[file].empty? then
-        
+
           path = raw_path
           puts 'path: ' + path.inspect if @debug
-          filepath = File.join(@app_root, @root, path )          
-          
+          filepath = File.join(@app_root, @root, path )
+
         else
-          
-          File.join(@static[file], tailpath)  
-          
+
+          File.join(@static[file], tailpath)
+
         end
 
-        @log.debug 'RackRscript/default_routes/filepath: ' + filepath.inspect if @log        
+        @log.debug 'RackRscript/default_routes/filepath: ' + filepath.inspect if @log
 
 
         if @log then
-          @log.info 'DandelionS1/default_routes: ' + 
+          @log.info 'DandelionS1/default_routes: ' +
               "root: %s path: %s" % [@root, path]
         end
 
         if filepath.length < 1 or filepath[-1] == '/' then
-          filepath += 'index.html' 
+          filepath += 'index.html'
           FileX.read filepath
         elsif FileX.directory? filepath then
-          Redirect.new (filepath + '/') 
+          Redirect.new (filepath + '/')
         elsif FileX.exists? filepath then
 
           content_type = @filetype[filepath[/\w+$/].to_sym]
@@ -278,25 +341,39 @@ class RackRscript
       else
         Time.now.inspect
       end
-      
+
+    end
+
+    # file exists?
+    a = Dir.glob( File.join(@root.to_s, '*')).select do |x|
+      File::ftype(x) == 'directory'
+    end
+
+    get /^\/#{a.join('|')}/ do
+
+    'found' + a.inspect
+
     end
 
   end
-  
+
   def run_request(request)
-    
+
     #@log.debug 'inside run_request: ' + request.inspect if @log
     #@log.debug 'inside run_request @env: ' + @env.inspect if @log
     method_type = @env ? @env['REQUEST_METHOD'] : 'GET'
-    content, content_type, status_code = run_route(request, method_type)    
+    content, content_type, status_code = run_route(request, method_type)
+    @log.info 'RackRscript/run_request/content: ' + content.inspect if @log
+    #puts 'content: ' + content.inspect if @debug
+
     #@log.debug 'inside run_request' if @log
     if content.is_a? Redirect then
-      
+
       redirectx = content
       res = Rack::Response.new
       res.redirect(redirectx.to_url)
-      res.finish      
-      
+      res.finish
+
     else
 
       e = $!
@@ -305,18 +382,18 @@ class RackRscript
         content, status_code = e, 500
         @log.debug 'RackRscript/call/error: ' + e if @log
       elsif content.nil? then
-        content, status_code  = "404: page not found", 404             
-      end      
+        content, status_code  = "404: page not found", 404
+      end
 
-      tilt_proc = lambda do |s, content_type| 
+      tilt_proc = lambda do |s, content_type|
         type = content_type[/[^\/]+$/]
         s = [s,{}] unless s.is_a? Array
         content, options = s
         [Tilt[type].new() {|x| content}.render(self, options), 'text/html']
       end
-      
+
       passthru_proc = lambda{|c, ct| [c,ct]}
-                                          
+
       ct_list = {
         'text/html' => passthru_proc,
         'text/haml' => tilt_proc,
@@ -330,58 +407,26 @@ class RackRscript
         'application/json' => passthru_proc,
         'image/png' => passthru_proc,
         'image/jpeg' => passthru_proc,
-        'image/svg+xml' => passthru_proc      
+        'image/svg+xml' => passthru_proc
       }
-      
+
       content_type ||= 'text/html'
-      status_code ||= 200                  
+      status_code ||= 200
       proc = ct_list[content_type]
       proc ||= passthru_proc
-      content, content_type = proc.call(content, content_type)      
-      
+      content, content_type = proc.call(content, content_type)
+
       [status_code, {"Content-Type" => content_type}, [content]]
-    end    
-    
+    end
+
   end
-  
+
   alias jumpto run_request
 
   private
 
-  def render(name, type, opt={})
-    
-    options = {locals: {}}.merge!(opt)
-    locals = options.delete :locals
-    
-    unless @templates[:layout] then
-      template(:layout, type) { File.read('views/layout.' + type.to_s) }
-    end
-    
-    layout = Tilt[type.to_s].new(options) {|x| @templates[:layout][:content]}    
-
-    unless @templates[name] then
-      template(name, type) { File.read("views/%s.%s" % [name.to_s, type.to_s])}
-    end    
-
-    template = Tilt[type.to_s].new(options) {|x| @templates[name][:content]}
-    layout.render{ template.render(self, locals)}
-  end            
-  
   def template(name, type=nil, &blk)
-    @templates.merge!({name => {content: blk.call, type: type}})
-    @templates[name]
-  end                  
-
-  def tilt(name, options={})
-    
-    options = {locals: {}}.merge!(opt)
-    locals = options.delete :locals
-    layout = Tilt[@templates[:layout][:type].to_s].new(options)\
-        {|x| @templates[:layout][:content]}
-    template = Tilt[@templates[name][:type].to_s].new(options) \
-        {|x| @templates[name][:content]}
-    layout.render{ template.render(self, locals)}
-    
-  end    
-  
+    @render.template name, type, &blk
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMjE2MTc1OTI3WhcN
-  MjAwMjE2MTc1OTI3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC0YIta
-  YodiB6EG0KVDDwfPCN3Hwh/FGtn/BbMQNfCyFBVhO5iMyrwdWeFL9zHnvypbiiT6
-  Ex80D8s9j4iXHKj/RSKPQ0NDZ1Gms2CtrcRqUiA/Lze0mM6igwn9hgo7PZbU5SAO
-  dRZf9g2Xdr5vZasnOO6zn2QyT/KtuU8TamgVzOtoELbNQ5+hwN+rt+gwLenh8vVH
-  reB+hc1Ma8g89OwJCGYp0o9T6adq6tgdtJj5Cu6hJPBABtuzGAeleqsZ8GVkL/sj
-  q7Lxjc9/Mp0l43msIGHJfOuzXVmQwq8KxWj4QCS6c+js2JSWswFho12dNKYb9rjX
-  14Dnx2qdMApKUGP7Y8XQk3dDUDHgGurAbq4EpkgpLuQw1eq2o5XkE0tIG5f0ATEi
-  pSYyMLvFB/V1kNgPsYmVaOhVxT53cl7LrKVwuRBZShUg7PYt30PZ7lwMZx+LrdQ0
-  ksyvqMcObi/caRVBHy200p1xQPfotdSbuRF3L3re1urMuHE7xLQN26nPT8UCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUVppLTAhY
-  p8gQCn2FsLsZ52/KZ6owJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMjI5MTgxNDQyWhcN
+  MjIxMjI5MTgxNDQyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC86yKR
+  KdjeR2YaKGfHPYSq+dF7O6QO+iCllVNfuVLgdZ46E35mBPMRNiXkwu3nnzEcdKnp
+  gN23mnWcl/riMqR6I+aymlqzFuqOeeOEl/A4T/fCcuhGx7DZmOEKJx0a58L/o3/K
+  X8LriVIA2fqKXpXlwcsbH9LuHHCGCXzDrw2sfJOevCkPZmGC+4YmY/Ma77gBiJL3
+  1NAvfEAY2/Mm3SnKC/QR26cWo4ZT6cVqCvd6NcjnRbe2/4MkV+QRzG9bjR/jXv/p
+  d5IimipfEw3rvqzCZqSmqC7ZPXAJhCm3VfwrVr6AaUkOiov0elBBDEU7tN4rpLAd
+  AP/FQSDjA3+ElDiDQFfTgqqepIcoGZqsm+ct/MuHMVQzaBCHs/LQXTNIJDsv5oOq
+  YswOTDTE4j//Du1ySuCyboVDDQjeMNj7Xzr6gmQaelHrcC/Ax18fFVMMQS3CykUP
+  FPPwXgaqhMvO6IigDhif6bxOr9GWkR3wAOAZcdPTJuI69kXsDIppd8wvwBcCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUedc2Phvh
+  fegWTvjwW6u98RQNLiEwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAAml/WLcI8fT+QulD8hoZsWuewuLVwJiv7ghzLxAF
-  RlvLTBDSv2I9R78e8vqy6inLhvAzlkKr3jfJjjRXg7GHVQytWW6E4k2EtTaYMMkt
-  eyfNULcMR/gOjGYYzYNUuw0391bBKpvzyIvdQv0mrgoI99B5rX66s4jg0JBQbgXe
-  mhaLptf1n9HgPbbJjpmRHj6mhbY0mAdUV8VyBfcboOnpQWDVKrRLJPNUUmFD4d/B
-  /SQsoWX60/1wMIk0So3A71ebCrcVBou0Rl/QUOLP3tXqUY6LSjYT9gpOHVLCNuPL
-  QJP3XTf2DGVCTbQsnweemWbEI0LwlViBpZmvxDHmgjb+/pm/nsWnTdnAIoYyTxoc
-  5cO/O0IpbqcI7fY8cu2IktrIF2XwY1ZAewV6Yrxp36JYt131ajbs1/madpsZrFYa
-  lDqRilVLi+NZf/R9vR/vaL53GOmDC+VoywL5frfWXVSK1Zs1fF7RAMZDJeYF0A8W
-  arbgkVprfDCrZHsF1ZnCIvNO
+  BgkqhkiG9w0BAQsFAAOCAYEAT8rbqnsRYicLTmcGmLHEvSAn/KEdyqbSSuuD0Kfr
+  SCVHCqTl53smpdKgBboZH9ZVr946vYtCZ/rtd1pVpEo/ENcWcaNaV4NhK6n/njCX
+  UBZ9Pdy0obZwP8k+nykQdQqDYUqiW/BXo1SB/BdkPOVu5mRYmx7yHuuj2vZpMmxM
+  lv4IN0rEyJXBtkcLQbGdQcRT9/b1/FLPAsuxEX7mFdSQrFufNLGcGzWl/c51a5Xo
+  SI76WH1OLRawRbeI9RS81zY/+Ku4K/plSqzynwuB52HFY4gEHtWlDMjJLdA98Pr8
+  z+AnDPyf+tgyo6PzzxVnEsp0GLrP1zKa4+NKXGXnbtDtPn7zQL3NamT39nPFzHfp
+  7wFc43V/b0NugGvugJlSjM4y4rHww2j0aKMTJDGGJK0e51BLG1Hs3c/SckeGIk3r
+  uQ8ts8x2DfuJYY/PmLbqwXkzMzb1EgnUBWZ3mZCdlL0UBst5ypPAFTn1b2qRUC92
+  UtKkOrrEmCXrBnFtpv6a1ULk
   -----END CERTIFICATE-----
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
@@ -81,22 +81,22 @@ dependencies:
   name: rscript
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -116,69 +116,69 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rexslt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: rexslt
+  name: rsc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.13
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.13
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
-  name: rsc
+  name: polyrex-links
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -197,28 +197,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
-- !ruby/object:Gem::Dependency
-  name: polyrex-links
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -243,7 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.