bmizerany-sinatra 0.3.2 → 0.8.9

data/test/templates_test.rb

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe 'Templating' do
+  def render_app(&block)
+    mock_app {
+      def render_test(template, data, options, &block)
+        inner = block ? block.call : ''
+        data + inner
+      end
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+      template(:layout3) { "Layout 3!\n" }
+    }
+    get '/'
+  end
+
+  def with_default_layout
+    layout = File.dirname(__FILE__) + '/views/layout.test'
+    File.open(layout, 'wb') { |io| io.write "Layout!\n" }
+    yield
+  ensure
+    File.unlink(layout) rescue nil
+  end
+
+  it 'renders String templates directly' do
+    render_app { render :test, 'Hello World' }
+    assert ok?
+    assert_equal 'Hello World', body
+  end
+
+  it 'renders Proc templates using the call result' do
+    render_app { render :test, Proc.new {'Hello World'} }
+    assert ok?
+    assert_equal 'Hello World', body
+  end
+
+  it 'looks up Symbol templates in views directory' do
+    render_app { render :test, :hello }
+    assert ok?
+    assert_equal "Hello World!\n", body
+  end
+
+  it 'uses the default layout template if not explicitly overridden' do
+    with_default_layout do
+      render_app { render :test, :hello }
+      assert ok?
+      assert_equal "Layout!\nHello World!\n", body
+    end
+  end
+
+  it 'uses the default layout template if not really overriden' do
+    with_default_layout do
+      render_app { render :test, :hello, :layout => true }
+      assert ok?
+      assert_equal "Layout!\nHello World!\n", body
+    end
+  end
+
+  it 'uses the layout template specified' do
+    render_app { render :test, :hello, :layout => :layout2 }
+    assert ok?
+    assert_equal "Layout 2!\nHello World!\n", body
+  end
+
+  it 'uses layout templates defined with the #template method' do
+    render_app { render :test, :hello, :layout => :layout3 }
+    assert ok?
+    assert_equal "Layout 3!\nHello World!\n", body
+  end
+
+  it 'loads templates from source file with use_in_file_templates!' do
+    mock_app {
+      use_in_file_templates!
+    }
+    assert_equal "this is foo\n\n", @app.templates[:foo]
+    assert_equal "X\n= yield\nX\n", @app.templates[:layout]
+  end
+end
+
+__END__
+
+@@ foo
+this is foo
+
+@@ layout
+X
+= yield
+X

data/test/views/hello.builder

@@ -0,0 +1 @@
+xml.exclaim "You're my boy, #{@name}!"

data/test/views/hello.erb

@@ -0,0 +1 @@
+Hello <%= 'World' %>

data/test/views/hello.haml

@@ -0,0 +1 @@
+%h1 Hello From Haml

data/test/views/hello.sass

@@ -0,0 +1,2 @@
+#sass
+  :background-color #FFF

data/test/views/hello.test

@@ -0,0 +1 @@
+Hello World!

data/test/views/layout2.builder

@@ -0,0 +1,3 @@
+xml.layout do
+  xml << yield
+end

data/test/views/layout2.erb

@@ -0,0 +1,2 @@
+ERB Layout!
+<%= yield %>

data/test/views/layout2.haml

@@ -0,0 +1,2 @@
+%h1 HAML Layout!
+%p= yield

data/test/views/layout2.test

@@ -0,0 +1 @@
+Layout 2!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bmizerany-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.8.9
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-02 00:00:00 -07:00
+date: 2009-01-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.9.0
     version: 
 description: Classy web-development dressed in a DSL
 email: 
@@ -31,53 +31,85 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- ChangeLog
+- AUTHORS
+- CHANGES
 - LICENSE
 - README.rdoc
 - Rakefile
-- images/404.png
-- images/500.png
+- compat/app_test.rb
+- compat/application_test.rb
+- compat/builder_test.rb
+- compat/custom_error_test.rb
+- compat/erb_test.rb
+- compat/events_test.rb
+- compat/filter_test.rb
+- compat/haml_test.rb
+- compat/helper.rb
+- compat/mapped_error_test.rb
+- compat/pipeline_test.rb
+- compat/public/foo.xml
+- compat/sass_test.rb
+- compat/sessions_test.rb
+- compat/streaming_test.rb
+- compat/sym_params_test.rb
+- compat/template_test.rb
+- compat/use_in_file_templates_test.rb
+- compat/views/foo.builder
+- compat/views/foo.erb
+- compat/views/foo.haml
+- compat/views/foo.sass
+- compat/views/foo_layout.erb
+- compat/views/foo_layout.haml
+- compat/views/layout_test/foo.builder
+- compat/views/layout_test/foo.erb
+- compat/views/layout_test/foo.haml
+- compat/views/layout_test/foo.sass
+- compat/views/layout_test/layout.builder
+- compat/views/layout_test/layout.erb
+- compat/views/layout_test/layout.haml
+- compat/views/layout_test/layout.sass
+- compat/views/no_layout/no_layout.builder
+- compat/views/no_layout/no_layout.haml
 - lib/sinatra.rb
-- lib/sinatra/test/methods.rb
+- lib/sinatra/base.rb
+- lib/sinatra/compat.rb
+- lib/sinatra/images/404.png
+- lib/sinatra/images/500.png
+- lib/sinatra/main.rb
+- lib/sinatra/test.rb
+- lib/sinatra/test/bacon.rb
 - lib/sinatra/test/rspec.rb
 - lib/sinatra/test/spec.rb
 - lib/sinatra/test/unit.rb
 - sinatra.gemspec
-- test/app_test.rb
-- test/application_test.rb
+- test/base_test.rb
 - test/builder_test.rb
-- test/custom_error_test.rb
+- test/data/reload_app_file.rb
 - test/erb_test.rb
-- test/event_context_test.rb
-- test/events_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
 - test/helper.rb
+- test/helpers_test.rb
 - test/mapped_error_test.rb
-- test/pipeline_test.rb
-- test/public/foo.xml
+- test/middleware_test.rb
+- test/options_test.rb
+- test/reload_test.rb
+- test/request_test.rb
+- test/result_test.rb
+- test/routing_test.rb
 - test/sass_test.rb
-- test/sessions_test.rb
-- test/streaming_test.rb
-- test/sym_params_test.rb
-- test/template_test.rb
-- test/use_in_file_templates_test.rb
-- test/views/foo.builder
-- test/views/foo.erb
-- test/views/foo.haml
-- test/views/foo.sass
-- test/views/foo_layout.erb
-- test/views/foo_layout.haml
-- test/views/layout_test/foo.builder
-- test/views/layout_test/foo.erb
-- test/views/layout_test/foo.haml
-- test/views/layout_test/foo.sass
-- test/views/layout_test/layout.builder
-- test/views/layout_test/layout.erb
-- test/views/layout_test/layout.haml
-- test/views/layout_test/layout.sass
-- test/views/no_layout/no_layout.builder
-- test/views/no_layout/no_layout.haml
+- test/sinatra_test.rb
+- test/static_test.rb
+- test/templates_test.rb
+- test/views/hello.builder
+- test/views/hello.erb
+- test/views/hello.haml
+- test/views/hello.sass
+- test/views/hello.test
+- test/views/layout2.builder
+- test/views/layout2.erb
+- test/views/layout2.haml
+- test/views/layout2.test
 has_rdoc: true
 homepage: http://sinatra.rubyforge.org
 post_install_message: 
@@ -110,20 +142,20 @@ signing_key:
 specification_version: 2
 summary: Classy web-development dressed in a DSL
 test_files: 
-- test/app_test.rb
-- test/application_test.rb
+- test/base_test.rb
 - test/builder_test.rb
-- test/custom_error_test.rb
 - test/erb_test.rb
-- test/event_context_test.rb
-- test/events_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
+- test/helpers_test.rb
 - test/mapped_error_test.rb
-- test/pipeline_test.rb
+- test/middleware_test.rb
+- test/options_test.rb
+- test/reload_test.rb
+- test/request_test.rb
+- test/result_test.rb
+- test/routing_test.rb
 - test/sass_test.rb
-- test/sessions_test.rb
-- test/streaming_test.rb
-- test/sym_params_test.rb
-- test/template_test.rb
-- test/use_in_file_templates_test.rb
+- test/sinatra_test.rb
+- test/static_test.rb
+- test/templates_test.rb

data/ChangeLog

@@ -1,78 +0,0 @@
-= 0.3.2
-
-  * BUG: Static and send_file read entire file into String before
-    sending. Updated to stream with 8K chunks instead.
-
-  * Rake tasks and assets for building basic documentation website.
-    See http://sinatra.rubyforge.org
-
-  * Various minor doc fixes.
-
-= 0.3.1
-
-  * Unbreak optional path parameters [jeremyevans]
-
-= 0.3.0
-
-  * Add sinatra.gemspec w/ support for github gem builds. Forks can now
-    enable the build gem option in github to get free username-sinatra.gem
-    builds: gem install username-sinatra.gem --source=http://gems.github.com/
-
-  * Require rack-0.4 gem; removes frozen rack dir.
-
-  * Basic RSpec support; require 'sinatra/test/rspec' instead of
-    'sinatra/test/spec' to use. [avdi]
-
-  * before filters can modify request environment vars used for
-    routing (e.g., PATH_INFO, REQUEST_METHOD, etc.) for URL rewriting
-    type functionality.
-
-  * In-file templates now uses @@ instead of ## as template separator.
-
-  * Top-level environment test predicates: development?, test?, production?
-
-  * Top-level "set", "enable", and "disable" methods for tweaking
-    app options. [rtomayko]
-
-  * Top-level "use" method for building Rack middleware pipelines
-    leading to app. See README for usage. [rtomayko]
-
-  * New "reload" option - set false to disable reloading in development.
-
-  * New "host" option - host/ip to bind to [cschneid]
-
-  * New "app_file" option - override the file to reload in development
-    mode [cschneid]
-
-  * Development error/not_found page cleanup [sr, adamwiggins]
-
-  * Remove a bunch of core extensions (String#to_param, String#from_param,
-    Hash#from_params, Hash#to_params, Hash#symbolize_keys, Hash#pass)
-
-  * Various grammar and formatting fixes to README; additions on
-    community and contributing [cypher]
-
-  * Build RDoc using Hanna template: http://sinatrarb.rubyforge.org/api
-
-  * Specs, documentation and fixes for splat'n routes [vic]
-
-  * Fix whitespace errors across all source files. [rtomayko]
-
-  * Fix streaming issues with Mongrel (body not closed). [bmizerany]
-
-  * Fix various issues with environment not being set properly (configure
-    blocks not running, error pages not registering, etc.) [cypher]
-
-  * Fix to allow locals to be passed to ERB templates [cschneid]
-
-  * Fix locking issues causing random errors during reload in development.
-
-  * Fix for escaped paths not resolving static files [Matthew Walker]
-
-= 0.2.1
-
-  * File upload fix and minor tweaks.
-
-= 0.2.0
-
-  * Initial gem release of 0.2 coebase.

data/lib/sinatra/test/methods.rb

@@ -1,76 +0,0 @@
-module Sinatra
-
-  module Test
-
-    module Methods
-      include Rack::Utils
-
-      ENV_KEY_NAMES = {
-        :accept => "HTTP_ACCEPT",
-        :agent => "HTTP_USER_AGENT",
-        :host => "HTTP_HOST",
-        :session => "HTTP_COOKIE",
-        :cookies => "HTTP_COOKIE",
-        :content_type => "CONTENT_TYPE"
-      }
-
-      def session(data, key = 'rack.session')
-        data = data.from_params if data.respond_to?(:from_params)
-        "#{escape(key)}=#{[Marshal.dump(data)].pack("m*")}"
-      end
-
-      def normalize_rack_environment(env)
-        env.inject({}) do |hash,(k,v)|
-          hash[ENV_KEY_NAMES[k] || k] = v
-          hash
-        end
-      end
-
-      def hash_to_param_string(hash)
-        hash.map { |pair| pair.map{|v|escape(v)}.join('=') }.join('&')
-      end
-
-      %w(get head post put delete).each do |verb|
-        http_method = verb.upcase
-        define_method("#{verb}_it") do |path, *args|
-          @request = Rack::MockRequest.new(Sinatra.build_application)
-          opts, input =
-            case args.size
-            when 2 # input, env
-              input, env = args
-              [env, input]
-            when 1 # params
-              if (data = args.first).kind_of?(Hash)
-                env = (data.delete(:env) || {})
-                [env, hash_to_param_string(data)]
-              else
-                [{}, data]
-              end
-            when 0
-              [{}, '']
-            else
-              raise ArgumentError, "zero, one, or two arguments expected"
-            end
-          opts = normalize_rack_environment(opts)
-          opts[:input] ||= input
-          @response = @request.request(http_method, path, opts)
-        end
-      end
-
-      def follow!
-        get_it(@response.location)
-      end
-
-      def method_missing(name, *args)
-        if @response.respond_to?(name)
-          @response.send(name, *args)
-        else
-          super
-        end
-      end
-
-    end
-
-  end
-
-end