rack-rscript 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8f81937a9057df995fed0866db887efb7d3b51821c94fd8981be81443fc0fb
-  data.tar.gz: 4145e73c58a2ae1de7e636b576e33a51ac08a021b631e54aef864bc8e1753352
+  metadata.gz: 35d6d0eead7c09e461f0a012e4bbde41a6d0caed9407cb5c3084f296cee53109
+  data.tar.gz: de258189650cfcce899fe6595a3a7d25a98a1ff8d39faf72cd7fc7c79219e143
 SHA512:
-  metadata.gz: b0775bf1401dc6bd0cb792065b9db9347254693e50934dd8ebe7c960692d4153935ebecb671d930994bb521fb2b194f76c2865c7dd498b0c7149fa283b9e9904
-  data.tar.gz: ca86b8dcc16acf51140b9e8ad375df2cb1949a35ef83ce871c62aa7b22dc5af6851f8e34c48956a0fda564c87f20f117751bad799ca64ca82889bcbb59faa25f
+  metadata.gz: 852ddfd534c199308c7973544a918d6cecbbfaeac935739b952e57551765f8f739fac509991b603f9151f9d5df27e59a62dccf93afd7b92cc872399d14e52c24
+  data.tar.gz: 9f1d6a104adbfa437ffe5aff658e9c16cff42fd9f499e3d036fa3cb75de5ed69d2393b428a80dc55e2432c4599e6901df95384dbafe487dab9be7b1d9c1ac6cf

data/lib/rack-rscript.rb

@@ -13,6 +13,7 @@ require 'rscript'
 require 'app-routes'
 require 'uri'
 require 'polyrex-links'
+require 'nthrut'
 
 
 class Redirect
@@ -42,14 +43,15 @@ class RackRscript
                  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
+    puts 'pkg_Src: ' + pkg_src.inspect if @debug
 
     @params = {}
 
     @templates = {}
 
+    @log.debug 'pkg_src: ' + pkg_src.inspect if @log
     @rscript = RScriptRW.new log: log, pkg_src: pkg_src, cache: cache, debug: true
     @render = NThrut.new(self)
 
@@ -88,7 +90,7 @@ class RackRscript
 
     @root, @static = root, static
     @initialized = {}
-#=end
+
   end
 
   def call(env, testmode: false)
@@ -190,7 +192,6 @@ class RackRscript
         @initialized[url] = true
       end
 
-
       r = eval result
 
       return r
@@ -235,19 +236,24 @@ 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|
       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]
@@ -260,6 +266,12 @@ 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']
@@ -286,7 +298,7 @@ class RackRscript
       FileX.exists? @url_base
       filepath = @url_base
 
-      [Dir.glob(filepath + '/*.rsf').map{|x| x[/([^\/]+)\.rsf$/,1]}.to_json,\
+      [DirX.glob(filepath + '/*.rsf').map{|x| x[/([^\/]+)\.rsf$/,1]}.to_json,\
                                                             'application/json']
 
     end
@@ -301,7 +313,7 @@ class RackRscript
 
           path = raw_path
           puts 'path: ' + path.inspect if @debug
-          filepath = File.join(@app_root, @root, path )
+          filepath = File.join(@root, path )
 
         else
 
@@ -331,30 +343,20 @@ class RackRscript
         end
 
       end
+
     end
 
     get /^\/$/ do
 
       if @root.length > 0 then
         file = File.join(@root, 'index.html')
-        File.read file
+        FileX.read file
       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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 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: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -197,6 +197,26 @@ dependencies:
     - - ">="
       - !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.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 
 email: digital.robertson@gmail.com
 executables: []