sinatra-support 1.0.3 → 1.0.4

data/HISTORY.md

@@ -1,3 +1,9 @@
+v1.0.4 - May 15, 2011
+---------------------
+
+### Added:
+  * Implement Sinatra::MultiRender
+
 v1.0.3 - Mar 30, 2011
 ---------------------
 

data/lib/sinatra/support.rb

@@ -11,6 +11,7 @@ module Sinatra
   autoload :Numeric,         File.expand_path('../support/numeric', __FILE__)
   autoload :IfHelpers,       File.expand_path('../support/ifhelpers', __FILE__)
   autoload :I18nSupport,     File.expand_path('../support/i18nsupport', __FILE__)
+  autoload :MultiRender,     File.expand_path('../support/multirender', __FILE__)
 
   module Support
   end

data/lib/sinatra/support/multirender.rb

@@ -0,0 +1,75 @@
+# Allows rendering from multiple engines or renderers.
+#
+# == Usage
+#
+#   require 'sinatra/support/multirender'
+#
+#   class Main < Sinatra::Base
+#     register Sinatra::MultiRender
+#
+#     # These two settings are optional.
+#     set :multi_views,   [ './views', './skin/default' ]
+#     set :multi_engines, [ :erb, :haml ]
+#
+#     get '/' do
+#       show :home
+#     end
+#   end
+#
+# Using #show will automatically find the appropriate template, trying the
+# following variations:
+#
+#   ./views/home.erb
+#   ./views/home.haml
+#   ./skin/default/home.erb
+#   ./skin/default/home.haml
+#
+module Sinatra::MultiRender
+  def self.registered(app)
+    views = app.views || './views'
+
+    app.set :multi_engines, Tilt.mappings.keys  unless app.respond_to?(:template_engines)
+    app.set :multi_views,   views               unless app.respond_to?(:multi_views)
+
+    app.helpers Helpers
+  end
+
+  module Helpers
+    # Shows a given template.
+    #
+    # You may pass +options[:engine]+ to specify which engines you will want
+    # to limit the search to. This defaults to +App.multi_engines+, or Tilt's
+    # supported engines if that's not defined.
+    #
+    # You may pass +options[:views]+ to specify which directories to scour.
+    # This defaults to +App.multi_views+, or +App.views+.
+    #
+    # == Examples
+    #
+    #   # Only HAML
+    #   show :home, engine: :haml
+    #
+    #   # HAML or ERB, favoring HAML first
+    #   show :home, engine: [:haml, :erb]
+    #
+    #   # Only look at certain paths
+    #   show :home, views: [ './views', './skins/default' ]
+    #
+    def show(template, options={}, locals={}, &block)
+      paths     = [*(options[:views]  || settings.multi_views)].join(',')
+      engines   = [*(options[:engine] || settings.multi_engines)].join(',')
+
+      t = @template_cache.fetch template, options do
+        template = Dir["{#{paths}}/#{template}.{#{engines}}"].first  or raise Errno::ENOENT
+
+        ext      = File.extname(template)[1..-1].to_sym
+        options  = settings.send(ext).merge(options)  if settings.respond_to?(ext)
+        engine   = Tilt[ext]  or raise "Template engine not found: #{ext}"
+
+        engine.new(template, 0, options)
+      end
+
+      t.render(self, locals, &block)  if t
+    end
+  end
+end

data/lib/sinatra/support/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Support
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
 
     def self.version
       VERSION

data/test/fixtures/multirender/views_1/dupe.erb

@@ -0,0 +1 @@
+<span>From ERB</span>

data/test/fixtures/multirender/views_1/dupe.haml

@@ -0,0 +1 @@
+%span From HAML

data/test/fixtures/multirender/views_1/home.haml

@@ -0,0 +1 @@
+%html from 1

data/test/fixtures/multirender/views_2/contact.haml

@@ -0,0 +1 @@
+%html contact

data/test/fixtures/multirender/views_2/home.haml

@@ -0,0 +1 @@
+%html from 2

data/test/test_multirender.rb

@@ -0,0 +1,60 @@
+require File.expand_path('../helper', __FILE__)
+
+class MultiRenderTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  class App < Sinatra::Base
+    register Sinatra::MultiRender
+
+    set :multi_views, [
+      File.expand_path('../fixtures/multirender/views_1', __FILE__),
+      File.expand_path('../fixtures/multirender/views_2', __FILE__)
+    ]
+
+    get('/')          { show :home }
+    get('/contact')   { show :contact }
+    get('/dupe/haml') { show :dupe, engine: :haml }
+    get('/dupe/erb')  { show :dupe, engine: [:erb] }
+    get('/dupe/erb2') { show :dupe, engine: [:erb, :haml] }
+  end
+
+  def app
+    App.new
+  end
+
+  test "picking one" do
+    get '/'
+    assert last_response.body.strip == '<html>from 1</html>'
+  end
+
+  test "picking one from the second path" do
+    get '/contact'
+    assert last_response.body.strip == '<html>contact</html>'
+  end
+
+  test "specifying engines" do
+    get '/dupe/haml'
+    assert last_response.body.strip == '<span>From HAML</span>'
+  end
+
+  test "specifying engines (2)" do
+    get '/dupe/erb'
+    assert last_response.body.strip == '<span>From ERB</span>'
+  end
+
+  test "specifying engines (2)" do
+    get '/dupe/erb2'
+    assert last_response.body.strip == '<span>From ERB</span>'
+  end
+
+  test "single view path" do
+    old = App.multi_views
+
+    App.set :multi_views, fixture_path('multirender/views_2')
+
+    get '/'
+    assert last_response.body.strip == '<html>from 2</html>'
+
+    App.set :multi_views, old
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: sinatra-support
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Cyril David
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +08:00
+date: 2011-05-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,12 +112,18 @@ files:
 - lib/sinatra/support/i18nsupport.rb
 - lib/sinatra/support/ifhelpers.rb
 - lib/sinatra/support/jssupport.rb
+- lib/sinatra/support/multirender.rb
 - lib/sinatra/support/numeric.rb
 - lib/sinatra/support/ohmerrorhelpers.rb
 - lib/sinatra/support/version.rb
 - lib/sinatra/support.rb
 - test/fixtures/i18n/en.yml
 - test/fixtures/i18n/tl.yml
+- test/fixtures/multirender/views_1/dupe.erb
+- test/fixtures/multirender/views_1/dupe.haml
+- test/fixtures/multirender/views_1/home.haml
+- test/fixtures/multirender/views_2/contact.haml
+- test/fixtures/multirender/views_2/home.haml
 - test/helper.rb
 - test/test_country.rb
 - test/test_date.rb
@@ -126,6 +132,7 @@ files:
 - test/test_html.rb
 - test/test_htmlhelpers.rb
 - test/test_i18n.rb
+- test/test_multirender.rb
 - test/test_numeric.rb
 - test/test_ohmerror.rb
 - HISTORY.md
@@ -154,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A gem with many essential helpers for creating web apps with Sinatra.