rack-rscript 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1aecdceddae7e8344cdbf8798790c72ec9dc20d
-  data.tar.gz: 7f0c196b9ceeab8c7ef2f2cbbfcb35fb7b666455
+  metadata.gz: 31ffa65b11727294cc6039058ff7d8834a0c5a5a
+  data.tar.gz: 1db517ed4dd53d389f4a9a704d257c42093c334c
 SHA512:
-  metadata.gz: 7b7067382b26de914c7005f283a7574bc79e1a7e9e0b227271facfa304d9de42d311883850708711c96dd36cdeb5ec38c9453aa695ebcc9150982ff66ee3470a
-  data.tar.gz: bc4e243eb52d0d27bf53a7b8b93416e1a97e32f02600b8193f8c4dc5e73edadaeb495bfad43be6b0b6088609b04fe17154ae2f081f04e6d24df650bf0a592e72
+  metadata.gz: 5e0c296771d9e7813e15ce33beb89544e64f5ec60d38c6efc3db4488006f1ddb052d59e44f89d408d28208347c96e1d301d51cf7ef20d49e2df65355daa3d71c
+  data.tar.gz: c15ffc86a08c9b0b8d1771f9cf8dbdef69927336fa2fa894d26e84a4d3afae83f807cd253e1b9e03abb4b743c36c686b2a4ce1a429830c9eeabd888ec003c3dd

data/lib/rack-rscript.rb

@@ -26,22 +26,22 @@ class RackRscript
   include AppRoutes
 
 
-  def initialize(raw_opts={})
+  def initialize(logfile: '', logrotate: 'daily', pkg_src: '', cache: true)
     
     @params = {}
     @templates = {}
     
-    @rrscript = RScript.new
+    @rrscript = RScript.new logfile: logfile, logrotate: logrotate, \
+                            pkg_src: pkg_src, cache: cache
     
-    opts = {logfile: '', logrotate: 'daily', pkg_src: ''}.merge(raw_opts)
-    @url_base = opts[:pkg_src] # web server serving the RSF files
+    @url_base = pkg_src # web server serving the RSF files
     @url_base += '/' unless @url_base[-1] == '/'
     
     @log = false
 
-    if opts[:logfile].length > 0 then
+    if logfile.length > 0 then
       @log = true
-      @logger = Logger.new(opts[:logfile], opts[:logrotate])    
+      @logger = Logger.new(logfile, logrotate)
     end
 
     super() # required for app-routes initialize method to exectue
@@ -89,6 +89,8 @@ class RackRscript
       
       passthru_proc = lambda{|c, ct| [c,ct]}
       
+                              
+      
       ct_list = {
         'text/html' => passthru_proc,
         'text/haml' => tilt_proc,
@@ -101,6 +103,7 @@ class RackRscript
         'image/png' => passthru_proc,
         'image/jpeg' => passthru_proc
       }
+      
       content_type ||= 'text/html'
       status_code ||= 200                  
       proc = ct_list[content_type]
@@ -109,7 +112,7 @@ class RackRscript
       
       [status_code, {"Content-Type" => content_type}, [content]]
     end
-        end
+  end
 
   def clear_cache()
     @rrscript.reset
@@ -159,6 +162,11 @@ class RackRscript
   def redirect(url)
     Redirect.new url
   end
+  
+  # j2 140616 not yet used and still needs to be tested
+  def transform(xsl, xml)
+    Rexslt.new(xsl, xml).to_s
+  end
 
   def haml(name,options={})    
     render name, :haml, options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   SPldGmxByaKACzPfwVD1OWtnfTgqGsJzquNqO244CsVqGhH2zKMpfEJWX9h/FVqy
   XUT2A0hr22sJdA==
   -----END CERTIFICATE-----
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ dependencies:
         version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 4.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ dependencies:
         version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 4.0.7
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -139,20 +139,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 3.0.7
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.