padrino-core 0.9.4 → 0.9.5

data/README.rdoc

@@ -161,7 +161,19 @@ and even configure the respond_to for each route:
       end
     end
   end
-  
+
+or auto lookup for current locale or content_type
+
+  # app/controllers/example.rb
+  SimpleApp.controllers :admin do
+    get :show, :with => :id, :respond_to => [html, :js] do
+      render "admin/show"
+    end
+  end
+
+When you visit :+show+ and your I18n.locale == :ru Padrino try to look for "admin/show.ru.js.*" if nothing match that path
+they try "admin/show.ru.*" then "admin/show.js.*" if none match return "admin/show.erb" (or other engine i.e. haml)
+
 For a complete overview of the routing and controller system, check out the 
 {Routing and Controller guide}[http://wiki.github.com/padrino/padrino-framework/controllers].
   

data/Rakefile

@@ -13,7 +13,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.4"
+    gem.add_runtime_dependency     "sinatra",       ">= 0.9.6"
     gem.add_runtime_dependency     "i18n",          ">= 0.3.2"
     gem.add_runtime_dependency     "usher",         ">= 0.6.2"
     gem.add_runtime_dependency     "thor",          ">= 0.13.0"

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/bin/padrino

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-$:.unshift File.dirname(__FILE__) + "/../lib"
+
+padrino_core_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
 
 require 'padrino-core/cli/base'
 

data/lib/padrino-core/application.rb

@@ -189,7 +189,7 @@ module Padrino
         # Returns the load_paths for the application (relative to the application root)
         #
         def load_paths
-          @load_paths ||= ["urls.rb", "config/urls.rb", "mailers/*.rb", "controllers/**/*.rb", "controllers.rb", "helpers/*.rb"]
+          @load_paths ||= ["urls.rb", "config/urls.rb", "mailers/*.rb", "mailers.rb", "controllers/**/*.rb", "controllers.rb", "helpers/**/*.rb", "helpers.rb"]
         end
 
         ##

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

@@ -14,13 +14,16 @@ module Padrino
       #
       def render(engine, data=nil, options={}, locals={}, &block)
         clear_template_cache!
+
         # If engine is an hash we convert to json
         return engine.to_json if engine.is_a?(Hash)
+
         # If an engine is a string probably is a path so we try to resolve them
-        if data.nil?
-          data   = engine.to_sym
-          engine = resolve_template_engine(engine, options)
-        end
+        data, engine = *resolve_template(engine, options) if data.nil?
+
+        # We need for Sinatra 1.0 an outvar for erb and erubis templates
+        options[:outvar] ||= '@_out_buf' if [:erb, :erubis].include?(engine)
+
         # Use layout as rails do
         if (options[:layout].nil? || options[:layout] == true) && !self.class.templates.has_key?(:layout)
           layout = self.class.instance_variable_defined?(:@_layout) ? self.class.instance_variable_get(:@_layout) : :application
@@ -34,15 +37,28 @@ module Padrino
       end
 
       ##
-      # Returns the template engine (i.e haml) to use for a given template_path
-      # resolve_template_engine('users/new') => :haml
-      #
-      def resolve_template_engine(template_path, options={})
+      # Returns the template path and engine that match (if presents) content_type, I18n.locale.
+      # 
+      # ==== Example
+      # 
+      #   get "/foo", :respond_to => [:html, :js] do; render 'path/to/foo'; end
+      #   # If you request "/foo.js" with I18n.locale == :ru => [:"/path/to/foo.ru.js", :erb]
+      #   # If you request "/foo" with I18n.locale == :de => [:"/path/to/foo.de.haml", :haml]
+      # 
+      def resolve_template(template_path, options={})
         view_path = options.delete(:views) || self.options.views || self.class.views || "./views"
-        resolved_template_path = File.join(view_path, template_path.to_s + ".*")
-        template_file = Dir[resolved_template_path].first
+        template_path   = File.join(view_path, template_path.to_s)
+        regexs = [/^[^\.]+\.[^\.]+$/]
+        regexs.unshift(/^[^\.]+\.#{content_type}\.[^\.]+$/) if content_type.present?
+        if defined?(I18n) && I18n.locale.present?
+          regexs.unshift(/^[^\.]+\.#{I18n.locale}\.[^\.]+$/)
+          regexs.unshift(/^[^\.]+\.#{I18n.locale}\.#{content_type}\.[^\.]+$/) if content_type.present?
+        end
+        template_file = regexs.map { |regex| Dir[template_path + ".*"].find { |file| File.basename(file) =~ regex } }.compact.first
         raise "Template path '#{template_path}' could not be located in views!" unless template_file
-        template_engine = File.extname(template_file)[1..-1].to_sym
+        engine   = File.extname(template_file)[1..-1]
+        template = template_file.gsub(view_path, '').gsub(/\.#{engine}$/, '')
+        [template.to_sym, engine.to_sym]
       end
 
       ##
@@ -50,7 +66,7 @@ module Padrino
       # clear_template_cache!
       #
       def clear_template_cache!
-        # TODO: remove these @template_cache.respond_to?(:clear) when sinatra 1.0 will be released
+        # 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

data/lib/padrino-core/reloader.rb

@@ -35,10 +35,10 @@ module Padrino
 
     ##
     # You can exclude some folders from reload its contents.
-    # Defaults excluded directories of Padrino.root are: test, spec, features, tmp, config, lib and public
+    # Defaults excluded directories of Padrino.root are: test, spec, features, tmp, config, lib, db and public
     # 
     def self.exclude
-      @_exclude ||= %w(test spec tmp features config lib public).map { |path| Padrino.root(path) }
+      @_exclude ||= %w(test spec tmp features config lib public db).map { |path| Padrino.root(path) }
     end
 
     ##

data/lib/padrino-core/tasks.rb

@@ -19,6 +19,5 @@ module Padrino
     def self.files
       @files ||= []
     end
-
   end # Tasks
 end # Padrino

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   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-03}
+  s.date = %q{2010-03-11}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}
@@ -78,7 +78,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.4"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.6"])
       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,7 +89,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
-      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_dependency(%q<sinatra>, [">= 0.9.6"])
       s.add_dependency(%q<i18n>, [">= 0.3.2"])
       s.add_dependency(%q<usher>, [">= 0.6.2"])
       s.add_dependency(%q<thor>, [">= 0.13.0"])
@@ -101,7 +101,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+    s.add_dependency(%q<sinatra>, [">= 0.9.6"])
     s.add_dependency(%q<i18n>, [">= 0.3.2"])
     s.add_dependency(%q<usher>, [">= 0.6.2"])
     s.add_dependency(%q<thor>, [">= 0.13.0"])

data/test/test_application.rb

@@ -14,16 +14,33 @@ class TestApplication < Test::Unit::TestCase
     FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
   end
 
-  def with_view(name, content)
-    # Build a temp layout
+  def create_view(name, content, options={})
     FileUtils.mkdir_p(File.dirname(__FILE__) + "/views")
-    layout = File.dirname(__FILE__) + "/views/#{name}.erb"
-    File.open(layout, 'wb') { |io| io.write content }
+    path   = "/views/#{name}"
+    path  += ".#{options.delete(:locale)}" if options[:locale].present?
+    path  += ".#{options.delete(:format)}" if options[:format].present?
+    path  += ".erb"
+    view   = File.dirname(__FILE__) + path
+    File.open(view, 'wb') { |io| io.write content }
+    view
+  end
+
+  def remove_views
+    FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
+  end
+
+  def with_view(name, content, options={})
+    # Build a temp layout
+    view = create_view(name, content, options)
     yield
   ensure
     # Remove temp layout
-    File.unlink(layout) rescue nil
-    FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
+    File.unlink(view) rescue nil
+    remove_views
+  end
+
+  def teardown
+    remove_views
   end
 
   class PadrinoTestApp < Padrino::Application; end
@@ -146,5 +163,82 @@ class TestApplication < Test::Unit::TestCase
         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 '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

metadata

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