rack-rscript 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 116ac1c0f9c5fce98eda8c8fb158a8d288aabd2b
-  data.tar.gz: b5070819669bc043f2b4229d7c67e8c9dfd13e03
+  metadata.gz: 884384c1924caca692fde02aa10fc52ece9e7eb9
+  data.tar.gz: a3c2bfd008be079505d95acdf8c78ceb2f104eef
 SHA512:
-  metadata.gz: a65aa186e3075daed08c0e4cede57b424987ba4845145651b829513a18de93d0cfb4ebc4d9df924cf2d1333187e7d3ccfa056f260264d8560901742f00123c98
-  data.tar.gz: 88b1ccaa3b82efa91e66285b276ac239c30466b13cd77527b03bb015874a62e9f11b2f06398f86b8226c367a69f8547b984e5dc22fc6fb4e20b0b267a301909c
+  metadata.gz: f94d6f1d44bb76a2a480c23ad5502f3337448a3a4d509b20aad96c62299fc2153756abf232c671d321161d3f2257934d04bf1e3539beb70ea12fa8377b250397
+  data.tar.gz: 504fdd7e27551d36a34446a28aef3fa0a56776221515f744131c3cd0eb57f53d5d1f33ddbd5b2e3f42f2a91edc7609912adc9c117a6e304e274126db4f73ef30

data/lib/rack-rscript.rb

@@ -8,7 +8,6 @@ require 'haml'
 require 'slim'
 require 'tilt'
 require 'json'
-require 'logger'
 require 'rexslt'
 require 'rscript'
 require 'app-routes'
@@ -29,24 +28,20 @@ class RackRscript
   include AppRoutes
 
 
-  def initialize(logfile: '', logrotate: 'daily', pkg_src: '', cache: 5, 
+  def initialize(log: nil, pkg_src: '', cache: 5, 
                  rsc_host: 'rse', rsc_package_src: nil)
     
     @params = {}
     @templates = {}
     
-    @rrscript = RScript.new logfile: logfile, logrotate: logrotate, \
-                            pkg_src: pkg_src, cache: cache
+    @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 = false
+    @log = log
+
 
-    if logfile.length > 0 then
-      @log = true
-      @logger = Logger.new(logfile, logrotate)
-    end
 
     super() # required for app-routes initialize method to exectue
     default_routes(@env, @params)    
@@ -61,8 +56,7 @@ class RackRscript
     @env = env
     request = env['REQUEST_URI'][/https?:\/\/[^\/]+(.*)/,1]
 
-    log "_: " + env.keys.inspect
-    log Time.now.to_s + "_: " + env.inspect
+    @log.info 'RackRscript/call: ' + env.inspect if @log
     req = Rack::Request.new(env)
 
     @req_params = req.params
@@ -82,7 +76,7 @@ class RackRscript
 
       if e then
         content, status_code = e, 500
-        log(e)      
+        @log.debug 'RackRscript/call/error: ' + e if @log
       elsif content.nil? then
         content, status_code  = "404: page not found", 404             
       end      
@@ -105,10 +99,13 @@ class RackRscript
         'text/plain' => passthru_proc,
         'text/xml' => passthru_proc,
         'text/css' => passthru_proc,
+        'text/markdown' => passthru_proc,
         'application/xml' => passthru_proc,
+        'application/xhtml' => passthru_proc,
         'application/json' => passthru_proc,
         'image/png' => passthru_proc,
-        'image/jpeg' => passthru_proc
+        'image/jpeg' => passthru_proc,
+        'image/svg+xml' => passthru_proc
       }
       
       content_type ||= 'text/html'
@@ -153,19 +150,16 @@ class RackRscript
       return r
 
     rescue Exception => e  
+      
       @params = {}
       err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")      
       raise RackRscriptError, err_label
-      log(err_label)
+
+      @log.debug 'RackRscript/run_job/error: ' + err_label if @log
     end
     
   end
-  
-  def log(msg)
-    if @log == true then
-      @logger.debug msg
-    end
-  end
+
   
   def redirect(url)
     Redirect.new url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTAzMDExMjYyMVoXDTE3MTAzMDExMjYyMVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MTExMzE3MjAyMloXDTE4MTExMzE3MjAyMlowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBANpcemozULm931aHIuW4O6k6BWMDqQVhj2Bn5lkbwkQr0sVf8RtngnahNiR9
-  IN2avQXmMZ9ierJ/zozZh1db+p6uyDmy8iqF5c3vNjmMmXX9+lRR2+q+ddI7pQYE
-  ifjllr0wwTMDAEZyhiWZeQjp8PFQ1l4KGb7UMMZ09HlC0euT69n1Y6uFuEsgFcKY
-  M74nX/78mjT1UAaWr6Xy/OKhG5cGPmO4QiSkYCLJ7uAJnoA/8dBwQto24SzJfRdG
-  baT3kdG1z7e6c4yuNvxBUZMKWl0sg9rqwLyd8LK3yvmftHCPQQfOsqFvnV5u6GuE
-  9r+xbv3YrqnJX/dtNYDRYj0eR00CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU3XodQhGfAe0Air1XJag5ffWMLycwJgYDVR0RBB8w
+  ggEBAJ0lu7yKoB8JHYhpkCTGjdbs42TKOS0ShXkMSydVj+CoY9pdn9VyJ69IVdzY
+  23VV94yiNn8LG7MGTmkG39Omoz69e+/Bpbkxz6w3zZQa7/NgvnxVUiCpWxeXorLB
+  C35bRz4opl8WszCtOZ4DeVNg2wYH/FgR4QN1GRaP6MbBxCpo3dEtliUdZy9wz63d
+  kywAyRn3Xq6qyAHcI3UVO+XumZegjB3ZNIIV1Ey8MZsiEBEfl2Ch9nYAC8EYA5cL
+  ipgcoJR0hwIeQJ2HSkol+5cqd1BFK3Zr5sgS74tEkGfKFYOC59fviZqJ+VVWV8X0
+  G7NwAVi3ZeATav/u4k/nn/m0LSkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUVGB3VQ9aEnZ5f45riQwl4TB8nQYwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAa/2N7UtG
-  oPJFlMgwO+JIEOVkb5+ATygL9JVzzTmCEimzLAYFyOSWVPU4qhxapC/3XfMxSU3p
-  enjklf2wtFnD8laLat9rVdPNWAF1G5u7E92k8PAtE9hhDojXmaawzjNCQGvwp/1S
-  Sx1Yps6DrqQNwZOQGFj6rZTt9PUrUbVgQC405KmuOC9u2wwk27t1wmnAw0vcQX3p
-  Sr7TvpkrsQLI8PTmFd6PQVCo2g8M6GvVvU6Y18aHFX6c/Npf63XhxYDb+JISVqN/
-  Ds3gVVKTRQV/ovLdiT/BpXxGWS5/OQ4Ftl2JY1A8bBhJqZGdpMbwv+Jtn/gpmMjE
-  EHV4ZelB040ghg==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAhwRT//DM
+  wqQ6vSiJBgcQsrzcO9qHONkyb4HwVgWFzI5qD+v9G26OlsvD8+fp0MtiESTsHDI1
+  d5aCmH4CYhmrENuovvfEd86HXlGbvF7kPtYODRUWiN01/xoFh7IS9RlKEeakcT+8
+  CTiEe4+ZRKUc3toENPvtd2FlQx5bCw12JTX7tARJncjOcDJ1lOAvsuRH/+Tcvzqe
+  o8kNj/pFj11m1nFOawQt/05p6394ivLMtGvsFpTpnYRkw5q28bs5Y/UFHFVDM7//
+  vvLi4Y0qQy/Uz/kHVXzfeLcG657aNIu8ogA1I3Xnlz0sqlNoDhk5sSBd2BsfkVFS
+  sTo/69YTrLx1zw==
   -----END CERTIFICATE-----
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -79,20 +79,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
 - !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.7
+        version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -172,7 +172,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: rsc
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.

metadata.gz.sig

@@ -1 +1,3 @@
-͙a�
����c�vڥ�t�)�K��c� �{��Gl���]�`�9��W�O�`ʈf`�ҁe|�u�ʷ�Z����.�)�\��d6ƨp�6���b; ��.bf�6{U}�tc�@`����n�kKM�(v���x��wm�
+�p�#�v{5��8ނ���z�#o�IF�#����M\��q3���~��^���P��J8�󳛃�Yc�;.��1�V�JEJ:*$���STh5"�
+78P2��2h?�α�_�$����ؘ����[4l��%�İ@�N��\��5�d���@��
���`Wo�.�ED
+���e�\�{���E�a�9o���Y:�o�({���ߌ�p�(ڮܜ���h��P���x��,���:��&�Ż��@