rack-rscript 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbd3eb663817e716b9659b6d9f363508eb0e4e4a348d1310d9fe9958eeb38bee
-  data.tar.gz: 886403ab31bc13ea31a522fb7aa4617b2e950f1c210f6298af70dbcc81fdbbf6
+  metadata.gz: '0929ad598b28b90a80b39b3d406e7b3c3d054ef8e8009740272e0c4efa871a0f'
+  data.tar.gz: 4d61e887c6c4c1d1630f282beec390f4f6cb2e7489bd94d6ffabe0d1e7afe623
 SHA512:
-  metadata.gz: dadc9a749503aa9c456aa00ef013004e3f8a941aee9d4e9e31bfa153df474817b1b503cd06f573671c8a689b7aa2487a0725ccdfaa36e0aab68ac25637df2939
-  data.tar.gz: 8ec1bf779f2f2367c6769f3bc1811f02a4f09f01061834bca853bbe9366e8a99499193a343f009526c4461e4cc17b28538f3fcf8b04789228bb8dde987625551
+  metadata.gz: 206d6635be3d06be5c51a3d8ca93e15d2dea9cbcd3c52b1f62ce3600a4e23be54f93559384a47381a1c208ba051b35f01a2f3b75d3f16b965d6f270bf259ebec
+  data.tar.gz: 4c05d931033a0c8b8f6fa45a3662c7aa59a73a78f470100eabba4ef00e5b5edfb284c965879a571a6ff64c8619ee9e29876a662dd8e12dcaa45727883dc317b4

data/lib/rack-rscript.rb

@@ -28,11 +28,11 @@ end
 
 class RackRscript
   include AppRoutes
-
-
+  include RXFHelperModule
+  
   def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: 'rse', 
                  rsc_package_src: nil, pxlinks: nil, debug: false,
-                 root: 'www', static: [])
+                 root: 'www', static: {})
 
     @log, @debug, @static = log, debug, static
     
@@ -215,7 +215,7 @@ class RackRscript
 
     get '/ls' do
        
-      File.exists? @url_base
+      FileX.exists? @url_base
       filepath = @url_base
        
       [Dir.glob(filepath + '/*.rsf').map{|x| x[/([^\/]+)\.rsf$/,1]}.to_json,\
@@ -225,25 +225,39 @@ class RackRscript
     
     if @static.any? then
         
-      get /^(\/(?:#{@static.join('|')}).*)/ do |path|
+      get /^(\/(?:#{@static.keys.join('|')}).*)/ do |raw_path|
+
+        _, file, tailpath = raw_path.split('/',3)
+        
+        filepath = if @static[file].empty? then
+        
+          path = raw_path
+          puts 'path: ' + path.inspect if @debug
+          filepath = File.join(@app_root, @root, path )          
+          
+        else
+          
+          File.join(@static[file], tailpath)  
+          
+        end
+
+        @log.debug 'RackRscript/default_routes/filepath: ' + filepath.inspect if @log        
 
-        puts 'path: ' + path.inspect if @debug
-        filepath = File.join(@app_root, @root, path )
 
         if @log then
           @log.info 'DandelionS1/default_routes: ' + 
               "root: %s path: %s" % [@root, path]
         end
 
-        if path.length < 1 or path[-1] == '/' then
-          path += 'index.html' 
-          File.read filepath
-        elsif File.directory? filepath then
-          Redirect.new (path + '/') 
-        elsif File.exists? filepath then
+        if filepath.length < 1 or filepath[-1] == '/' then
+          filepath += 'index.html' 
+          FileX.read filepath
+        elsif FileX.directory? filepath then
+          Redirect.new (filepath + '/') 
+        elsif FileX.exists? filepath then
 
           content_type = @filetype[filepath[/\w+$/].to_sym]
-          [File.read(filepath), content_type || 'text/plain']
+          [FileX.read(filepath), content_type || 'text/plain']
         else
           'oops, file ' + filepath + ' not found'
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   lDqRilVLi+NZf/R9vR/vaL53GOmDC+VoywL5frfWXVSK1Zs1fF7RAMZDJeYF0A8W
   arbgkVprfDCrZHsF1ZnCIvNO
   -----END CERTIFICATE-----
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -46,7 +46,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
@@ -83,20 +83,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.2
 - !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.8
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -116,27 +116,27 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.11
+        version: 0.6.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -176,27 +176,27 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.11
+        version: 0.6.13
 - !ruby/object:Gem::Dependency
   name: rsc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: polyrex-links
   requirement: !ruby/object:Gem::Requirement