rack-rscript 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8f81937a9057df995fed0866db887efb7d3b51821c94fd8981be81443fc0fb
-  data.tar.gz: 4145e73c58a2ae1de7e636b576e33a51ac08a021b631e54aef864bc8e1753352
+  metadata.gz: 4cc6d60f509c07b94de63018f88797d0dd775f10fe9226fb158dc3c09c5d4638
+  data.tar.gz: 1f39470e360019d57bc7c9cc85f07b55dc35fd4df4b3512ac2fda7ab838d385d
 SHA512:
-  metadata.gz: b0775bf1401dc6bd0cb792065b9db9347254693e50934dd8ebe7c960692d4153935ebecb671d930994bb521fb2b194f76c2865c7dd498b0c7149fa283b9e9904
-  data.tar.gz: ca86b8dcc16acf51140b9e8ad375df2cb1949a35ef83ce871c62aa7b22dc5af6851f8e34c48956a0fda564c87f20f117751bad799ca64ca82889bcbb59faa25f
+  metadata.gz: b233ab991b9dfea67758660aea524a29342ca1b848d623b75bc6326d039bc93e4e7e2e07e02db6dac64149c55c539293b439f57e312d5001e063e03f27f2b992
+  data.tar.gz: 250e3ab7377d31bd912886a267d099d33dcdd5011c18ffc1f845d589ad205d55b478590b63189e652245d82f533ed687b79a453e447a85d50fd6ce30b9d743b8

data/lib/rack-rscript.rb

@@ -235,13 +235,14 @@ class RackRscript
       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)
+    get '/:dir/do/:package/:job' do |dir, package, job|
+      run_job(("%s%s/%s.rsf" % [@url_base, dir, 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)
+    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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   uQ8ts8x2DfuJYY/PmLbqwXkzMzb1EgnUBWZ3mZCdlL0UBst5ypPAFTn1b2qRUC92
   UtKkOrrEmCXrBnFtpv6a1ULk
   -----END CERTIFICATE-----
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack