reststop 0.5.2 → 0.5.3

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.5.3 :: 2010-07-07 
+  * Fixed issue in the new basic_render method where Tilt templates were not supported (on either actions or layout)
+
 === 0.5.2 :: 2010-06-21 
   * Made the content-type in reststop_render to be text/html only if the format is :HTML, and application/#{format} otherwise
   * Fixed issue in the new basic_render method where the layout was not being applied.

data/README.rdoc

@@ -12,7 +12,7 @@ For info and downloads please see http://github.com/camping/reststop
 
 
 For an example of a complete Reststop-based Camping app, have a look at 
-http://github.com/zuk/reststop/blob/master/examples/blog.rb
+http://github.com/camping/reststop/blob/master/examples/blog.rb
 
 Reststop essentially gives you three things:
 

data/lib/reststop.rb

@@ -163,7 +163,7 @@ module Reststop
         @headers['Content-Type'] = ct
 
         s = m.capture{m.send(action)}
-        s = m.capture{send(:layout){s}} if /^_/!~@method.to_s and m.respond_to?(:layout)	# @techarch : replaced a[0] by @method (not 100% sure that's right though)
+        s = m.capture{send(:layout){s}} if /^_/!~action.to_s and m.respond_to?(:layout)	
         s
       end
     end
@@ -175,8 +175,20 @@ module Reststop
 		app_name = self.class.name.split("::").first							# @techarch : get the name of the app
         	mab = (app_name + '::Mab').constantize								# @techarch : get the Mab class
    		m = mab.new({}, self)														# @techarch : instantiate Mab
-		s = m.capture{m.send(action)}
-        	s = m.capture{send(:layout){s}} if /^_/!~@method.to_s and m.respond_to?(:layout)	# @techarch : replaced a[0] by @method (not 100% sure that's right though)
+		
+		tpl = lookup(action)	# check if we have a Tilt template
+		
+		raise "Can't find action #{action}" unless tpl
+		
+		s = (tpl == true) ? m.capture{m.send(action)} : tpl.render(self, {}) # if so render it
+		if /^_/!~action.to_s
+			layout_tpl = lookup(:layout)
+			if layout_tpl
+				b = Proc.new { s }
+				s = (layout_tpl == true) ? m.capture{send(:layout){s}} : layout_tpl.render(m, {},&b) # if so render it
+			end
+		end
+		s
 	end
   end
 

data/lib/reststop/version.rb

@@ -2,7 +2,7 @@ module Reststop
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: reststop
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -16,18 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -06:00
+date: 2010-07-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: camping
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 799
         segments: 
         - 2
         - 0
@@ -56,7 +53,6 @@ files:
 - lib/reststop.rb
 - lib/reststop/version.rb
 - README.rdoc
-- test/test.rb
 has_rdoc: true
 homepage: http://wiki.github.com/camping/reststop/
 licenses: []
@@ -67,27 +63,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: reststop
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: REST framework for Camping web services