rack-rscript 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdeae576d55f3e549ed4a46a656c181e3b5c244a6c9cd771ff0cf533b7f756ee
-  data.tar.gz: 53a09962db6f0e4400d383e8ee8c1ccb8d7d70f916393437a35d9eeead75e084
+  metadata.gz: 2a89919a5c0bc41ed1f8e836aa0476baae386a1b5f4a1dd34fd69b2328584a5b
+  data.tar.gz: bbbbdfaff50bfa3ddc1635f5cdc7d823077105e36357ea4cf78cade5a9d20084
 SHA512:
-  metadata.gz: a29f4763ddd17c544d189b9c53e61a3361fdb6d08a65691ea46dec1b616a9d9e8395d9f72ab5e75d4239d941b884740c7d6f5287b46e0cdda5e442796354bb27
-  data.tar.gz: 23f13c255ead42a11644a8dd74a389920f84423b999e5f9d3a66e726ac56b71f8e4711fd08bdd8b024f7057a7e0b5b572556b5c03050ab3f9b5bf4945852265c
+  metadata.gz: de01da7bd5651a20115cce9f2309018f789bf9bf8754f94b080474bf2722ac7b30fdbf04c9e78e4be54addfa81356f9c3bd7e3b3137a538f3b12d9aeabc12258
+  data.tar.gz: 6d36a96685f10f3518171a0f5f1bc37e2fe42d2c622e0258877a61c8a1042890e7d92a6ca3f2ac5104f5c6a7c86693d1df729b757851f8db3ccb7ee3386c12b7

data/lib/rack-rscript.rb

@@ -34,11 +34,12 @@ class RackRscript
   include RXFHelperModule
   using ColouredText
   
+  
   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
     
@@ -47,6 +48,7 @@ class RackRscript
     @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] == '/'    
@@ -73,20 +75,23 @@ class RackRscript
     
     @rsc = nil
 
-    @rsc = RSC.new rsc_host if rsc_host
+    @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)
-    
+
+
     @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)
@@ -101,7 +106,11 @@ class RackRscript
       raw_request
     end
     
+    @log.info 'RackRscript/call/request: ' + request.inspect if @log
+#=begin        
     run_request(request)
+#=end    
+#    [200, {"Content-Type" => "text/plain"}, [env.inspect]]
 	end
 
   def clear_cache()
@@ -110,6 +119,9 @@ class RackRscript
 
   def run_job(url, jobs, params={}, type=:get, *qargs)
 
+    @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 \
@@ -135,6 +147,13 @@ class RackRscript
     req = @req if @req
     
     begin
+      
+      if @rscript.jobs(url).include? :initialize and 
+          !@initialized[url]  and jobs != 'initialize' then
+        @rscript.run([url, '//job:initialize'])
+        @initialized[url] = true
+      end
+      
       r = eval result
       return r
 
@@ -159,20 +178,22 @@ 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|
+      @log.info 'RackRscript/route/do/package/job: ' + [package, job].inspect if @log
       run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params)  
     end    
 
@@ -289,6 +310,8 @@ 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
+    
     #@log.debug 'inside run_request' if @log
     if content.is_a? Redirect then
       
@@ -348,7 +371,7 @@ class RackRscript
 
   private
 
-  def render(name, type, opt={})
+  def render99(name, type, opt={})
     
     options = {locals: {}}.merge!(opt)
     locals = options.delete :locals
@@ -368,11 +391,15 @@ class RackRscript
   end            
   
   def template(name, type=nil, &blk)
+    @render.template name, type, &blk
+  end   
+  
+  def template99(name, type=nil, &blk)
     @templates.merge!({name => {content: blk.call, type: type}})
     @templates[name]
   end                  
 
-  def tilt(name, options={})
+  def tilt99(name, options={})
     
     options = {locals: {}}.merge!(opt)
     locals = options.delete :locals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 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-03-26 00:00:00.000000000 Z
+date: 2020-06-28 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,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.2.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 4.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        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.3
+        version: 0.4.4
   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.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: polyrex-links
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.