rack-rscript 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0929ad598b28b90a80b39b3d406e7b3c3d054ef8e8009740272e0c4efa871a0f'
-  data.tar.gz: 4d61e887c6c4c1d1630f282beec390f4f6cb2e7489bd94d6ffabe0d1e7afe623
+  metadata.gz: 35ab3661aa2c2f191b140e28dbda3805f32a97e6a3eaf6c1f410e30f411d6b6c
+  data.tar.gz: b6d2ba9fd30c7ae71571f69918583c8206cd0d5dbebd89dd796e4f35d44662d0
 SHA512:
-  metadata.gz: 206d6635be3d06be5c51a3d8ca93e15d2dea9cbcd3c52b1f62ce3600a4e23be54f93559384a47381a1c208ba051b35f01a2f3b75d3f16b965d6f270bf259ebec
-  data.tar.gz: 4c05d931033a0c8b8f6fa45a3662c7aa59a73a78f470100eabba4ef00e5b5edfb284c965879a571a6ff64c8619ee9e29876a662dd8e12dcaa45727883dc317b4
+  metadata.gz: 216dc0e7c0e24231bf0e0fbb7d6cd5550cf9bf027a37b860102f909a378c608c78c806f51ab1b170a4b5880d0fc021311cd23d2d42782b56dc200ffa15eacde4
+  data.tar.gz: da45f89a5e37161bf83a9c63cdc8830e69ed949241f004990db59e67e7d21d33d9533932df96de08f5136339d1d61b81589d73fa9814149a0fe20997a93f0845

data/lib/rack-rscript.rb

@@ -26,16 +26,22 @@ end
 class RackRscriptError < Exception
 end
 
+
+
+
 class RackRscript
   include AppRoutes
   include RXFHelperModule
+  using ColouredText
+  
+  attr_reader :req, :rsc
   
-  def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: 'rse', 
-                 rsc_package_src: nil, pxlinks: nil, debug: false,
-                 root: 'www', static: {})
+  
+  def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: nil, 
+                 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
     
@@ -43,7 +49,8 @@ class RackRscript
     
     @templates = {}
     
-    @rrscript = RScript.new log: log, pkg_src: pkg_src, cache: cache
+    @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] == '/'    
@@ -66,28 +73,37 @@ class RackRscript
     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, rsc_package_src if rsc_package_src
+
+    @rsc = RSC.new rsc_host if rsc_host and rsc_host.length > 0
     
     @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
-
+    @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
@@ -97,15 +113,24 @@ class RackRscript
       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()
-    @rrscript.reset
+    @rscript.reset
   end
 
-  def run_job(url, jobs, params={}, *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 \
@@ -121,8 +146,20 @@ class RackRscript
       @params.merge! h
     end
     
-    @params.merge! @req.params
-    result, args = @rrscript.read([url, jobs.split(/\s/), \
+    @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' 
+      else
+        [404, 'job not found']
+      end
+
+    end
+    
+    result, args = @rscript.read([url, '//job:' + job, \
       qargs].flatten)
 
     rws = self
@@ -130,7 +167,29 @@ class RackRscript
     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  
@@ -154,47 +213,53 @@ class RackRscript
     Rexslt.new(xsl, xml).to_s
   end
 
-  def haml(name,options={})    
-    render name, :haml, options
+  def haml(name,options={})        
+    @render.haml name, options
   end            
             
   def slim(name,options={})
-    render name, :slim, options
+    @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)  
+      @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) 
+    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)  
+      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[1..-1][/.\S*/].split('/')
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
+      args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
+      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[1..-1][/.\S*/].split('/')
-      run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
+      args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
+      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]
-      [@rrscript.read([url, '//job:' + job]).first, 'text/plain']
+      [@rscript.read([url, job]).first, 'text/plain']
     end    
 
     get '/source/:package' do |package,job|
@@ -267,8 +332,13 @@ class RackRscript
 
     get /^\/$/ do
 
-      file = File.join(@root, 'index.html')
-      File.read file
+      if @root.length > 0 then
+        file = File.join(@root, 'index.html')
+        File.read file
+      else
+        Time.now.inspect
+      end
+      
     end
 
   end
@@ -279,6 +349,9 @@ class RackRscript
     #@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)    
+    @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
       
@@ -337,41 +410,9 @@ class RackRscript
   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.5
+  version: 1.2.0
 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
+  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
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAAml/WLcI8fT+QulD8hoZsWuewuLVwJiv7ghzLxAF
-  RlvLTBDSv2I9R78e8vqy6inLhvAzlkKr3jfJjjRXg7GHVQytWW6E4k2EtTaYMMkt
-  eyfNULcMR/gOjGYYzYNUuw0391bBKpvzyIvdQv0mrgoI99B5rX66s4jg0JBQbgXe
-  mhaLptf1n9HgPbbJjpmRHj6mhbY0mAdUV8VyBfcboOnpQWDVKrRLJPNUUmFD4d/B
-  /SQsoWX60/1wMIk0So3A71ebCrcVBou0Rl/QUOLP3tXqUY6LSjYT9gpOHVLCNuPL
-  QJP3XTf2DGVCTbQsnweemWbEI0LwlViBpZmvxDHmgjb+/pm/nsWnTdnAIoYyTxoc
-  5cO/O0IpbqcI7fY8cu2IktrIF2XwY1ZAewV6Yrxp36JYt131ajbs1/madpsZrFYa
-  lDqRilVLi+NZf/R9vR/vaL53GOmDC+VoywL5frfWXVSK1Zs1fF7RAMZDJeYF0A8W
-  arbgkVprfDCrZHsF1ZnCIvNO
+  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
   -----END CERTIFICATE-----
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2021-01-18 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.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.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.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.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,67 +116,47 @@ 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
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: 4.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.1
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rexslt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.13
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.13
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rsc
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +166,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -196,7 +176,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: polyrex-links
   requirement: !ruby/object:Gem::Requirement
@@ -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.