rack-rscript 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ae444c177f0c9d60fe675075fd1800e9124c81
-  data.tar.gz: e40f6ad9a8580c0d2eaa713d59592edeb2cc7948
+  metadata.gz: 67eaf987c95218ab325c90f6cdc5950a91d83ec4
+  data.tar.gz: b351e24514900fd5f9d9ac6db045e69799af0c75
 SHA512:
-  metadata.gz: 7e09e5713f0e25eefb0b087d8b546b8014615f665ad147b8293fa271c4303f301a1bb84e07f4df8fc3e272d07c3080a2e02c238a8d77904143203188ecfc490f
-  data.tar.gz: 632512b0a99b3a16e7901cbab78026aaa96bc7df7c980b755395384ce7c0c9c0850de07902275b10662b6924ae0c15daa12d82461f7ed913376f8aaa66703aec
+  metadata.gz: 90139ab92d16f29258861fc9cfc11df3126aa4a59d41e511bcb5c9dd5fec15231dde62b287210a213da8452dd50604e4544727cb1772758274093f253c43fb7c
+  data.tar.gz: d220fbc8ee425c9e93bb61176eea4a51b5eb8176e5507e89559ff7df9deece05e90d32beacded05365e7a6bcebb86c253e86eff864802aa9313f9790d30cd67d

data/lib/rack-rscript.rb

@@ -31,17 +31,22 @@ class RackRscript
 
 
   def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: 'rse', 
-                 rsc_package_src: nil, pxlinks: nil, debug: false)
+                 rsc_package_src: nil, pxlinks: nil, debug: false,
+                 root: 'www', static: [])
+
+    @log, @debug, @static = log, debug, static
+    
+    puts '@app_root: ' + @app_root.inspect if @debug
+    puts 'root: ' + root.inspect if @debug
     
     @params = {}
+    
     @templates = {}
     
     @rrscript = RScript.new log: log, pkg_src: pkg_src, cache: cache
     
     @url_base = pkg_src # web server serving the RSF files
-    @url_base += '/' unless @url_base[-1] == '/'
-    
-    @log, @debug = log, debug
+    @url_base += '/' unless @url_base[-1] == '/'    
     
     if pxlinks then
       
@@ -65,6 +70,12 @@ class RackRscript
     
     @rsc = nil
     @rsc = RSC.new rsc_host, rsc_package_src if rsc_package_src
+    
+    @filetype = {xml: 'application/xml', html: 'text/html', png: 'image/png',
+             jpg: 'image/jpeg', txt: 'text/plain', css: 'text/css',
+             xsl: 'application/xml', svg: 'image/svg+xml'}    
+    
+    @root, @static = root, static
 
   end
 
@@ -130,7 +141,7 @@ class RackRscript
         'application/json' => passthru_proc,
         'image/png' => passthru_proc,
         'image/jpeg' => passthru_proc,
-        'image/svg+xml' => passthru_proc
+        'image/svg+xml' => passthru_proc      
       }
       
       content_type ||= 'text/html'
@@ -263,7 +274,37 @@ class RackRscript
                                                             'application/json']
 
     end    
-        
+    
+    get /^(\/(?:#{@static.join('|')}).*)/ do |path|
+
+      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
+
+        content_type = @filetype[filepath[/\w+$/].to_sym]
+        [File.read(filepath), content_type || 'text/plain']
+      else
+        'oops, file ' + filepath + ' not found'
+      end
+
+    end
+
+    get /^\/$/ do
+
+      file = File.join(@root, 'index.html')
+      File.read file
+    end
 
   end
 

data.tar.gz.sig

@@ -1,2 +1,5 @@
-+t0�z�3v���T\�6�5Uv����z6�;�4T�������f��1ǘ�W�&MU�زc��EN��°�HQ��&p���^�
-#��%ֵ��2��>��=�$�� Y�WQ�Zu@����b�c����+��e���~��� �	��1V�ݰ-����@̈́�������i;��ASL��8���l�zw�Ol|׻��}`�����O^'�'���b���=��N=��$�����9���5r�
+[��M�K�P�zM4b*���Y�Y)n%A	�<��S��i4Y��̇�vx��3x�TeF��6�F<|
+��r!-GcWe�9Ż0�/Mb��=(Ft����q��qN���#�P|��s��-��,v�2�O��o}
+�˞��
+^�w��%D�#��
+��
�sp���у����}Ge�o�喘}�V�s%�eEB#;����������=r

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   vvLi4Y0qQy/Uz/kHVXzfeLcG657aNIu8ogA1I3Xnlz0sqlNoDhk5sSBd2BsfkVFS
   sTo/69YTrLx1zw==
   -----END CERTIFICATE-----
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack

metadata.gz.sig

@@ -1 +1 @@
-R<�Á���@wj��(�@��SO�e�%���?n�lǓ�}��;/�$�Wf76�4�i��d�N4�p<�9ꡓ(5���b�[+7W��>�z_���kC��_�$!�U 2+a+�qiƩ���hsK�O���]����_���D+N���BJr׾L��z�_�p�Tpu0d�U:VY�(��+�~mR&Ґρ���C�L�Z�5�.�Y�<",D�����f���*�h��/�G��۶���.�:�5@��=a@'}uɉ#���H
+T��ѝ`�G��g�.�PŦâ(e,�k^UU/L/���F�~`>�@@��4��h=[ad��|�YGC�c`li',U�חM��ؾ+(�j�xF ��=q�vM"sss O�:���.dpg�~10u+#�:K�="����3�*�4�Y�H��F����qv؜T�"fL�G�'��RqW�cj��&f��;�O�D���1<����ok�����v����ܧF%|��ܷX�9�P�%�>C*THt;`L�