padrino-core 0.9.7 → 0.9.9

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'sdoc'
 
 begin
   require 'jeweler'
@@ -13,7 +12,7 @@ begin
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.executables = ["padrino"]
     gem.rubyforge_project = 'padrino-core'
-    gem.add_runtime_dependency     "sinatra",       ">= 0.9.6"
+    gem.add_runtime_dependency     "sinatra",       ">= 1.0.0"
     gem.add_runtime_dependency     "i18n",          ">= 0.3.2"
     gem.add_runtime_dependency     "usher",         ">= 0.6.2"
     gem.add_runtime_dependency     "thor",          ">= 0.13.0"
@@ -23,6 +22,7 @@ begin
     gem.add_development_dependency "mocha",         ">= 0.9.7"
     gem.add_development_dependency "rack-test",     ">= 0.5.0"
     gem.add_development_dependency "webrat",        ">= 0.5.1"
+    gem.add_development_dependency "haml",          ">= 2.2.22"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.9

data/bin/padrino

@@ -6,4 +6,15 @@ $:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.inclu
 
 require 'padrino-core/cli/base'
 
+if %w(g gen).include?(ARGV[0])
+  ARGV.shift
+  padrino_gen = File.join(padrino_core_path, "/../../padrino-gen/bin/padrino-gen")
+  if File.exist?(padrino_gen)
+    system "#{padrino_gen} #{ARGV.join(" ")}"
+  else
+    puts "<= You need padrino-gen! Run: gem install padrino-gen"
+  end
+  exit(0)
+end
+
 Padrino::Cli::Base.start(ARGV)

data/lib/padrino-core.rb

@@ -1,4 +1,5 @@
 require 'sinatra/base'
+require 'padrino-core/support_lite'
 
 Dir[File.dirname(__FILE__) + '/padrino-core/application/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/padrino-core/*.rb'].each {|file| require file }

data/lib/padrino-core/application.rb

@@ -196,7 +196,7 @@ module Padrino
 
     private
       def clean_backtrace(trace)
-        return trace unless options.clean_trace?
+        return trace unless settings.clean_trace?
         trace.reject { |line|
           line =~ /lib\/sinatra.*\.rb|lib\/padrino.*\.rb/ ||
             (defined?(Gem) && line.include?(Gem.dir))

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

@@ -1,9 +1,22 @@
 module Padrino
   ##
   # Padrino enhances the Sinatra ‘render’ method to have support for automatic template engine detection,
-  # among other more advanced features.
+  # enhanced layout functionality, locale enabled rendering, among other features.
   #
   module Rendering
+    class TemplateNotFound < RuntimeError #:nodoc:
+    end
+
+    ##
+    # This is an array of file patterns to ignore.
+    # If your editor add a suffix during editing to your files please add it like:
+    #
+    #   Padrino::Rendering::IGNORE_FILE_PATTERN << /~$/
+    #
+    IGNORE_FILE_PATTERN = [
+      /~$/ # This is for Gedit
+    ]
+
     def self.registered(app)
       app.send(:include, Padrino::Rendering)
     end
@@ -30,43 +43,60 @@ module Padrino
 
     private
       ##
-      # Hijacking the sinatra render for:
+      # Enhancing Sinatra render functionality for:
       #
-      # * Use layout like rails do
-      # * Use render 'path/to/my/template' (without symbols)
-      # * Use render 'path/to/my/template' (with auto enegine lookup)
+      # * Using layout similar to rails
+      # * Use render 'path/to/my/template'   (without symbols)
+      # * Use render 'path/to/my/template'   (with engine lookup)
+      # * Use render 'path/to/template.haml' (with explicit engine lookup)
       # * Use render 'path/to/template', :layout => false
       # * Use render 'path/to/template', :layout => false, :engine => 'haml'
       # * Use render { :a => 1, :b => 2, :c => 3 } # => return a json string
       #
       def render(engine, data=nil, options={}, locals={}, &block)
-        clear_template_cache!
-
-        # If engine is an hash we convert to json
+        # If engine is a hash then render data converted to json
         return engine.to_json if engine.is_a?(Hash)
 
-        # Data can be a hash of options sometimes mistakenly
+        # Data can actually be a hash of options in certain cases
         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
+        # If an engine is a string then this is a likely a path to be resolved
         data, engine = *resolve_template(engine, options) if data.nil?
 
-        # We need for Sinatra 1.0 an outvar for erb and erubis templates
+        # Sinatra 1.0 requires an outvar for erb and erubis templates
         options[:outvar] ||= '@_out_buf' if [:erb, :erubis].include?(engine)
 
-        # Use layout as rails do
+        # Resolve layouts similar to in Rails
         if (options[:layout].nil? || options[:layout] == true) && !self.class.templates.has_key?(:layout)
-          if layout = self.class.instance_variable_defined?(:@_layout) ? self.class.instance_variable_get(:@_layout) : :application
-            layout = Dir["#{self.options.views}/#{layout}.*"].any? ? layout.to_sym : File.join('layouts', layout.to_s).to_sym
-            options[:layout] = resolve_template(layout)[0] rescue nil
-            logger.debug "Rendering layout #{options[:layout]}" if defined?(logger) && options[:layout]
-          end
+          options[:layout] = resolved_layout
+          logger.debug "Resolving layout #{options[:layout]}" if defined?(logger) && options[:layout]
         end
+
+        # Pass arguments to Sinatra render method
         super(engine, data, options, locals, &block)
       end
 
       ##
-      # Returns the template path and engine that match (if presents) content_type, I18n.locale.
+      # Returns the located layout to be used for the rendered template (if available)
+      #
+      # ==== Example
+      #
+      # resolve_layout(true)
+      # => "/layouts/custom"
+      #
+      def resolved_layout
+        layout_var = self.class.instance_variable_get(:@_layout) || :application
+        has_layout_at_root = Dir["#{self.settings.views}/#{layout_var}.*"].any?
+        layout_path = has_layout_at_root ? layout_var.to_sym : File.join('layouts', layout_var.to_s).to_sym
+        resolve_template(layout_path, :strict_format => true)[0] rescue nil
+      end
+
+      ##
+      # Returns the template path and engine that match content_type (if present), I18n.locale.
+      #
+      # === Options
+      #
+      #   :strict_format::  The resolved template must match the content_type of the request (defaults to false)
       #
       # ==== Example
       #
@@ -75,33 +105,28 @@ module Padrino
       #   # If you request "/foo" with I18n.locale == :de => [:"/path/to/foo.de.haml", :haml]
       #
       def resolve_template(template_path, options={})
+        options.reverse_merge!(:strict_format => false)
         view_path = options.delete(:views) || self.options.views || self.class.views || "./views"
         template_path = "/#{template_path}" unless template_path.to_s =~ /^\//
+        target_extension = File.extname(template_path)[1..-1] || "none" # retrieves explicit template extension
+        template_path = template_path.chomp(".#{target_extension}")
+
         templates = Dir[File.join(view_path, template_path) + ".*"].map do |file|
-          template_file =  file.sub(view_path, '').chomp(File.extname(file)).to_sym # retrieves relative file path
-          template_engine = options[:engine] || File.extname(file)[1..-1].to_sym    # retrieves engine extension
-          [template_file, template_engine]
+          template_engine = File.extname(file)[1..-1].to_sym # retrieves engine extension
+          template_file   =  file.sub(view_path, '').chomp(".#{template_engine}").to_sym # retrieves template filename
+          [template_file, template_engine] unless IGNORE_FILE_PATTERN.any? { |pattern| template_engine.to_s =~ pattern }
         end
 
         located_template =
           templates.find { |file, e| defined?(I18n) && file.to_s == "#{template_path}.#{I18n.locale}.#{content_type}" } ||
           templates.find { |file, e| defined?(I18n) && file.to_s == "#{template_path}.#{I18n.locale}" && content_type == :html } ||
+          templates.find { |file, e| File.extname(file.to_s) == ".#{target_extension}" or e.to_s == target_extension.to_s } ||
           templates.find { |file, e| file.to_s == "#{template_path}.#{content_type}" } ||
-          templates.find { |file, e| file.to_s == "#{template_path}" && content_type == :html }
+          templates.find { |file, e| file.to_s == "#{template_path}" && content_type == :html } ||
+          templates.any? && !options[:strict_format] && templates.first # If not strict, fall back to the first located template
 
-        raise "Template path '#{template_path}' could not be located and rendered!" unless located_template
+        raise TemplateNotFound.new("Template path '#{template_path}' could not be located!") unless located_template
         located_template
       end
-
-      ##
-      # Clears the template view cache when in development mode
-      # clear_template_cache!
-      #
-      def clear_template_cache!
-        # TODO: remove @template_cache.respond_to?(:clear) when sinatra 1.0 will be released
-        can_clear_cache = @template_cache && @template_cache.respond_to?(:clear)
-        is_in_development = (defined?(Padrino) && Padrino.respond_to?(:env) && Padrino.env != :production)
-        @template_cache.clear if is_in_development && can_clear_cache
-      end
   end # Rendering
 end # Padrino

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

@@ -25,17 +25,6 @@ module Padrino
     # Compatibility with usher
     #
     def route!(base=self.class, pass_block=nil)
-      # TODO: remove this when sinatra 1.0 will be released
-      if Sinatra::VERSION =~ /^0\.9/
-        # enable nested params in Rack < 1.0; allow indifferent access
-        can_parse_nested = Rack::Utils.respond_to?(:parse_nested_query)
-        @params = can_parse_nested ? indifferent_params(@request.params) : nested_params(@request.params)
-        # deliver static files
-        static! if options.static? && (request.get? || request.head?)
-        # perform before filters
-        self.class.filters.each { |block| instance_eval(&block) }
-      end # for sinatra = 0.9
-
       # Usher
       if self.class.router and match = self.class.router.recognize(@request, @request.path_info)
         @block_params = match.params.map { |p| p.last }
@@ -69,7 +58,7 @@ module Padrino
     # serving files from the public directory
     #
     def static_file?(path_info)
-      return if (public_dir = options.public).nil?
+      return if (public_dir = settings.public).nil?
       public_dir = File.expand_path(public_dir)
 
       path = File.expand_path(public_dir + unescape(path_info))
@@ -96,9 +85,7 @@ module Padrino
     end
 
     ##
-    # Method for deliver static files, Sinatra 0.10.x or 1.0.x have this method
-    # but for now we use this (because we need a compatibility with 0.9.x) and also
-    # because we just have +static_file?+ method.
+    # Method for deliver static files.
     #
     def static!
       if path = static_file?(request.path_info)

data/lib/padrino-core/cli/base.rb

@@ -18,14 +18,14 @@ module Padrino
       method_option :daemonize,   :type => :boolean, :aliases => "-d", :desc => "Run daemonized in the background"
       def start
         prepare :start
-        require File.dirname(__FILE__) + "/adapter"
+        require File.expand_path(File.dirname(__FILE__) + "/adapter")
         require 'config/boot'
         Padrino::Cli::Adapter.start(options)
       end
 
       desc "stop", "Stops the Padrino application"
       def stop
-        require File.dirname(__FILE__) + "/adapter"
+        require File.expand_path(File.dirname(__FILE__) + "/adapter")
         Padrino::Cli::Adapter.stop
       end
 
@@ -44,7 +44,7 @@ module Padrino
         ARGV.concat(args)
         puts "=> Executing Rake #{ARGV.join(' ')} ..."
         ENV['PADRINO_LOG_LEVEL'] ||= "test"
-        require File.dirname(__FILE__) + '/rake'
+        require File.expand_path(File.dirname(__FILE__) + '/rake')
         silence(:stdout) { require 'config/boot' }
         PadrinoTasks.init
       end
@@ -52,13 +52,13 @@ module Padrino
       desc "console", "Boots up the Padrino application irb console"
       def console
         prepare :console
-        require File.dirname(__FILE__) + "/../version"
+        require File.expand_path(File.dirname(__FILE__) + "/../version")
         ARGV.clear
         puts "=> Loading #{options.environment} console (Padrino v.#{Padrino.version})"
         require 'irb'
         require "irb/completion"
         require 'config/boot'
-        require File.dirname(__FILE__) + '/console'
+        require File.expand_path(File.dirname(__FILE__) + '/console')
         IRB.start
       end
 

data/lib/padrino-core/cli/rake.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../tasks'
+require File.expand_path(File.dirname(__FILE__) + '/../tasks')
 require 'rake'
 Rake.application.instance_variable_set(:@rakefile, __FILE__)
 

data/lib/padrino-core/support_lite.rb

@@ -19,6 +19,7 @@
 #   * Hash#to_params
 #   * Hash#symbolize_keys, Hash.symbolize_keys!
 #   * Hash#reverse_merge, Hash#reverse_merge!
+#   * Symbol#to_proc
 #   * SupportLite::OrderedHash
 #
 
@@ -33,6 +34,7 @@ require 'active_support/core_ext/object'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/module'
+require 'active_support/core_ext/symbol'
 require 'active_support/ordered_hash'
 
 ##

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.9.7"
+  s.version = "0.9.9"
 
   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-22}
+  s.date = %q{2010-03-29}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
      "test/test_mounter.rb",
      "test/test_reloader_complex.rb",
      "test/test_reloader_simple.rb",
+     "test/test_rendering.rb",
      "test/test_routing.rb",
      "test/test_server.rb"
   ]
@@ -79,7 +80,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.6"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<usher>, [">= 0.6.2"])
       s.add_runtime_dependency(%q<thor>, [">= 0.13.0"])
@@ -89,8 +90,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
+      s.add_development_dependency(%q<haml>, [">= 2.2.22"])
     else
-      s.add_dependency(%q<sinatra>, [">= 0.9.6"])
+      s.add_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_dependency(%q<i18n>, [">= 0.3.2"])
       s.add_dependency(%q<usher>, [">= 0.6.2"])
       s.add_dependency(%q<thor>, [">= 0.13.0"])
@@ -100,9 +102,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
+      s.add_dependency(%q<haml>, [">= 2.2.22"])
     end
   else
-    s.add_dependency(%q<sinatra>, [">= 0.9.6"])
+    s.add_dependency(%q<sinatra>, [">= 1.0.0"])
     s.add_dependency(%q<i18n>, [">= 0.3.2"])
     s.add_dependency(%q<usher>, [">= 0.6.2"])
     s.add_dependency(%q<thor>, [">= 0.13.0"])
@@ -112,6 +115,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0.9.7"])
     s.add_dependency(%q<rack-test>, [">= 0.5.0"])
     s.add_dependency(%q<webrat>, [">= 0.5.1"])
+    s.add_dependency(%q<haml>, [">= 2.2.22"])
   end
 end
 

data/test/helper.rb

@@ -63,4 +63,35 @@ class Test::Unit::TestCase
   end
 
   alias :response :last_response
+
+  def create_template(name, content, options={})
+    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views")
+    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views/layouts")
+    path  = "/views/#{name}"
+    path += ".#{options.delete(:locale)}" if options[:locale].present?
+    path += ".#{options[:format]}" if options[:format].present?
+    path += ".erb" unless options[:format].to_s =~ /haml|rss|atom/
+    path += ".builder" if options[:format].to_s =~ /rss|atom/
+    file  = File.dirname(__FILE__) + path
+    File.open(file, 'w') { |io| io.write content }
+    file
+  end
+  alias :create_view   :create_template
+  alias :create_layout :create_template
+
+  def remove_views
+    FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
+  end
+
+  def with_template(name, content, options={})
+    # Build a temp layout
+    template = create_template(name, content, options)
+    yield
+  ensure
+    # Remove temp layout
+    File.unlink(template) rescue nil
+    remove_views
+  end
+  alias :with_view   :with_template
+  alias :with_layout :with_template
 end

data/test/test_application.rb

@@ -1,37 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestApplication < Test::Unit::TestCase
-
-  def create_template(name, content, options={})
-    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views")
-    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views/layouts")
-    path  = "/views/#{name}"
-    path += ".#{options.delete(:locale)}" if options[:locale].present?
-    path += ".#{options.delete(:format)}" if options[:format].present?
-    path += ".erb"
-    file  = File.dirname(__FILE__) + path
-    File.open(file, 'w') { |io| io.write content }
-    file
-  end
-  alias :create_view   :create_template
-  alias :create_layout :create_template
-
-  def remove_views
-    FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
-  end
-
-  def with_template(name, content, options={})
-    # Build a temp layout
-    template = create_template(name, content, options)
-    yield
-  ensure
-    # Remove temp layout
-    File.unlink(template) rescue nil
-    remove_views
-  end
-  alias :with_view   :with_template
-  alias :with_layout :with_template
-
   def teardown
     remove_views
   end
@@ -54,7 +23,6 @@ class TestApplication < Test::Unit::TestCase
       assert !PadrinoTestApp.instance_variable_get(:@_configured)
       PadrinoTestApp.send(:setup_application!)
       assert PadrinoTestApp.instance_variable_get(:@_configured)
-      assert !PadrinoTestApp.send(:find_view_path)
       assert !PadrinoTestApp.reload?
       assert 'padrino_test_app', PadrinoTestApp.app_name
       assert 'StandardFormBuilder', PadrinoTestApp.default_builder
@@ -63,232 +31,4 @@ class TestApplication < Test::Unit::TestCase
       assert !PadrinoTestApp.padrino_helpers
     end
   end
-
-  context 'for application layout functionality' do
-
-    should 'get no layout' do
-      mock_app do
-        get("/"){ "no layout" }
-      end
-
-      get "/"
-      assert_equal "no layout", body
-    end
-
-    should 'be compatible with sinatra layout' do
-      mock_app do
-        layout do
-          "this is a <%= yield %>"
-        end
-
-        get("/"){ render :erb, "sinatra layout" }
-      end
-
-      get "/"
-      assert_equal "this is a sinatra layout", body
-    end
-
-    should 'use rails way layout' do
-      with_layout :application, "this is a <%= yield %>" do
-        mock_app do
-          get("/"){ render :erb, "rails way layout" }
-        end
-
-        get "/"
-        assert_equal "this is a rails way layout", body
-      end
-    end
-
-    should 'use rails way for a custom layout' do
-      with_layout "layouts/custom", "this is a <%= yield %>" do
-        mock_app do
-          layout :custom
-          get("/"){ render :erb, "rails way custom layout" }
-        end
-
-        get "/"
-        assert_equal "this is a rails way custom layout", body
-      end
-    end
-
-    should 'not use layout' do
-      with_layout :application, "this is a <%= yield %>" 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
-
-    should 'be compatible with sinatra render' do
-      mock_app do
-        get("/"){ render :erb, "<%= 1+2 %>" }
-      end
-      get "/"
-      assert_equal "3", body
-    end
-
-    should 'be compatible with sinatra views' do
-      with_view :index, "<%= 1+2 %>" do
-        mock_app do
-          get("/foo") { render :erb, :index }
-          get("/bar") { erb :index }
-          get("/dir") { "3" }
-          get("/inj") { erb "<%= 2+1 %>" }
-          get("/rnj") { render :erb, "<%= 2+1 %>" }
-        end
-        get "/foo"
-        assert_equal "3", body
-        get "/bar"
-        assert_equal "3", body
-        get "/dir"
-        assert_equal "3", body
-        get "/inj"
-        assert_equal "3", body
-        get "/rnj"
-        assert_equal "3", body
-      end
-    end
-
-    should 'resolve template engine' do
-      with_view :index, "<%= 1+2 %>" do
-        mock_app do
-          get("/foo") { render :index }
-          get("/bar") { render "/index" }
-        end
-        get "/foo"
-        assert_equal "3", body
-        get "/bar"
-        assert_equal "3", body
-      end
-    end
-
-    should 'reslove template content type' do
-      create_view :foo, "Im Js", :format => :js
-      create_view :foo, "Im Erb"
-      mock_app do
-        get("/foo", :respond_to => :js) { render :foo }
-        get("/bar.js") { render :foo }
-      end
-      get "/foo.js"
-      assert_equal "Im Js", body
-      get "/bar.js"
-      assert_equal "Im Js", body
-      remove_views
-    end
-
-    should 'reslove template locale' do
-      create_view :foo, "Im English", :locale => :en
-      create_view :foo, "Im Italian", :locale => :it
-      mock_app do
-        get("/foo") { render :foo }
-      end
-      I18n.locale = :en
-      get "/foo"
-      assert_equal "Im English", body
-      I18n.locale = :it
-      get "/foo"
-      assert_equal "Im Italian", body
-    end
-
-    should 'resolve template content_type and locale' do
-      create_view :foo, "Im Js",          :format => :js
-      create_view :foo, "Im Erb"
-      create_view :foo, "Im English Erb", :locale => :en
-      create_view :foo, "Im Italian Erb", :locale => :it
-      create_view :foo, "Im English Js",  :format => :js, :locale => :en
-      create_view :foo, "Im Italian Js",  :format => :js, :locale => :it
-      mock_app do
-        get("/foo", :respond_to => [:html, :js]) { render :foo }
-      end
-      I18n.locale = :none
-      get "/foo.js"
-      assert_equal "Im Js", body
-      get "/foo"
-      assert_equal "Im Erb", body
-      I18n.locale = :en
-      get "/foo"
-      assert_equal "Im English Erb", body
-      I18n.locale = :it
-      get "/foo"
-      assert_equal "Im Italian Erb", body
-      I18n.locale = :en
-      get "/foo.js"
-      assert_equal "Im English Js", body
-      I18n.locale = :it
-      get "/foo.js"
-      assert_equal "Im Italian Js", body
-      I18n.locale = :en
-      get "/foo.pk"
-      assert_equal 404, status
-    end
-
-    should 'resolve template content_type and locale with layout' do
-      create_layout :foo, "Hello <%= yield %> in a Js layout",     :format => :js
-      create_layout :foo, "Hello <%= yield %> in a Js-En layout",  :format => :js, :locale => :en
-      create_layout :foo, "Hello <%= yield %> in a Js-It layout",  :format => :js, :locale => :it
-      create_layout :foo, "Hello <%= yield %> in a Erb-En layout", :locale => :en
-      create_layout :foo, "Hello <%= yield %> in a Erb-It layout", :locale => :it
-      create_layout :foo, "Hello <%= yield %> in a Erb layout"
-      create_view   :bar, "Im Js",          :format => :js
-      create_view   :bar, "Im Erb"
-      create_view   :bar, "Im English Erb", :locale => :en
-      create_view   :bar, "Im Italian Erb", :locale => :it
-      create_view   :bar, "Im English Js",  :format => :js, :locale => :en
-      create_view   :bar, "Im Italian Js",  :format => :js, :locale => :it
-      create_view   :bar, "Im a json",      :format => :json
-      mock_app do
-        layout :foo
-        get("/bar", :respond_to => [:html, :js, :json]) { render :bar }
-      end
-      I18n.locale = :none
-      get "/bar.js"
-      assert_equal "Hello Im Js in a Js layout", body
-      get "/bar"
-      assert_equal "Hello Im Erb in a Erb layout", body
-      I18n.locale = :en
-      get "/bar"
-      assert_equal "Hello Im English Erb in a Erb-En layout", body
-      I18n.locale = :it
-      get "/bar"
-      assert_equal "Hello Im Italian Erb in a Erb-It layout", body
-      I18n.locale = :en
-      get "/bar.js"
-      assert_equal "Hello Im English Js in a Js-En layout", body
-      I18n.locale = :it
-      get "/bar.js"
-      assert_equal "Hello Im Italian Js in a Js-It layout", body
-      I18n.locale = :en
-      get "/bar.json"
-      assert_equal "Im a json", body
-      get "/bar.pk"
-      assert_equal 404, status
-    end
-
-    should 'renders erb with blocks' do
-      mock_app do
-        def container
-          @_out_buf << "THIS."
-          yield
-          @_out_buf << "SPARTA!"
-        end
-        def is; "IS."; end
-        get '/' do
-          render :erb, '<% container do %> <%= is %> <% end %>'
-        end
-      end
-      get '/'
-      assert ok?
-      assert_equal 'THIS. IS. SPARTA!', body
-    end
-  end
-end
+end

data/test/test_core.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestCore < Test::Unit::TestCase
 

data/test/test_dependencies.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestDependencies < Test::Unit::TestCase
   context 'when we require a dependency that have another dependecy' do

data/test/test_logger.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestPadrinoLogger < Test::Unit::TestCase
 

data/test/test_mounter.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestMounter < Test::Unit::TestCase
 

data/test/test_reloader_complex.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/helper'
-require 'fixtures/apps/complex'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/complex')
 
 class TestComplexReloader < Test::Unit::TestCase
 

data/test/test_reloader_simple.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'fixtures/apps/simple'
 
 class TestSimpleReloader < Test::Unit::TestCase
@@ -7,16 +7,16 @@ class TestSimpleReloader < Test::Unit::TestCase
 
     should 'reset routes' do
       mock_app do
-        1.step(10).each do |i|
+        (1..10).each do |i|
           get("/#{i}") { "Foo #{i}" }
         end
       end
-      1.step(10).each do |i|
+      (1..10).each do |i|
         get "/#{i}"
         assert_equal "Foo #{i}", body
       end
       @app.reset_routes!
-      1.step(10).each do |i|
+      (1..10).each do |i|
         get "/#{i}"
         assert_equal 404, status
       end

data/test/test_rendering.rb

@@ -0,0 +1,297 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestRendering < Test::Unit::TestCase
+  def teardown
+    remove_views
+  end
+
+  context 'for application layout functionality' do
+
+    should 'get no layout' do
+      mock_app do
+        get("/"){ "no layout" }
+      end
+
+      get "/"
+      assert_equal "no layout", body
+    end
+
+    should 'be compatible with sinatra layout' do
+      mock_app do
+        layout do
+          "this is a <%= yield %>"
+        end
+
+        get("/"){ render :erb, "sinatra layout" }
+      end
+
+      get "/"
+      assert_equal "this is a sinatra layout", body
+    end
+
+    should 'use rails way layout' do
+      with_layout :application, "this is a <%= yield %>" do
+        mock_app do
+          get("/"){ render :erb, "rails way layout" }
+        end
+
+        get "/"
+        assert_equal "this is a rails way layout", body
+      end
+    end
+
+    should 'use rails way for a custom layout' do
+      with_layout "layouts/custom", "this is a <%= yield %>" do
+        mock_app do
+          layout :custom
+          get("/"){ render :erb, "rails way custom layout" }
+        end
+
+        get "/"
+        assert_equal "this is a rails way custom layout", body
+      end
+    end
+
+    should 'not use layout' do
+      with_layout :application, "this is a <%= yield %>" 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
+
+    should 'not use layout with js format' do
+      create_layout :application, "this is an <%= yield %>"
+      create_view :foo, "erb file"
+      create_view :foo, "js file", :format => :js
+      mock_app do
+        get('/layout_test', :respond_to => [:html, :js]){ render :foo }
+      end
+      get "/layout_test"
+      assert_equal "this is an erb file", body
+      get "/layout_test.js"
+      assert_equal "js file", body
+      remove_views
+    end
+
+    should 'use correct layout for each format' do
+      create_layout :application, "this is an <%= yield %>"
+      create_layout :application, "document start <%= yield %> end", :format => :xml
+      create_view :foo, "erb file"
+      create_view :foo, "xml file", :format => :xml
+      mock_app do
+        get('/layout_test', :respond_to => [:html, :xml]){ render :foo }
+      end
+      get "/layout_test"
+      assert_equal "this is an erb file", body
+      get "/layout_test.xml"
+      assert_equal "document start xml file end", body
+      remove_views
+    end
+  end
+
+  context 'for application render functionality' do
+
+    should 'be compatible with sinatra render' do
+      mock_app do
+        get("/"){ render :erb, "<%= 1+2 %>" }
+      end
+      get "/"
+      assert_equal "3", body
+    end
+
+    should 'be compatible with sinatra views' do
+      with_view :index, "<%= 1+2 %>" do
+        mock_app do
+          get("/foo") { render :erb, :index }
+          get("/bar") { erb :index }
+          get("/dir") { "3" }
+          get("/inj") { erb "<%= 2+1 %>" }
+          get("/rnj") { render :erb, "<%= 2+1 %>" }
+        end
+        get "/foo"
+        assert_equal "3", body
+        get "/bar"
+        assert_equal "3", body
+        get "/dir"
+        assert_equal "3", body
+        get "/inj"
+        assert_equal "3", body
+        get "/rnj"
+        assert_equal "3", body
+      end
+    end
+
+    should 'resolve template engine' do
+      with_view :index, "<%= 1+2 %>" do
+        mock_app do
+          get("/foo") { render :index }
+          get("/bar") { render "/index" }
+        end
+        get "/foo"
+        assert_equal "3", body
+        get "/bar"
+        assert_equal "3", body
+      end
+    end
+
+    should 'resolve template content type' do
+      create_view :foo, "Im Js", :format => :js
+      create_view :foo, "Im Erb"
+      mock_app do
+        get("/foo", :respond_to => :js) { render :foo }
+        get("/bar.js") { render :foo }
+      end
+      get "/foo.js"
+      assert_equal "Im Js", body
+      get "/bar.js"
+      assert_equal "Im Js", body
+      remove_views
+    end
+
+    should 'resolve with explicit template format' do
+      create_view :foo, "Im Js", :format => :js
+      create_view :foo, "Im Haml", :format => :haml
+      create_view :foo, "Im Xml", :format => :xml
+      mock_app do
+        get("/foo_normal", :respond_to => :js) { render 'foo' }
+        get("/foo_haml", :respond_to => :js) { render 'foo.haml' }
+        get("/foo_xml", :respond_to => :js) { render 'foo.xml' }
+      end
+      get "/foo_normal.js"
+      assert_equal "Im Js", body
+      get "/foo_haml.js"
+      assert_equal "Im Haml\n", body
+      get "/foo_xml.js"
+      assert_equal "Im Xml", body
+      remove_views
+    end
+
+    should "ignore files ending in tilde and not render them" do
+      create_view :foo, "Im Wrong", :format => 'haml~'
+      create_view :foo, "Im Haml",  :format => :haml
+      create_view :bar, "Im Haml backup", :format => 'haml~'
+      mock_app do
+        get('/foo') { render 'foo' }
+        get('/bar') { render 'bar' }
+      end
+      get '/foo'
+      assert_equal "Im Haml\n", body
+      assert_raises(Padrino::Rendering::TemplateNotFound) { get '/bar' }
+      remove_views
+    end
+
+    should 'resolve template locale' do
+      create_view :foo, "Im English", :locale => :en
+      create_view :foo, "Im Italian", :locale => :it
+      mock_app do
+        get("/foo") { render :foo }
+      end
+      I18n.locale = :en
+      get "/foo"
+      assert_equal "Im English", body
+      I18n.locale = :it
+      get "/foo"
+      assert_equal "Im Italian", body
+    end
+
+    should 'resolve template content_type and locale' do
+      create_view :foo, "Im Js",          :format => :js
+      create_view :foo, "Im Erb"
+      create_view :foo, "Im English Erb", :locale => :en
+      create_view :foo, "Im Italian Erb", :locale => :it
+      create_view :foo, "Im English Js",  :format => :js, :locale => :en
+      create_view :foo, "Im Italian Js",  :format => :js, :locale => :it
+      mock_app do
+        get("/foo", :respond_to => [:html, :js]) { render :foo }
+      end
+      I18n.locale = :none
+      get "/foo.js"
+      assert_equal "Im Js", body
+      get "/foo"
+      assert_equal "Im Erb", body
+      I18n.locale = :en
+      get "/foo"
+      assert_equal "Im English Erb", body
+      I18n.locale = :it
+      get "/foo"
+      assert_equal "Im Italian Erb", body
+      I18n.locale = :en
+      get "/foo.js"
+      assert_equal "Im English Js", body
+      I18n.locale = :it
+      get "/foo.js"
+      assert_equal "Im Italian Js", body
+      I18n.locale = :en
+      get "/foo.pk"
+      assert_equal 404, status
+    end
+
+    should 'resolve template content_type and locale with layout' do
+      create_layout :foo, "Hello <%= yield %> in a Js layout",     :format => :js
+      create_layout :foo, "Hello <%= yield %> in a Js-En layout",  :format => :js, :locale => :en
+      create_layout :foo, "Hello <%= yield %> in a Js-It layout",  :format => :js, :locale => :it
+      create_layout :foo, "Hello <%= yield %> in a Erb-En layout", :locale => :en
+      create_layout :foo, "Hello <%= yield %> in a Erb-It layout", :locale => :it
+      create_layout :foo, "Hello <%= yield %> in a Erb layout"
+      create_view   :bar, "Im Js",          :format => :js
+      create_view   :bar, "Im Erb"
+      create_view   :bar, "Im English Erb", :locale => :en
+      create_view   :bar, "Im Italian Erb", :locale => :it
+      create_view   :bar, "Im English Js",  :format => :js, :locale => :en
+      create_view   :bar, "Im Italian Js",  :format => :js, :locale => :it
+      create_view   :bar, "Im a json",      :format => :json
+      mock_app do
+        layout :foo
+        get("/bar", :respond_to => [:html, :js, :json]) { render :bar }
+      end
+      I18n.locale = :none
+      get "/bar.js"
+      assert_equal "Hello Im Js in a Js layout", body
+      get "/bar"
+      assert_equal "Hello Im Erb in a Erb layout", body
+      I18n.locale = :en
+      get "/bar"
+      assert_equal "Hello Im English Erb in a Erb-En layout", body
+      I18n.locale = :it
+      get "/bar"
+      assert_equal "Hello Im Italian Erb in a Erb-It layout", body
+      I18n.locale = :en
+      get "/bar.js"
+      assert_equal "Hello Im English Js in a Js-En layout", body
+      I18n.locale = :it
+      get "/bar.js"
+      assert_equal "Hello Im Italian Js in a Js-It layout", body
+      I18n.locale = :en
+      get "/bar.json"
+      assert_equal "Im a json", body
+      get "/bar.pk"
+      assert_equal 404, status
+    end
+
+    should 'renders erb with blocks' do
+      mock_app do
+        def container
+          @_out_buf << "THIS."
+          yield
+          @_out_buf << "SPARTA!"
+        end
+        def is; "IS."; end
+        get '/' do
+          render :erb, '<% container do %> <%= is %> <% end %>'
+        end
+      end
+      get '/'
+      assert ok?
+      assert_equal 'THIS. IS. SPARTA!', body
+    end
+  end
+
+end

data/test/test_routing.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestRouting < Test::Unit::TestCase
 

data/test/test_server.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 module Rack::Handler
   class Mock

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-29 00:00:00 -07:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 9
-        - 6
-        version: 0.9.6
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -160,6 +160,20 @@ dependencies:
         version: 0.5.1
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 22
+        version: 2.2.22
+  type: :development
+  version_requirements: *id011
 description: The Padrino core gem required for use of this framework
 email: padrinorb@gmail.com
 executables: 
@@ -215,6 +229,7 @@ files:
 - test/test_mounter.rb
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
+- test/test_rendering.rb
 - test/test_routing.rb
 - test/test_server.rb
 has_rdoc: true