middleman 0.2.5 → 0.2.6

data/.gitmodules

@@ -7,3 +7,6 @@
 [submodule "vendor/rack-test"]
 	path = vendor/rack-test
 	url = git://github.com/brynary/rack-test.git
+[submodule "vendor/sinatra-content-for"]
+	path = vendor/sinatra-content-for
+	url = git://github.com/foca/sinatra-content-for.git

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/middleman.rb

@@ -9,6 +9,9 @@ require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-markaby', 'li
 # Include maruku support
 require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-maruku', 'lib', 'sinatra', 'maruku')
 
+# Include content_for support
+require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-content-for', 'lib', 'sinatra', 'content_for')
+
 class Middleman < Sinatra::Base
   set :app_file, __FILE__
   set :static, true
@@ -17,6 +20,13 @@ class Middleman < Sinatra::Base
     
   helpers Sinatra::Markaby
   helpers Sinatra::Maruku
+  helpers Sinatra::ContentFor
+  
+  helpers do
+    def link_to(title, url="#")
+      %Q{<a href="#{url}">#{title}</a>}
+    end
+  end
   
   def self.run!(options={}, &block)
     set options

data/middleman.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
@@ -64,6 +64,12 @@ Gem::Specification.new do |s|
      "vendor/rack-test/spec/rcov.opts",
      "vendor/rack-test/spec/spec.opts",
      "vendor/rack-test/spec/spec_helper.rb",
+     "vendor/sinatra-content-for/LICENSE",
+     "vendor/sinatra-content-for/README.rdoc",
+     "vendor/sinatra-content-for/Rakefile",
+     "vendor/sinatra-content-for/lib/sinatra/content_for.rb",
+     "vendor/sinatra-content-for/sinatra-content-for.gemspec",
+     "vendor/sinatra-content-for/test/content_for_test.rb",
      "vendor/sinatra-markaby/CHANGES",
      "vendor/sinatra-markaby/LICENSE",
      "vendor/sinatra-markaby/README.rdoc",

data/vendor/sinatra-content-for/LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2008-2009 Nicolas Sanguinetti, entp.com
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/sinatra-content-for/README.rdoc

@@ -0,0 +1,49 @@
+= ContentFor
+
+Small extension for the Sinatra[http://sinatrarb.com] web framework
+that allows you to use the following helpers in your views:
+
+    <% content_for :some_key do %>
+      <chunk of="html">...</chunk>
+    <% end %>
+    
+    <% yield_content :some_key %>
+
+This allows you to capture blocks inside views to be rendered later
+in this request. For example, to populate different parts of your
+layout from your view.
+
+When using this with the Haml rendering engine, you should do the
+following:
+
+    - content_for :some_key do
+      %chunk{ :of => "html" } ...
+
+    = yield_content :some_key
+ 
+<b>Note</b> that with ERB <tt>yield_content</tt> is called <b>without</b>
+an '=' block (<tt><%= %></tt>), but with Haml it uses <tt>= yield_content</tt>.
+
+Using an '=' block in ERB will output the content twice for each block,
+so if you have problems with that, make sure to check for this.
+
+== Usage
+
+If you're writing "classic" style apps, then requring 
+<tt>sinatra/content_for</tt> should be enough. If you're writing
+"classy" apps, then you also need to call 
+<tt>helpers Sinatra::ContentFor</tt> in your app definition.
+
+== And how is this useful?
+
+For example, some of your views might need a few javascript tags and
+stylesheets, but you don't want to force this files in all your pages.
+Then you can put <tt><% yield_content :scripts_and_styles %></tt> on
+your layout, inside the <head> tag, and each view can call 
+<tt>content_for</tt> setting the appropriate set of tags that should 
+be added to the layout.
+
+== Credits
+
+Code by foca[http://github.com/foca], inspired on the Ruby on Rails
+helpers with the same name. Haml support by mattly[http://github.com/mattly].

data/vendor/sinatra-content-for/Rakefile

@@ -0,0 +1,33 @@
+require "rake/testtask"
+
+begin
+  require "hanna/rdoctask"
+rescue LoadError
+  require "rake/rdoctask"
+end
+
+begin
+  require "metric_fu"
+rescue LoadError
+end
+
+begin
+  require "mg"
+  MG.new("sinatra-content-for.gemspec")
+rescue LoadError
+end
+
+desc "Default: run all tests"
+task :default => :test
+
+desc "Run library tests"
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+Rake::RDocTask.new do |rd|
+  rd.main = "README"
+  rd.title = "Documentation for ContentFor"
+  rd.rdoc_files.include("README.rdoc", "LICENSE", "lib/**/*.rb")
+  rd.rdoc_dir = "doc"
+end

data/vendor/sinatra-content-for/lib/sinatra/content_for.rb

@@ -0,0 +1,58 @@
+module Sinatra
+  module ContentFor
+    # Capture a block of content to be rendered later. For example:
+    #
+    #     <% content_for :head do %>
+    #       <script type="text/javascript" src="/foo.js"></script>
+    #     <% end %>
+    #
+    # You can call +content_for+ multiple times with the same key
+    # (in the example +:head+), and when you render the blocks for
+    # that key all of them will be rendered, in the same order you
+    # captured them.
+    #
+    # Your blocks can also receive values, which are passed to them
+    # by <tt>yield_content</tt>
+    def content_for(key, &block)
+      content_blocks[key.to_sym] << block
+    end
+
+    # Render the captured blocks for a given key. For example:
+    #
+    #     <head>
+    #       <title>Example</title>
+    #       <% yield_content :head %>
+    #     </head>
+    #
+    # Would render everything you declared with <tt>content_for 
+    # :head</tt> before closing the <tt><head></tt> tag.
+    #
+    # You can also pass values to the content blocks by passing them
+    # as arguments after the key:
+    #
+    #     <% yield_content :head, 1, 2 %>
+    #
+    # Would pass <tt>1</tt> and <tt>2</tt> to all the blocks registered
+    # for <tt>:head</tt>.
+    #
+    # *NOTICE* that you call this without an <tt>=</tt> sign. IE, 
+    # in a <tt><% %></tt> block, and not in a <tt><%= %></tt> block.
+    def yield_content(key, *args)
+      content_blocks[key.to_sym].map do |content| 
+        if respond_to?(:block_is_haml?) && block_is_haml?(content)
+          capture_haml(*args, &content)
+        else
+          content.call(*args)
+        end
+      end.join
+    end
+
+    private
+
+      def content_blocks
+        @content_blocks ||= Hash.new {|h,k| h[k] = [] }
+      end
+  end
+
+  helpers ContentFor
+end

data/vendor/sinatra-content-for/sinatra-content-for.gemspec

@@ -0,0 +1,34 @@
+Gem::Specification.new do |s|
+  s.name    = "sinatra-content-for"
+  s.version = "0.2"
+  s.date    = "2009-05-09"
+
+  s.description = "Small Sinatra extension to add a content_for helper similar to Rails'"
+  s.summary     = "Small Sinatra extension to add a content_for helper similar to Rails'"
+  s.homepage    = "http://sinatrarb.com"
+
+  s.authors = ["Nicolás Sanguinetti"]
+  s.email   = "contacto@nicolassanguinetti.info"
+
+  s.require_paths     = ["lib"]
+  s.rubyforge_project = "sinatra-ditties"
+  s.has_rdoc          = true
+  s.rubygems_version  = "1.3.1"
+
+  s.add_dependency "sinatra"
+
+  if s.respond_to?(:add_development_dependency)
+    s.add_development_dependency "contest"
+    s.add_development_dependency "sr-mg"
+    s.add_development_dependency "redgreen"
+  end
+
+  s.files = %w[
+.gitignore
+LICENSE
+README.rdoc
+sinatra-content-for.gemspec
+lib/sinatra/content_for.rb
+test/content_for_test.rb
+]
+end

data/vendor/sinatra-content-for/test/content_for_test.rb

@@ -0,0 +1,156 @@
+ENV['RACK_ENV'] = 'test'
+
+begin
+  require 'rack'
+rescue LoadError
+  require 'rubygems'
+  require 'rack'
+end
+
+require 'contest'
+require 'sinatra/test'
+require 'haml'
+
+begin
+  require 'redgreen'
+rescue LoadError
+end
+
+require File.dirname(__FILE__) + '/../lib/sinatra/content_for'
+
+Sinatra::Base.set :environment, :test
+
+module Sinatra
+  class Base
+    set :environment, :test
+    helpers ContentFor
+  end
+end
+
+class Test::Unit::TestCase
+  include Sinatra::Test
+
+  class << self
+    alias_method :it, :test
+  end
+
+  def mock_app(base=Sinatra::Base, &block)
+    @app = Sinatra.new(base, &block)
+  end
+end
+
+class ContentForTest < Test::Unit::TestCase
+  context 'using erb' do
+    def erb_app(view)
+      mock_app {
+        layout { '<% yield_content :foo %>' }
+        get('/') { erb view } 
+      }
+    end
+
+    it 'renders blocks declared with the same key you use when rendering' do
+      erb_app '<% content_for :foo do %>foo<% end %>'
+
+      get '/'
+      assert ok?
+      assert_equal 'foo', body
+    end
+
+    it 'does not render a block with a different key' do
+      erb_app '<% content_for :bar do %>bar<% end %>'
+
+      get '/'
+      assert ok?
+      assert_equal '', body
+    end
+
+    it 'renders multiple blocks with the same key' do
+      erb_app <<-erb_snippet
+        <% content_for :foo do %>foo<% end %>
+        <% content_for :foo do %>bar<% end %>
+        <% content_for :baz do %>WON'T RENDER ME<% end %>
+        <% content_for :foo do %>baz<% end %>
+      erb_snippet
+
+      get '/'
+      assert ok?
+      assert_equal 'foobarbaz', body
+    end
+
+    it 'passes values to the blocks' do
+      mock_app {
+        layout { '<% yield_content :foo, 1, 2 %>' }
+        get('/') { erb '<% content_for :foo do |a, b| %><i><%= a %></i> <%= b %><% end %>' }
+      }
+
+      get '/'
+      assert ok?
+      assert_equal '<i>1</i> 2', body
+    end
+  end
+
+  context 'with haml' do
+    def haml_app(view)
+      mock_app {
+        layout { '= yield_content :foo' }
+        get('/') { haml view } 
+      }
+    end
+
+    it 'renders blocks declared with the same key you use when rendering' do
+      haml_app <<-haml_end
+- content_for :foo do
+  foo
+haml_end
+
+      get '/'
+      assert ok?
+      assert_equal "foo\n", body
+    end
+
+    it 'does not render a block with a different key' do
+      haml_app <<-haml_end
+- content_for :bar do
+  bar
+haml_end
+
+      get '/'
+      assert ok?
+      assert_equal "\n", body
+    end
+
+    it 'renders multiple blocks with the same key' do
+      haml_app <<-haml_end
+- content_for :foo do
+  foo
+- content_for :foo do
+  bar
+- content_for :baz do
+  WON'T RENDER ME
+- content_for :foo do
+  baz
+haml_end
+
+      get '/'
+      assert ok?
+      assert_equal "foo\nbar\nbaz\n", body
+    end
+
+    it 'passes values to the blocks' do
+      mock_app {
+        layout { '= yield_content :foo, 1, 2' }
+        get('/') { 
+          haml <<-haml_end
+- content_for :foo do |a, b|
+  %i= a
+  =b
+haml_end
+        }
+      }
+
+      get '/'
+      assert ok?
+      assert_equal "<i>1</i>\n2\n", body
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -134,6 +134,12 @@ files:
 - vendor/rack-test/spec/rcov.opts
 - vendor/rack-test/spec/spec.opts
 - vendor/rack-test/spec/spec_helper.rb
+- vendor/sinatra-content-for/LICENSE
+- vendor/sinatra-content-for/README.rdoc
+- vendor/sinatra-content-for/Rakefile
+- vendor/sinatra-content-for/lib/sinatra/content_for.rb
+- vendor/sinatra-content-for/sinatra-content-for.gemspec
+- vendor/sinatra-content-for/test/content_for_test.rb
 - vendor/sinatra-markaby/CHANGES
 - vendor/sinatra-markaby/LICENSE
 - vendor/sinatra-markaby/README.rdoc