rack-rscript 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7d34cb833bf0422cdcde6fbd6ca2af9f4c6dbb5588d83cb72a4ff53cb3ad938
-  data.tar.gz: 4e20d1dd5709d4fbbf3bf05c6696947a0474b4c5047512cd41ca8a67181d66e4
+  metadata.gz: be378f63ca9f58403060beb22da0eda891f9f1f3d4472340a4062c4ea5a97cf0
+  data.tar.gz: 9f9fa92fd555a7c3e0ef87106d1e2daf174476ed5e46556cba62df9811d967d4
 SHA512:
-  metadata.gz: f1ac22e48c0333b4a1892dee3d7885e14bf7aa5f8b5f8816f31a3f94718ebcc9e92f0f9faaa089f6baa781a86cf34ebeebd967d54531e444d26dd45eec9a4bdb
-  data.tar.gz: 3b0620c345d7933bfb9bd9b0bd5f2e176e63925a6e33c1146de5939aa99bee0859d3b5a6912100857378d74d20b78f9afb1f4b9e27b2cac1315a29b9df1c34d9
+  metadata.gz: 9fc83c3c44f23cbcedf53d0d71092105b8fbb4e90f4f9149c84ad0208fa11b3bb96f1ee5d7ebabc0cd60fa3bfa290d746bee90d195eec559a70002629ed48ea8
+  data.tar.gz: 8c850d980a395a8084f5febbf43374702cb6e42330c16a0d0061b3b8111ead777e9b167e41d100ef9b3e659953909b166e007cad7445ca5727d43a90000692c2

data/lib/rack-rscript.rb

@@ -14,6 +14,7 @@ require 'app-routes'
 require 'uri'
 require 'polyrex-links'
 require 'nthrut'
+require 'rxfreadwrite'
 
 
 class Redirect
@@ -32,7 +33,7 @@ end
 
 class RackRscript
   include AppRoutes
-  include RXFHelperModule
+  include RXFReadWriteModule
   using ColouredText
 
   attr_reader :req, :rsc
@@ -43,14 +44,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)
 
@@ -59,7 +61,7 @@ class RackRscript
 
     if pxlinks then
 
-      src, _ = RXFHelper.read(pxlinks)
+      src, _ = RXFReader.read(pxlinks)
 
       if src =~ /^<\?/ then
 
@@ -89,7 +91,7 @@ class RackRscript
 
     @root, @static = root, static
     @initialized = {}
-#=end
+
   end
 
   def call(env, testmode: false)
@@ -191,7 +193,6 @@ class RackRscript
         @initialized[url] = true
       end
 
-
       r = eval result
 
       return r
@@ -283,7 +284,7 @@ class RackRscript
 
       begin
 
-        [RXFHelper.read(url).first,'text/plain']
+        [RXFReader.read(url).first,'text/plain']
 
       rescue
 
@@ -298,7 +299,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 +314,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 +344,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)
@@ -428,6 +419,17 @@ class RackRscript
       proc ||= passthru_proc
       content, content_type = proc.call(content, content_type)
 
+      if content_type.is_a? Integer then
+
+        status_code = content_type.to_s
+        httpcodefile = File.join(@root, status_code + '.html')
+        if FileX.exists? httpcodefile then
+          content = FileX.read(httpcodefile)
+        else
+          content_type = 'text/plain'
+        end
+      end
+
       [status_code, {"Content-Type" => content_type}, [content]]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.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-05-02 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,102 +141,102 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        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.4.5
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: polyrex-links
   requirement: !ruby/object:Gem::Requirement
     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.4.3
+        version: 0.5.0
 - !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'
+    - - ">="
+      - !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.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -243,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.