rack-rscript 1.2.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d065f87d5e3da283e01c8c83906b1ff8c47b83bcb988303ca74c1992b18c6f5
-  data.tar.gz: 85232d65a5635ebd2f7f3bfcfc18f3e1dbc8aa0e601feacc1a91506a577894a8
+  metadata.gz: 9179db367dd0bf801e2734f5a3bd9ca3000105a7ee5b1340462fc61f8bda56f6
+  data.tar.gz: e5a0cb3510707ca6090521f9114f9875fa5657e144d6822b14a1ead00156f66a
 SHA512:
-  metadata.gz: e537f297872d82494924488c6519a120d00a621057801b118338235c088d5eb1ee50d6d06dc4d9ea3abc2a94d3bcd3c072e1de4c55685913a2e1cb59acf94c3d
-  data.tar.gz: 6b466d9f51bfeb33915d5462caf05a4d048cd1c4ca0fa384056eee13ad301ab400c4f8390c36cb536ce865c5432504d94887850ebbee48851531a14519969507
+  metadata.gz: 5150189b578838c95947a8dd5f2d7934f97524a805330d0c5ba1fdd2ae6f49a59da2dc653022a8c339b8393edeb9cd7a8b3446342a8f1429e484a6ecbdf350ea
+  data.tar.gz: c4faabb77d7806075a732ceba3d8a7d7aa0984fd4a05fbc68beaaabd0440d6a08f341ce9ca62425a714663ee4f7869716ee0a8f7d67c0da2f05a381030ef134b

data/lib/rack-rscript.rb

@@ -13,6 +13,8 @@ require 'rscript'
 require 'app-routes'
 require 'uri'
 require 'polyrex-links'
+require 'nthrut'
+require 'rxfreadwrite'
 
 
 class Redirect
@@ -26,12 +28,9 @@ end
 class RackRscriptError < Exception
 end
 
-
-
-
 class RackRscript
   include AppRoutes
-  include RXFHelperModule
+  include RXFReadWriteModule
   using ColouredText
 
   attr_reader :req, :rsc
@@ -42,14 +41,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)
 
@@ -58,7 +58,7 @@ class RackRscript
 
     if pxlinks then
 
-      src, _ = RXFHelper.read(pxlinks)
+      src, _ = RXFReader.read(pxlinks)
 
       if src =~ /^<\?/ then
 
@@ -88,7 +88,7 @@ class RackRscript
 
     @root, @static = root, static
     @initialized = {}
-#=end
+
   end
 
   def call(env, testmode: false)
@@ -190,7 +190,6 @@ class RackRscript
         @initialized[url] = true
       end
 
-
       r = eval result
 
       return r
@@ -282,7 +281,7 @@ class RackRscript
 
       begin
 
-        [RXFHelper.read(url).first,'text/plain']
+        [RXFReader.read(url).first,'text/plain']
 
       rescue
 
@@ -297,7 +296,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
@@ -312,7 +311,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
 
@@ -342,30 +341,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.3
+  version: 1.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   uQ8ts8x2DfuJYY/PmLbqwXkzMzb1EgnUBWZ3mZCdlL0UBst5ypPAFTn1b2qRUC92
   UtKkOrrEmCXrBnFtpv6a1ULk
   -----END CERTIFICATE-----
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -81,22 +81,42 @@ dependencies:
   name: rscript
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '5.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -121,42 +141,42 @@ dependencies:
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rexslt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rsc
   requirement: !ruby/object:Gem::Requirement
@@ -183,20 +203,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: nthrut
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.1.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -223,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.