rack-rscript 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9db9fa568d06145a2a371e101192f7f3ba83cf84
-  data.tar.gz: c9f8c35902f09eded70172c9029e50b50d619c0e
+  metadata.gz: 523ccdc7482629668d72db9ae7d19f32489d3c03
+  data.tar.gz: 2af4afa75c948b00471848a332baf8f1ed6d037d
 SHA512:
-  metadata.gz: 5a3b657413de54bb9cc2f009cbb1506a5d18b64aeb66d1c0b70ba9adf0bfbbe164bd5cdb695bd575537b80e23b2e9b40856a22761a7da454762dc20515d1cd4a
-  data.tar.gz: efbd6e4c1cb895e358cd4e58eccd255a4114da8f93125029451ab45d84562274eac41a958efa56ab203c48fd5b6e7324b73ad1faa0089b71cfcda89afb0185c0
+  metadata.gz: a55dc1a1acf4ea09685297d88bf66dce79b30f5b96320d4236ba3a58b7cb15cd923ba1d77a4a3da7514e53d9b444dcaf15442729281134c524db87f3c7e7623e
+  data.tar.gz: ce31ddb9811cce088e7ec76f8734dedf59f1f6270e00a2c7301d643779f58ab72a90627e8f72d6baa95f851a728d18786baa6e6a54ca9e1911c503dbb60aa3e2

data/lib/rack-rscript.rb

@@ -12,6 +12,7 @@ require 'rexslt'
 require 'rscript'
 require 'app-routes'
 require 'uri'
+require 'polyrex-links'
 
 
 class Redirect
@@ -29,8 +30,8 @@ class RackRscript
   include AppRoutes
 
 
-  def initialize(log: nil, pkg_src: '', cache: 5, 
-                 rsc_host: 'rse', rsc_package_src: nil)
+  def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: 'rse', 
+                 rsc_package_src: nil, pxlinks: nil, debug: false)
     
     @params = {}
     @templates = {}
@@ -40,9 +41,24 @@ class RackRscript
     @url_base = pkg_src # web server serving the RSF files
     @url_base += '/' unless @url_base[-1] == '/'
     
-    @log = log
-
-
+    @log, @debug = log, debug
+    
+    if pxlinks then
+      
+      src, _ = RXFHelper.read(pxlinks)
+      
+      if src =~ /^<\?/ then
+        
+        @pxlinks = PolyrexLinks.new src
+        
+      else
+        
+        @pxlinks = PolyrexLinks.new
+        @pxlinks.parse pxlinks
+        
+      end      
+      
+    end
 
     super() # required for app-routes initialize method to exectue
     default_routes(@env, @params)    
@@ -55,13 +71,21 @@ class RackRscript
   def call(env)
     
     @env = env
-    request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
+    raw_request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
 
     @log.info 'RackRscript/call: ' + env.inspect if @log
     req = Rack::Request.new(env)
 
     @req_params = req.params
     default_routes(env,@params)
+    
+    request = if @pxlinks then
+      found = @pxlinks.locate(raw_request)
+      found ? found.join : raw_request
+    else
+      raw_request
+    end
+    
     content, content_type, status_code = run_route(request, env['REQUEST_METHOD'])
 
     if content.is_a? Redirect then
@@ -117,7 +141,7 @@ class RackRscript
       
       [status_code, {"Content-Type" => content_type}, [content]]
     end
-        end
+	end
 
   def clear_cache()
     @rrscript.reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   vvLi4Y0qQy/Uz/kHVXzfeLcG657aNIu8ogA1I3Xnlz0sqlNoDhk5sSBd2BsfkVFS
   sTo/69YTrLx1zw==
   -----END CERTIFICATE-----
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -42,7 +42,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -172,27 +172,47 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: rsc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: polyrex-links
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.10
 description: 
 email: james@jamesrobertson.eu
 executables: []