rack-rscript 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743a191f39ebaaba948b67559851602f71671d42
-  data.tar.gz: 8d01af53acf969e87238d67b06ea87f1c6b9c6f5
+  metadata.gz: 059e366c7cbf0cfd9ef44fa35c41d5662ddcf309
+  data.tar.gz: 6e70690b96f764758a84047ba2066586a3cfd388
 SHA512:
-  metadata.gz: 8ff94ad5add453deda8d9524d79f25696198f9d6743bf1a77087cb071723de387319cf7de3f642930753f3d4e0b0c1b10d13238cc20ef88d8b94232794c98254
-  data.tar.gz: c7e73730c8966095b32a9a3f4986e0831173f8a22dc2247051a4f9726dba83eb1d15a7f02d25d35c19a1ee729140758f4bd5d5eeb8d14a7fbc49867192a5102e
+  metadata.gz: cf5fdfd9b4f72bfac3e573efb2c11610f844f7af173ebe4bb1c8f8282d702741f68a82b181a991da83b07e3a697876d877c906cd88566284f886775b3a75d7ac
+  data.tar.gz: ddb4b7652b120e3a5761e22c0ac73352fea3c4e7879b9b7edfd1ef5f01181d021eca4a1499b9632e7643e7c4031d0bf904a93280e44b0f60566198807598d811

data/lib/rack-rscript.rb

@@ -78,7 +78,9 @@ class RackRscript
         'text/html' => passthru_proc,
         'text/haml' => tilt_proc,
         'text/slim' => tilt_proc,
-        'text/plain' => passthru_proc
+        'text/plain' => passthru_proc,
+        'text/xml' => passthru_proc,
+        'application/xml' => passthru_proc
       }
       content_type ||= 'text/html'
       status_code ||= 200                  
@@ -171,15 +173,27 @@ class RackRscript
   end
 
   def render(name, type, opt={})
+    
     options = {locals: {}}.merge!(opt)
     locals = options.delete :locals
-    layout = Tilt[type.to_s].new(options) {|x| @templates[:layout][:content]}
+    
+    unless @templates[:layout] then
+      template(:layout, type) { File.read('views/layout.' + type.to_s) }
+    end
+    
+    layout = Tilt[type.to_s].new(options) {|x| @templates[:layout][:content]}    
+
+    unless @templates[name] then
+      template(name, type) { File.read("views/%s.%s" % [name.to_s, type.to_s]) }
+    end    
+
     template = Tilt[type.to_s].new(options) {|x| @templates[name][:content]}
     layout.render{ template.render(self, locals)}
   end            
   
   def template(name, type=nil, &blk)
     @templates.merge!({name => {content: blk.call, type: type}})
+    @templates[name]
   end                  
 
   def tilt(name, options={})
@@ -189,4 +203,4 @@ class RackRscript
     template = Tilt[@templates[name][:type].to_s].new(options) {|x| @templates[name][:content]}
     layout.render{ template.render(self, locals)}
   end    
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - James Robertson
@@ -29,90 +29,90 @@ cert_chain:
   PrSIAHSciIEyWkxdvMiXuEOAU+cBA3uVHTfpn/QHpap2lC3rCNFDCt1jdNhsvPJW
   P8hoKd8f6iDnTJw4mqinZSTTIweaDo1s
   -----END CERTIFICATE-----
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rscript
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -132,12 +132,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []