padrino-core 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/lib/padrino-core/application/rendering.rb

@@ -6,11 +6,13 @@ module Padrino
 
     private
       ##
-      # Hijacking the sinatra render for do three thing:
+      # Hijacking the sinatra render for:
       #
       # * Use layout like rails do
       # * Use render 'path/to/my/template' (without symbols)
       # * Use render 'path/to/my/template' (with auto enegine lookup)
+      # * Use render 'path/to/template', :layout => false
+      # * Use render { :a => 1, :b => 2, :c => 3 } # => return a json string
       #
       def render(engine, data=nil, options={}, locals={}, &block)
         clear_template_cache!
@@ -18,6 +20,9 @@ module Padrino
         # If engine is an hash we convert to json
         return engine.to_json if engine.is_a?(Hash)
 
+        # Data can be a hash of options sometimes mistakenly
+        options.merge!(data) && data = nil if data.is_a?(Hash)
+
         # If an engine is a string probably is a path so we try to resolve them
         data, engine = *resolve_template(engine, options) if data.nil?
 

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-11}
+  s.date = %q{2010-03-15}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}

data/test/test_application.rb

@@ -87,7 +87,7 @@ class TestApplication < Test::Unit::TestCase
         layout do
           "this is a <%= yield %>"
         end
-        
+
         get("/"){ render :erb, "sinatra layout" }
       end
 
@@ -117,6 +117,21 @@ class TestApplication < Test::Unit::TestCase
         assert_equal "this is a rails way custom layout", body
       end
     end
+
+    should 'not use layout' do
+      with_layout do
+        with_view :index, "index" do
+          mock_app do
+            get("/with/layout"){ render :index }
+            get("/without/layout"){ render :index, :layout => false }
+          end
+          get "/with/layout"
+          assert_equal "this is a index", body
+          get "/without/layout"
+          assert_equal "index", body
+        end
+      end
+    end
   end
 
   context 'for application render functionality' do
@@ -231,7 +246,7 @@ class TestApplication < Test::Unit::TestCase
           yield
           @_out_buf << "SPARTA!"
         end
-        def is; "IS." end
+        def is; "IS."; end
         get '/' do
           render :erb, '<% container do %> <%= is %> <% end %>'
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 +01:00
+date: 2010-03-15 00:00:00 -07:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency