rack-rscript 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55972a208542517da8beba86637de37f933782c3
-  data.tar.gz: 9d61daaff9c6f99598ffbbe45b585bd3c3827584
+  metadata.gz: 236a901662593c36baccb7009a0b09691284922c
+  data.tar.gz: 85f8d4557a9d4c8d273e434786aefb6e4a8b8ab0
 SHA512:
-  metadata.gz: 264e35690081f7b5fab48af4447becf1d4b16e7168532575bd18687d1778fea16622c2ebedee888031b3a89d8b0ad149e717f7c42501d093a5a8638ce995b831
-  data.tar.gz: 506b439e1e559adfd235f391dbc8325cfa6e8ad298264efed408cb8160edd9c46e4a8a3d88494558f8dc3eb76256a2327471b39ee3a9155f287654821ebd2f9a
+  metadata.gz: 6017b101e716b89f5de149ae6f0fb0f366ddd3725364ae308cff7487169e2d345bb3fc8c00c084a7bcf887e37b5d6076c258504890dcb38fe6c0f9bbbc569fc7
+  data.tar.gz: 6b892c84e5a4f8261619b734b1678d5fe70b69e21393a9061164e1fad8a355f2d515307f690737884e8339dcd975e0371dc42bfe832f6a5002b6409a4fb060c0

data/lib/rack-rscript.rb

@@ -7,6 +7,8 @@ require 'rscript'
 require 'app-routes'
 require 'logger'
 require 'haml'
+require 'slim'
+require 'tilt'
 
 class Redirect
   attr_reader :to_url
@@ -21,6 +23,9 @@ class RackRscript
 
   def initialize(raw_opts={})
     @params = {}
+    @templates = {}
+    
+    @rrscript = RScript.new
     
     opts = {logfile: '', logrotate: 'daily', pkg_src: ''}.merge(raw_opts)
     @url_base = opts[:pkg_src] # web server serving the RSF files
@@ -60,11 +65,20 @@ class RackRscript
         content, status_code  = "404: page not found", 404             
       end      
 
-      haml_proc = lambda{|c, ct| [Haml::Engine.new(c).render, 'text/html']}
+      tilt_proc = lambda do |s, content_type| 
+        type = content_type[/[^\/]+$/]
+        s = [s,{}] unless s.is_a? Array
+        content, options = s
+        [Tilt[type].new(options) {|x| content}.render, 'text/html']
+      end
+      
+      passthru_proc = lambda{|c, ct| [c,ct]}
       
       ct_list = {
-        'text/html' => lambda{|c, ct| [c,ct]},
-        'text/haml' => haml_proc, 'application/haml' => haml_proc
+        'text/html' => passthru_proc,
+        'text/haml' => tilt_proc,
+        'text/slim' => tilt_proc,
+        'text/plain' => passthru_proc
       }
       content_type ||= 'text/html'
       status_code ||= 200                  
@@ -91,7 +105,7 @@ class RackRscript
       @params.merge! h
     end
     
-    result, args = RScript.new.read([url, jobs.split(/\s/), \
+    result, args = @rrscript.read([url, jobs.split(/\s/), \
       qargs].flatten)
 
     rws = self
@@ -117,6 +131,14 @@ class RackRscript
   def redirect(url)
     Redirect.new url
   end
+
+  def haml(name,options={})    
+    render name, :haml
+  end            
+            
+  def slim(name,options={})
+    render name, :slim
+  end    
   
   private
 
@@ -132,6 +154,27 @@ class RackRscript
       run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
     end
 
+    get '/source/:package/:job' do |package,job|
+      url = "%s%s.rsf" % [@url_base, package]
+      [@rrscript.read([url, '//job:' + job]).first, 'text/plain']
+    end    
+
+     get '/source/:package' do |package,job|
+       url = "%s%s.rsf" % [@url_base, package]
+       [open(url,'User-Agent' => 'Rack-Rscript v0.5'){|x| x.read },'text/plain']
+    end    
+    
+
   end
+
+  def render(name,type, options={})
+    layout = Tilt[type.to_s].new(options) {|x| @templates[:layout]}
+    template = Tilt[type.to_s].new(options) {|x| @templates[name]}
+    layout.render{ template.render }
+  end            
+  
+  def template(name,&blk)
+    @templates.merge!({name => blk.call})
+  end                  
      
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   PrSIAHSciIEyWkxdvMiXuEOAU+cBA3uVHTfpn/QHpap2lC3rCNFDCt1jdNhsvPJW
   P8hoKd8f6iDnTJw4mqinZSTTIweaDo1s
   -----END CERTIFICATE-----
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack