RubyGems - middleman - Versions diffs - 0.5.5 → 0.9.0.pre - Mend

middleman 0.5.5 → 0.9.0.pre

Files changed (147) hide show

data/.document +1 -2
data/.gitignore +3 -2
data/LICENSE +0 -0
data/README.rdoc +4 -0
data/Rakefile +28 -36
data/VERSION +1 -1
data/bin/mm-build +7 -113
data/bin/mm-init +11 -5
data/bin/mm-server +56 -3
data/features/asset_host.feature +12 -0
data/features/automatic_image_sizes.feature +14 -0
data/features/cache_buster.feature +22 -0
data/features/generator.feature +8 -0
data/features/minify_css.feature +22 -0
data/features/minify_javascript.feature +12 -0
data/features/page_alias_and_layouts.feature +12 -0
data/features/relative_assets.feature +12 -0
data/features/step_definitions/asset_host_steps.rb +7 -0
data/features/step_definitions/env.rb +3 -0
data/features/step_definitions/generator_steps.rb +24 -0
data/features/step_definitions/middleman_steps.rb +28 -0
data/features/step_definitions/page_layout_steps.rb +13 -0
data/lib/middleman.rb +6 -132
data/lib/middleman/assets.rb +33 -0
data/lib/middleman/base.rb +147 -0
data/lib/middleman/builder.rb +59 -0
data/lib/middleman/config.ru +2 -0
data/lib/middleman/features.rb +39 -0
data/lib/middleman/features/asset_host.rb +21 -0
data/lib/middleman/features/automatic_image_sizes.rb +31 -0
data/lib/middleman/features/automatic_image_sizes/fastimage.rb +282 -0
data/lib/middleman/features/cache_buster.rb +43 -0
data/lib/middleman/features/default_helpers.rb +68 -0
data/lib/middleman/features/livereload.rb +19 -0
data/lib/middleman/features/minify_css.rb +9 -0
data/lib/middleman/features/minify_javascript.rb +20 -0
data/lib/middleman/features/minify_javascript/rack.rb +31 -0
data/lib/middleman/features/relative_assets.rb +35 -0
data/lib/middleman/features/slickmap.rb +118 -0
data/lib/middleman/features/smush_pngs.rb +38 -0
data/lib/middleman/features/ugly_haml.rb +7 -0
data/lib/middleman/renderers.rb +26 -0
data/lib/middleman/renderers/coffee.rb +28 -0
data/lib/middleman/renderers/haml.rb +47 -0
data/lib/middleman/renderers/sass.rb +67 -0
data/lib/middleman/template/init.rbt +57 -0
data/lib/middleman/template/views/index.html.haml +4 -0
data/lib/middleman/template/views/layout.haml +11 -4
data/lib/middleman/template/views/stylesheets/site.css.sass +27 -0
data/lib/middleman/templater+dynamic_renderer.rb +26 -0
data/middleman.gemspec +121 -107
data/spec/builder_spec.rb +17 -16
data/spec/fixtures/sample/init.rb +28 -2
data/spec/fixtures/sample/public/images/blank.gif +0 -0
data/spec/fixtures/sample/public/static.html +0 -0
data/{vendor/sinatra-maruku/examples/public/javascripts/application.js → spec/fixtures/sample/public/stylesheets/auto-css.css} +0 -0
data/spec/fixtures/sample/public/stylesheets/static.css +0 -0
data/{vendor/sinatra-maruku/examples/public/stylesheets/print.css → spec/fixtures/sample/public/stylesheets/sub1/auto-css.css} +0 -0
data/spec/fixtures/sample/public/stylesheets/sub1/sub2/auto-css.css +0 -0
data/spec/fixtures/sample/views/_partial.haml +0 -0
data/spec/fixtures/sample/views/asset_host.html.haml +1 -0
data/spec/fixtures/sample/views/auto-css.html.haml +1 -0
data/spec/fixtures/sample/views/auto-image-sizes.html.haml +1 -0
data/spec/fixtures/sample/views/cache-buster.html.haml +2 -0
data/spec/fixtures/sample/views/{index.haml → custom-layout.html.haml} +0 -0
data/spec/fixtures/sample/views/custom.haml +5 -0
data/spec/fixtures/sample/views/index.html.haml +1 -0
data/spec/fixtures/sample/views/inline-css.html.haml +4 -0
data/spec/fixtures/sample/views/{inline-js.haml → inline-js.html.haml} +0 -0
data/spec/fixtures/sample/views/layout.haml +1 -1
data/spec/fixtures/sample/views/{maruku.maruku → maruku.html.maruku} +0 -0
data/spec/fixtures/sample/views/page-classes.html.haml +1 -0
data/spec/fixtures/sample/views/services/{index.haml → index.html.haml} +0 -0
data/spec/fixtures/sample/views/stylesheets/asset_host.css.sass +3 -0
data/spec/fixtures/sample/views/stylesheets/relative_assets.css.sass +3 -0
data/spec/fixtures/sample/views/stylesheets/site.css.sass +1 -0
data/spec/fixtures/sample/views/stylesheets/site_scss.css.scss +1 -0
data/spec/fixtures/sample/views/stylesheets/test_less.css.less +5 -0
data/spec/helpers_spec.rb +43 -0
data/spec/spec_helper.rb +3 -5
metadata +298 -127
data/lib/middleman/helpers.rb +0 -131
data/lib/middleman/markaby.rb +0 -4
data/lib/middleman/maruku.rb +0 -4
data/lib/middleman/sprockets_ext.rb +0 -29
data/lib/middleman/template/init.rb +0 -22
data/lib/middleman/template/views/index.haml +0 -1
data/lib/middleman/template/views/stylesheets/site.sass +0 -1
data/spec/fixtures/sample/views/markaby.mab +0 -5
data/spec/fixtures/sample/views/stylesheets/site.sass +0 -1
data/spec/generator_spec.rb +0 -34
data/vendor/rack-test/History.txt +0 -64
data/vendor/rack-test/MIT-LICENSE.txt +0 -19
data/vendor/rack-test/README.rdoc +0 -57
data/vendor/rack-test/Rakefile +0 -62
data/vendor/rack-test/lib/rack/mock_session.rb +0 -57
data/vendor/rack-test/lib/rack/test.rb +0 -246
data/vendor/rack-test/lib/rack/test/cookie_jar.rb +0 -169
data/vendor/rack-test/lib/rack/test/methods.rb +0 -73
data/vendor/rack-test/lib/rack/test/mock_digest_request.rb +0 -27
data/vendor/rack-test/lib/rack/test/uploaded_file.rb +0 -36
data/vendor/rack-test/lib/rack/test/utils.rb +0 -75
data/vendor/rack-test/spec/fixtures/config.ru +0 -3
data/vendor/rack-test/spec/fixtures/fake_app.rb +0 -109
data/vendor/rack-test/spec/fixtures/foo.txt +0 -1
data/vendor/rack-test/spec/rack/test/cookie_spec.rb +0 -176
data/vendor/rack-test/spec/rack/test/digest_auth_spec.rb +0 -48
data/vendor/rack-test/spec/rack/test/multipart_spec.rb +0 -85
data/vendor/rack-test/spec/rack/test/utils_spec.rb +0 -44
data/vendor/rack-test/spec/rack/test_spec.rb +0 -363
data/vendor/rack-test/spec/rcov.opts +0 -1
data/vendor/rack-test/spec/spec.opts +0 -1
data/vendor/rack-test/spec/spec_helper.rb +0 -48
data/vendor/sinatra-content-for/LICENSE +0 -22
data/vendor/sinatra-content-for/README.rdoc +0 -49
data/vendor/sinatra-content-for/Rakefile +0 -33
data/vendor/sinatra-content-for/lib/sinatra/content_for.rb +0 -58
data/vendor/sinatra-content-for/sinatra-content-for.gemspec +0 -34
data/vendor/sinatra-content-for/test/content_for_test.rb +0 -156
data/vendor/sinatra-markaby/CHANGES +0 -7
data/vendor/sinatra-markaby/LICENSE +0 -20
data/vendor/sinatra-markaby/README.rdoc +0 -33
data/vendor/sinatra-markaby/Rakefile +0 -45
data/vendor/sinatra-markaby/TODO +0 -3
data/vendor/sinatra-markaby/VERSION.yml +0 -4
data/vendor/sinatra-markaby/lib/sinatra/markaby.rb +0 -31
data/vendor/sinatra-markaby/sinatra-markaby.gemspec +0 -49
data/vendor/sinatra-markaby/test/sinatra_markaby_test.rb +0 -72
data/vendor/sinatra-markaby/test/test_helper.rb +0 -19
data/vendor/sinatra-markaby/test/views/hello.mab +0 -1
data/vendor/sinatra-markaby/test/views/html.mab +0 -4
data/vendor/sinatra-maruku/LICENSE +0 -22
data/vendor/sinatra-maruku/README.markdown +0 -85
data/vendor/sinatra-maruku/Rakefile +0 -34
data/vendor/sinatra-maruku/VERSION.yml +0 -4
data/vendor/sinatra-maruku/examples/app.rb +0 -8
data/vendor/sinatra-maruku/examples/config.ru +0 -4
data/vendor/sinatra-maruku/examples/mapp.rb +0 -15
data/vendor/sinatra-maruku/examples/public/stylesheets/application.css +0 -23
data/vendor/sinatra-maruku/examples/views/index.maruku +0 -32
data/vendor/sinatra-maruku/examples/views/layout.maruku +0 -9
data/vendor/sinatra-maruku/lib/sinatra/maruku.rb +0 -25
data/vendor/sinatra-maruku/sinatra-maruku.gemspec +0 -70
data/vendor/sinatra-maruku/test/sinatra_maruku_test.rb +0 -91
data/vendor/sinatra-maruku/test/test_helper.rb +0 -21
data/vendor/sinatra-maruku/test/views/hello.maruku +0 -1
data/vendor/sinatra-maruku/test/views/layout2.maruku +0 -2

data/vendor/rack-test/spec/rcov.opts DELETED

	@@ -1 +0,0 @@
1	- -x gems,spec

data/vendor/rack-test/spec/spec.opts DELETED

	@@ -1 +0,0 @@
1	- --color

data/vendor/rack-test/spec/spec_helper.rb DELETED

@@ -1,48 +0,0 @@
-require "rubygems"
-require "spec"
-gem "rack", "~> 1.0.0"
-require File.expand_path(File.dirname(__FILE__) + "/../lib/rack/test")
-require File.dirname(__FILE__) + "/fixtures/fake_app"
-Spec::Runner.configure do |config|
-  config.include Rack::Test::Methods
-  def app
-    Rack::Lint.new(Rack::Test::FakeApp.new)
-  end
-end
-describe "any #verb methods", :shared => true do
-  it "requests the URL using VERB" do
-    send(verb, "/")
-    last_request.env["REQUEST_METHOD"].should == verb.upcase
-    last_response.should be_ok
-  end
-  it "uses the provided env" do
-    send(verb, "/", {}, { "User-Agent" => "Rack::Test" })
-    last_request.env["User-Agent"].should == "Rack::Test"
-  end
-  it "yields the response to a given block" do
-    yielded = false
-    send(verb, "/") do |response|
-      response.should be_ok
-      yielded = true
-    end
-    yielded.should be_true
-  end
-  context "for a XHR" do
-    it "sends XMLHttpRequest for the X-Requested-With header" do
-      send(verb, "/", {}, { :xhr => true })
-      last_request.env["X-Requested-With"].should == "XMLHttpRequest"
-    end
-  end
-end

data/vendor/sinatra-content-for/LICENSE DELETED

@@ -1,22 +0,0 @@
-(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 DELETED

@@ -1,49 +0,0 @@
-= 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 DELETED

@@ -1,33 +0,0 @@
-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 DELETED

@@ -1,58 +0,0 @@
-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 DELETED

@@ -1,34 +0,0 @@
-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 DELETED

@@ -1,156 +0,0 @@
-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

data/vendor/sinatra-markaby/CHANGES DELETED

@@ -1,7 +0,0 @@
-= 0.9.2.2
-* layout support is tested
-= 0.9.2.1
-* use Rack::Test instead of Sinatra::Test

data/vendor/sinatra-markaby/LICENSE DELETED

@@ -1,20 +0,0 @@
-Copyright (c) 2009 unwwwired.net
-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-markaby/README.rdoc DELETED

@@ -1,33 +0,0 @@
-= sinatra-markaby
-sinatra-markaby is an extension for sinatra to enable rendering of html files
-using markaby templates.
-== Installation
-  sudo gem install sbfaulkner-sinatra-markaby -s http://gems.github.com
-== Example
-  require 'rubygems'
-  require 'sinatra'
-  require 'sinatra/markaby'
-  get '/' do
-    markaby :template
-  end
-  __END__
-  @@ template
-  mab.html do
-    head { title "Hello world" }
-    body do
-      p "Hello world!!!!!"
-    end
-  end
-== Legal
-Author:: S. Brent Faulkner <brentf@unwwwired.net>
-License:: Copyright (c) 2009 unwwwired.net, released under the MIT license