rack-rscript 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b513cf10fc9f799000b67f9bca747cd132f117a87e771efd9dffd4abccfd836e
-  data.tar.gz: '089507f8dc242466e97ceeda2ebbd9b6f22e4729bc055a520152c4b41e963369'
+  metadata.gz: bdeae576d55f3e549ed4a46a656c181e3b5c244a6c9cd771ff0cf533b7f756ee
+  data.tar.gz: 53a09962db6f0e4400d383e8ee8c1ccb8d7d70f916393437a35d9eeead75e084
 SHA512:
-  metadata.gz: c9baabf7e1d645efbbf0ea953e5a31abd5452a3b8a2275d2e03c3da27ccd0d8a2269be22819fe0bd3b60c50e9e24d13adc6c5ddb872bda3b776c398e66a3be95
-  data.tar.gz: 6833909c6c7d7bc3e30f08ab0b4b0b4514f33fdfa9344b6e6b11043435729978927c5434b5b59f55745a901374cd42ce77d03be1f5cfca7d40ec153edd007557
+  metadata.gz: a29f4763ddd17c544d189b9c53e61a3361fdb6d08a65691ea46dec1b616a9d9e8395d9f72ab5e75d4239d941b884740c7d6f5287b46e0cdda5e442796354bb27
+  data.tar.gz: 23f13c255ead42a11644a8dd74a389920f84423b999e5f9d3a66e726ac56b71f8e4711fd08bdd8b024f7057a7e0b5b572556b5c03050ab3f9b5bf4945852265c

data/lib/rack-rscript.rb

@@ -26,14 +26,16 @@ end
 class RackRscriptError < Exception
 end
 
+
+
+
 class RackRscript
   include AppRoutes
   include RXFHelperModule
   using ColouredText
   
-  def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: 'rse', 
-                 rsc_package_src: nil, pxlinks: nil, debug: false,
-                 root: '', static: {})
+  def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: nil, 
+                 pxlinks: nil, debug: false, root: '', static: {})
 
     @log, @debug, @static = log, debug, static
     
@@ -44,7 +46,7 @@ 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
     
     @url_base = pkg_src # web server serving the RSF files
     @url_base += '/' unless @url_base[-1] == '/'    
@@ -70,7 +72,8 @@ class RackRscript
     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
     
     @filetype = {xml: 'application/xml', html: 'text/html', png: 'image/png',
              jpg: 'image/jpeg', txt: 'text/plain', css: 'text/css',
@@ -102,10 +105,10 @@ class RackRscript
 	end
 
   def clear_cache()
-    @rrscript.reset
+    @rscript.reset
   end
 
-  def run_job(url, jobs, params={}, *qargs)
+  def run_job(url, jobs, params={}, type=:get, *qargs)
 
     if @params[:splat] then
       @params.each do  |k,v|
@@ -123,7 +126,8 @@ class RackRscript
     end
     
     @params.merge! @req.params
-    result, args = @rrscript.read([url, jobs.split(/\s/), \
+    @rscript.type = type
+    result, args = @rscript.read([url, jobs.split(/\s/), \
       qargs].flatten)
 
     rws = self
@@ -178,24 +182,24 @@ class RackRscript
     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:" + 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, args)
+      run_job("%s%s.rsf" % [@url_base, package], "//job:" + 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, args)
+      run_job("%s%s.rsf" % [@url_base, package], "//job:" + 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:' + job]).first, 'text/plain']
     end    
 
     get '/source/:package' do |package,job|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   lDqRilVLi+NZf/R9vR/vaL53GOmDC+VoywL5frfWXVSK1Zs1fF7RAMZDJeYF0A8W
   arbgkVprfDCrZHsF1ZnCIvNO
   -----END CERTIFICATE-----
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -83,20 +83,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: polyrex-links
   requirement: !ruby/object:Gem::Requirement