dandelion_s1 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1abc77664106f95480a31a3b78bf9d81f484c7c
-  data.tar.gz: 67fdcc611da10351e1ab06f74561dca6fe7c0749
+  metadata.gz: 7e9ff3cb5efdc68ee7385d5c1b8d975202d96526
+  data.tar.gz: 52f232490fdfdf27eeb3ddb9a875545a9710971e
 SHA512:
-  metadata.gz: b57263c28523cdc4210c931db2712cfe4d81ac06080b6287eec211f221b4fcc2d4557eb90c9baa485e97260946f0c4afa70d92b6f97e962f917df82a00489f5b
-  data.tar.gz: 494e8620838dc3296816f98762f3e8fc324d6c130b641ed1e67f631674054b87f67e5b5a1851d47bb6037336c8996ae88678da6ffddc72b65b39a9e3c2e49a79
+  metadata.gz: f54b7004459dfd27f7c62ca188bfea688a1035c9707cc3f5c6b45a7bfcd71e1c8acfd5c31f6f1aeadbd2f0b01a32ade832fcb9db2a434b9479ae89ccad9d368d
+  data.tar.gz: 7dd3280337401fe36b4d6834508b622b801cbfaef7749e582f3790f128d6f216f332a44adc26cf99e6252d2db331c20173a0ba851764916083cc35d631ebad7b

data/lib/dandelion_s1.rb

@@ -10,7 +10,7 @@ class DandelionS1 < RackRscript
 
   def initialize(h={})
 
-    raw_opts = {root: 'www', access: {}, static: []}.merge h
+    raw_opts = {root: 'www', access: {}, static: [], log: nil}.merge h
     @app_root = Dir.pwd
 
     @static = raw_opts[:static]
@@ -24,7 +24,7 @@ class DandelionS1 < RackRscript
     @access_list = conf_access.inject({}) \
                                 {|r,x| k,v = x; r.merge(k.to_s => v.split)}
     
-    super(logfile: h[:logfile],  pkg_src: h[:pkg_src], rsc_host: h[:rsc_host], 
+    super(log: h[:log],  pkg_src: h[:pkg_src], rsc_host: h[:rsc_host], 
           rsc_package_src: h[:rsc_package_src])
   end
 
@@ -38,7 +38,8 @@ class DandelionS1 < RackRscript
       super(e)
     elsif private_user.is_a? String and private_user == e['REMOTE_USER']
       super(e)
-    elsif private_user.is_a? Array and private_user.any? {|x| x == e['REMOTE_USER']}
+    elsif private_user.is_a? Array and 
+        private_user.any? {|x| x == e['REMOTE_USER']}
       super(e)
     else
       request = '/unauthorised/'
@@ -56,7 +57,11 @@ class DandelionS1 < RackRscript
     get /^(\/(?:#{@static.join('|')}).*)/ do |path|
 
       filepath = File.join(@app_root, @root, path)
-      log("root: %s path: %s" % [@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' 
@@ -66,7 +71,7 @@ class DandelionS1 < RackRscript
       elsif File.exists? filepath then
         h = {xml: 'application/xml', html: 'text/html', png: 'image/png', 
              jpg: 'image/jpeg', txt: 'text/plain', css: 'text/css',
-             xsl: 'application/xml'}
+             xsl: 'application/xml', svg: 'image/svg+xml'}
         content_type = h[filepath[/\w+$/].to_sym]
         [File.read(filepath), content_type || 'text/plain']
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion_s1
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   pyJm5LdEycjtTNHCuWHnBmZ5AVetwku2PZdaJAb5ygezNQbu5ynq/HBIMWdTabUY
   Zfqb8EuDqrBL9w==
   -----END CERTIFICATE-----
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-rscript
@@ -42,7 +42,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,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: A kind of Rack-Rscript web server which facilitates static files, basic authentication,