rack-rscript 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7d34cb833bf0422cdcde6fbd6ca2af9f4c6dbb5588d83cb72a4ff53cb3ad938
-  data.tar.gz: 4e20d1dd5709d4fbbf3bf05c6696947a0474b4c5047512cd41ca8a67181d66e4
+  metadata.gz: 35d6d0eead7c09e461f0a012e4bbde41a6d0caed9407cb5c3084f296cee53109
+  data.tar.gz: de258189650cfcce899fe6595a3a7d25a98a1ff8d39faf72cd7fc7c79219e143
 SHA512:
-  metadata.gz: f1ac22e48c0333b4a1892dee3d7885e14bf7aa5f8b5f8816f31a3f94718ebcc9e92f0f9faaa089f6baa781a86cf34ebeebd967d54531e444d26dd45eec9a4bdb
-  data.tar.gz: 3b0620c345d7933bfb9bd9b0bd5f2e176e63925a6e33c1146de5939aa99bee0859d3b5a6912100857378d74d20b78f9afb1f4b9e27b2cac1315a29b9df1c34d9
+  metadata.gz: 852ddfd534c199308c7973544a918d6cecbbfaeac935739b952e57551765f8f739fac509991b603f9151f9d5df27e59a62dccf93afd7b92cc872399d14e52c24
+  data.tar.gz: 9f1d6a104adbfa437ffe5aff658e9c16cff42fd9f499e3d036fa3cb75de5ed69d2393b428a80dc55e2432c4599e6901df95384dbafe487dab9be7b1d9c1ac6cf

data/lib/rack-rscript.rb

@@ -43,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)
 
@@ -89,7 +90,7 @@ class RackRscript
 
     @root, @static = root, static
     @initialized = {}
-#=end
+
   end
 
   def call(env, testmode: false)
@@ -191,7 +192,6 @@ class RackRscript
         @initialized[url] = true
       end
 
-
       r = eval result
 
       return r
@@ -298,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
@@ -313,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
 
@@ -343,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.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   uQ8ts8x2DfuJYY/PmLbqwXkzMzb1EgnUBWZ3mZCdlL0UBst5ypPAFTn1b2qRUC92
   UtKkOrrEmCXrBnFtpv6a1ULk
   -----END CERTIFICATE-----
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack