rack-rscript 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ab3661aa2c2f191b140e28dbda3805f32a97e6a3eaf6c1f410e30f411d6b6c
-  data.tar.gz: b6d2ba9fd30c7ae71571f69918583c8206cd0d5dbebd89dd796e4f35d44662d0
+  metadata.gz: c7d34cb833bf0422cdcde6fbd6ca2af9f4c6dbb5588d83cb72a4ff53cb3ad938
+  data.tar.gz: 4e20d1dd5709d4fbbf3bf05c6696947a0474b4c5047512cd41ca8a67181d66e4
 SHA512:
-  metadata.gz: 216dc0e7c0e24231bf0e0fbb7d6cd5550cf9bf027a37b860102f909a378c608c78c806f51ab1b170a4b5880d0fc021311cd23d2d42782b56dc200ffa15eacde4
-  data.tar.gz: da45f89a5e37161bf83a9c63cdc8830e69ed949241f004990db59e67e7d21d33d9533932df96de08f5136339d1d61b81589d73fa9814149a0fe20997a93f0845
+  metadata.gz: f1ac22e48c0333b4a1892dee3d7885e14bf7aa5f8b5f8816f31a3f94718ebcc9e92f0f9faaa089f6baa781a86cf34ebeebd967d54531e444d26dd45eec9a4bdb
+  data.tar.gz: 3b0620c345d7933bfb9bd9b0bd5f2e176e63925a6e33c1146de5939aa99bee0859d3b5a6912100857378d74d20b78f9afb1f4b9e27b2cac1315a29b9df1c34d9

data/lib/rack-rscript.rb

@@ -13,11 +13,12 @@ require 'rscript'
 require 'app-routes'
 require 'uri'
 require 'polyrex-links'
+require 'nthrut'
 
 
 class Redirect
   attr_reader :to_url
-  
+
   def initialize(url)
     @to_url = url
   end
@@ -33,56 +34,59 @@ class RackRscript
   include AppRoutes
   include RXFHelperModule
   using ColouredText
-  
+
   attr_reader :req, :rsc
-  
-  
-  def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: nil, 
+
+
+  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    
+#=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 and rsc_host.length > 0
-    
+    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'}    
-    
+             xsl: 'application/xml', svg: 'image/svg+xml'}
+
     @root, @static = root, static
     @initialized = {}
 #=end
@@ -96,28 +100,28 @@ class RackRscript
     #raw_request = env['REQUEST_PATH']
 
     @log.info 'RackRscript/call: ' + env.inspect if @log
-    
+
     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        
+#=begin
     puts 'request: ' + request.inspect if @debug
     run_request(request)
-#=end    
+#=end
 #    [200, {"Content-Type" => "text/plain"}, [env.inspect]]
 	end
 
@@ -130,46 +134,46 @@ class RackRscript
     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 if @req
     @rscript.type = type
-    
+
     if not @rscript.jobs(url).include?(job.to_sym) then
-      
+
       if @rscript.jobs(url).include?(:job_missing) then
-        job = 'job_missing' 
+        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 @rscript.jobs(url).inspect
         puts 'job: ' + job.inspect
         puts 'url: ' + url.inspect
         puts '@initialized: ' + @initialized.inspect
@@ -177,74 +181,79 @@ class RackRscript
             !@initialized[url] and job != 'initialize'
         puts 'bflag: ' + bflag.inspect
       end
-      
-      if @rscript.jobs(url).include?(:initialize) and 
+
+      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'])        
+        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={})        
+  def haml(name,options={})
     @render.haml name, options
-  end            
-            
+  end
+
   def slim(name,options={})
     @render.slim name, options
-  end    
-  
+  end
+
   protected
 
   def default_routes(env, params)
 
     @log.info 'RackRscript/default_routes: ' + params.inspect if @log
-    
+
     get '/do/:package/:job' do |package,job|
       @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, 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      
+      run_job("%s%s.rsf" % [@url_base, package], job, params)
+    end
+
+    get '/:dir/do/:package/:job' do |dir, package, job|
+      run_job(("%s%s/%s.rsf" % [@url_base, dir, package]), job, params)
+    end
+
+    get '/:dir/do/:package/:job/*' do |dir, package, job|
+      raw_args = params[:splat]
+      args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
+      run_job(("%s%s/%s.rsf" % [@url_base, dir, package]), job, params, :get, args)
+    end
 
     post '/do/:package/:job' do |package,job|
-      run_job("%s%s.rsf" % [@url_base, package], job, params, :post)  
+      run_job("%s%s.rsf" % [@url_base, package], job, params, :post)
+    end
+
+    post '/:dir/do/:package/:job' do |dir, package,job|
+      run_job(("%s%s/%s.rsf" % [@url_base, dir, 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]
@@ -257,68 +266,74 @@ class RackRscript
       run_job("%s%s.rsf" % [@url_base, package], job, params, :post, args)
     end
 
+    post '/:dir/do/:package/:job/*' do |package, job|
+      raw_args = params[:splat]
+      args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
+      run_job("%s%s/%s.rsf" % [@url_base, dir, package], job, params, :post, args)
+    end
+
     get '/source/:package/:job' do |package,job|
       url = "%s%s.rsf" % [@url_base, package]
       [@rscript.read([url, job]).first, 'text/plain']
-    end    
+    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]
@@ -338,28 +353,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 = $!
@@ -368,18 +394,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,
@@ -393,26 +419,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 template(name, type=nil, &blk)
     @render.template name, type, &blk
-  end     
-  
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjI4MTA0NTMzWhcN
-  MjEwNjI4MTA0NTMzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC++hKM
-  OkDJ8KaD3zDoCEYnfM3w0zHKKGDhTr5pAWeFG3uSMEDpjSFjpDTNLRQnYXnAlkTQ
-  iqnnkZ3PgKD2DrL3Tebb7i1xxiYDEV8uQJApP51MPd/bgdLka8y1Z/gNx0o5N42Z
-  biScnOGCSwl1XpQHVgO+zhhLoPhsb4rneuOZRrT14OiHb5ERJilqE5DJhhErymQv
-  Cs5NDHjLp39Ui3jpe0j3qdNMWBH49V7tXREIyKaM/vjDQGvaS/NX4jLGw0YVdMCE
-  W8yadDcqRDWkFK7cz+omnIUZHGu6tcJA2oTeL/plSfJneyUXxMAAqarmm9jKWGiE
-  Sa9icmAmueF4fjrPm8wiXcrOwDiCS0nAAOsiXnfrwJq+IKZDdvfiYrbJYqV3jpxO
-  Zc47nGjO3oH85YcaWd0IQqpt+c0CVzRTy3wBK35xDSI9oRh3Io3qZq8YnJxpCTtR
-  f/tFJkOfA97aDaU+n6NflYphEJgQIbNR8g5HH6aYMC1hV9NHBSj9C0+IPL0CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUotFCdsTq
-  oF0+c4sgqZqQGAzOATIwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  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
-  BgkqhkiG9w0BAQsFAAOCAYEAaEAg7AuqvVp/0qFr40orUDsiWgUri6xIAr7HN+Iu
-  EYDxIn873j5HorzAcrhKkfb9dNyJnpraac1Hpn9yqg7hIeW/mU0LIM9wNe4S9yTI
-  IOh0hhqsyeas7UwaZA220Bx23yyxque7E9P+fqn5I4RwtJXn/kDXZHiarKfvFTH1
-  mduzu/04uoC0dYEAL/ASvOr/EMxD+N9/vtoxR4+bj4W8WXozy9ySAlpuKwDuVXmc
-  twljCSdBB5QG11CH/7S+k4JMhN9vx+n4R2tNqouqyE0/Smyn+gXfYHR5jXqOzGFa
-  wmNbJU6Nt9ro9mFunXiNVM3t85KOb7HptOAv7uAu+yNHzDX6iDy43y1wwTN9Ca+0
-  468xA07gVSZnQMLOLNcZE6qcx5MZVkhjTlWVchzBAusC2pb37Ut8jXn+q92nqCw9
-  tilHf4Ok7vnZYPnxQk5PY3q28lYoflnB47YIc0pdkJHI1M3YXL/HxrcZCEIHAU3W
-  aTCBK3Pk2/LQtqaW3yaSg73t
+  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: 2021-01-18 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -181,24 +181,44 @@ dependencies:
   name: polyrex-links
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: nthrut
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []