rack-rscript 0.9.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05cbb552f2b117cdd2a6776764c5d2c53ff93a9a
-  data.tar.gz: 0cfc3e2a21cf29cddf937f76eafae85b6b96ca9f
+  metadata.gz: c5adcfa56e1cd6ec30c974ebc8f22cd665e3c8d8
+  data.tar.gz: 2cdac5d39d82192bb8a6e62eef82193510d3dcb8
 SHA512:
-  metadata.gz: 4926298e07270c3e61c1eed9562cbe3b9b59cfcf919fa20ba7b2d7959f42ee05b9425b42ef73860d3295ef98b66398a27e306a5102e35c3c1fc52708a0fe7c28
-  data.tar.gz: b70bdb5cd2e6f5c44c69f7d96ec9502b8cb2b8d45525985d3e42581b137ebb4a8233b7c356585b7772af456a643283a32be75d8eb13fd2b58b412e804b513ba9
+  metadata.gz: 22bd6205f5ed232142b6bd389e3beb52328a2548aaa0c31a99741f1ca293bafff87048b6206daeaee27ba5c1cf5193de1fcb1bb64fa4ebb09cb8d44cb646557a
+  data.tar.gz: 58711eb69d801e5b2f0b1cfdf84bae4e2908b81db754f9ab4d4e733780d75f48e40bfcbc887eafa6d2873aec1ca5f547fddedeedcb33f18e45c970bd53212db0

data/lib/rack-rscript.rb

@@ -3,14 +3,15 @@
 # file: rack-rscript.rb
 
 
-require 'rscript'
-require 'app-routes'
-require 'logger'
+require 'rsc'
 require 'haml'
 require 'slim'
 require 'tilt'
 require 'json'
+require 'logger'
 require 'rexslt'
+require 'rscript'
+require 'app-routes'
 
 
 class Redirect
@@ -28,7 +29,8 @@ class RackRscript
   include AppRoutes
 
 
-  def initialize(logfile: '', logrotate: 'daily', pkg_src: '', cache: 5)
+  def initialize(logfile: '', logrotate: 'daily', pkg_src: '', cache: 5, 
+                 rsc_host: 'rse', rsc_package_src: nil)
     
     @params = {}
     @templates = {}
@@ -47,7 +49,10 @@ class RackRscript
     end
 
     super() # required for app-routes initialize method to exectue
-    default_routes(@env, @params)
+    default_routes(@env, @params)    
+    
+    @rsc = nil
+    @rsc = RSC.new rsc_host, rsc_package_src if rsc_package_src
 
   end
 
@@ -114,7 +119,7 @@ class RackRscript
       
       [status_code, {"Content-Type" => content_type}, [content]]
     end
-  end
+        end
 
   def clear_cache()
     @rrscript.reset
@@ -141,6 +146,7 @@ class RackRscript
       qargs].flatten)
 
     rws = self
+    rsc = @rsc if @rsc
     
     begin
       r = eval result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.0.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   Ds3gVVKTRQV/ovLdiT/BpXxGWS5/OQ4Ftl2JY1A8bBhJqZGdpMbwv+Jtn/gpmMjE
   EHV4ZelB040ghg==
   -----END CERTIFICATE-----
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -62,7 +62,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
   name: rscript
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,27 +92,27 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -159,20 +159,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rexslt
   requirement: !ruby/object:Gem::Requirement
@@ -193,8 +193,28 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.7
+- !ruby/object:Gem::Dependency
+  name: rsc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -220,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rack-Rscript is a light-weight alternative to Sinatra-Rscript.