tdreyno-middleman 0.2.1 → 0.2.4

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.rubyforge_project = "middleman"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.executables = %w(mm-init mm-build mm-server)
+    gem.files.include ['vendor/**/*']
     gem.add_dependency("templater")
     gem.add_dependency("sinatra")
     gem.add_dependency("markaby")

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.4

data/bin/mm-build

@@ -22,7 +22,7 @@ module Generators
       
       if (args[0] === args[1])
         newext = case File.extname(args.first)
-        when '.haml', '.mab', '.maruku'
+        when '.haml', '.erb', '.mab', '.maruku'
           '.html'
         when '.sass'
           '.css'
@@ -48,7 +48,7 @@ module Generators
       file(action.downcase.gsub(/[^a-z0-9]+/, '_').to_sym, action, action.gsub('public/', ''))
     end
 
-    glob! "views", %w(haml sass mab maruku)
+    glob! "views", %w(haml sass erb builder mab maruku)
   end
 
   add :build, Builder

data/lib/middleman.rb

@@ -45,27 +45,28 @@ class Middleman < Sinatra::Base
       config.http_images_path = "/images/"
     end
   end
-  
+
   get /(.*)/ do |path|
     path << "index.html" if path.match(%r{/$})
     path.gsub!(%r{^/}, '')
-    
     template = path.gsub(File.extname(path), '').to_sym
-    if path.match /.html$/
-      if File.exists? File.join(options.views, "#{template}.haml")
-        haml(template)
-      elsif File.exists? File.join(options.views, "#{template}.maruku")
-        maruku(template)
-      elsif File.exists? File.join(options.views, "#{template}.mab")
-        markaby(template)
+    
+    result = nil
+    
+    %w(haml erb builder maruku mab sass).each do |renderer|
+      next if !File.exists?(File.join(options.views, "#{template}.#{renderer}"))
+      
+      renderer = "markaby" if renderer == "mab"
+      result = if renderer == "sass"
+        content_type 'text/css', :charset => 'utf-8'
+        sass(template, Compass.sass_engine_options)
       else
-        pass
+        send(renderer.to_sym, template)
       end
-    elsif path.match /.css$/
-      content_type 'text/css', :charset => 'utf-8'
-      sass(template, Compass.sass_engine_options)
-    else
-      pass
+      
+      break
     end
+    
+    result || pass
   end
 end

data/middleman.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.2.1"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
@@ -40,7 +40,59 @@ Gem::Specification.new do |s|
      "spec/fixtures/sample/views/services/index.haml",
      "spec/fixtures/sample/views/stylesheets/site.sass",
      "spec/generator_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "vendor/rack-test/History.txt",
+     "vendor/rack-test/MIT-LICENSE.txt",
+     "vendor/rack-test/README.rdoc",
+     "vendor/rack-test/Rakefile",
+     "vendor/rack-test/lib/rack/mock_session.rb",
+     "vendor/rack-test/lib/rack/test.rb",
+     "vendor/rack-test/lib/rack/test/cookie_jar.rb",
+     "vendor/rack-test/lib/rack/test/methods.rb",
+     "vendor/rack-test/lib/rack/test/mock_digest_request.rb",
+     "vendor/rack-test/lib/rack/test/uploaded_file.rb",
+     "vendor/rack-test/lib/rack/test/utils.rb",
+     "vendor/rack-test/spec/fixtures/config.ru",
+     "vendor/rack-test/spec/fixtures/fake_app.rb",
+     "vendor/rack-test/spec/fixtures/foo.txt",
+     "vendor/rack-test/spec/rack/test/cookie_spec.rb",
+     "vendor/rack-test/spec/rack/test/digest_auth_spec.rb",
+     "vendor/rack-test/spec/rack/test/multipart_spec.rb",
+     "vendor/rack-test/spec/rack/test/utils_spec.rb",
+     "vendor/rack-test/spec/rack/test_spec.rb",
+     "vendor/rack-test/spec/rcov.opts",
+     "vendor/rack-test/spec/spec.opts",
+     "vendor/rack-test/spec/spec_helper.rb",
+     "vendor/sinatra-markaby/CHANGES",
+     "vendor/sinatra-markaby/LICENSE",
+     "vendor/sinatra-markaby/README.rdoc",
+     "vendor/sinatra-markaby/Rakefile",
+     "vendor/sinatra-markaby/TODO",
+     "vendor/sinatra-markaby/VERSION.yml",
+     "vendor/sinatra-markaby/lib/sinatra/markaby.rb",
+     "vendor/sinatra-markaby/sinatra-markaby.gemspec",
+     "vendor/sinatra-markaby/test/sinatra_markaby_test.rb",
+     "vendor/sinatra-markaby/test/test_helper.rb",
+     "vendor/sinatra-markaby/test/views/hello.mab",
+     "vendor/sinatra-markaby/test/views/html.mab",
+     "vendor/sinatra-maruku/LICENSE",
+     "vendor/sinatra-maruku/README.markdown",
+     "vendor/sinatra-maruku/Rakefile",
+     "vendor/sinatra-maruku/VERSION.yml",
+     "vendor/sinatra-maruku/examples/app.rb",
+     "vendor/sinatra-maruku/examples/config.ru",
+     "vendor/sinatra-maruku/examples/mapp.rb",
+     "vendor/sinatra-maruku/examples/public/javascripts/application.js",
+     "vendor/sinatra-maruku/examples/public/stylesheets/application.css",
+     "vendor/sinatra-maruku/examples/public/stylesheets/print.css",
+     "vendor/sinatra-maruku/examples/views/index.maruku",
+     "vendor/sinatra-maruku/examples/views/layout.maruku",
+     "vendor/sinatra-maruku/lib/sinatra/maruku.rb",
+     "vendor/sinatra-maruku/sinatra-maruku.gemspec",
+     "vendor/sinatra-maruku/test/sinatra_maruku_test.rb",
+     "vendor/sinatra-maruku/test/test_helper.rb",
+     "vendor/sinatra-maruku/test/views/hello.maruku",
+     "vendor/sinatra-maruku/test/views/layout2.maruku"
   ]
   s.homepage = %q{http://github.com/tdreyno/middleman}
   s.rdoc_options = ["--charset=UTF-8"]

data/vendor/rack-test/History.txt

@@ -0,0 +1,64 @@
+== Git
+
+* Minor enhancements
+
+  * Support initializing a Rack::Test::Session with an app in addition to
+    a Rack::MockSession
+  * Allow CONTENT_TYPE to be specified in the env and not overwritten when
+    sending a POST or PUT
+
+== 0.4.0 / 2009-06-25
+
+* Minor enhancements
+
+  * Expose hook for building Rack::MockSessions for frameworks that need
+    to configure them before use
+  * Support passing in arrays of raw cookies in addition to a newline
+    separated string
+  * Support after_request callbacks in MockSession for things like running
+    background jobs
+  * Allow multiple named sessions using with_session
+  * Initialize Rack::Test::Sessions with Rack::MockSessions instead of apps.
+    This change should help integration with other Ruby web frameworks
+    (like Merb).
+  * Support sending bodies for PUT requests (Larry Diehl)
+
+== 0.3.0 / 2009-05-17
+
+* Major enhancements
+
+  * Ruby 1.9 compatible (Simon Rozet, Michael Fellinger)
+
+* Minor enhancements
+
+  * Add CookieJar#[] and CookieJar#[]= methods
+  * Make the default host configurable
+  * Use Rack::Lint and fix errors (Simon Rozet)
+  * Extract Rack::MockSession from Rack::Test::Session to handle tracking
+    the last request and response and the cookie jar
+  * Add #set_cookie and #clear_cookies methods
+  * Rename #authorize to #basic_authorize (#authorize remains as an alias)
+    (Simon Rozet)
+
+== 0.2.0 / 2009-04-26
+
+Because #last_response is now a MockResponse instead of a Rack::Response,
+#last_response.body now returns a string instead of an array.
+
+* Major enhancements
+
+  * Support multipart requests via the UploadedFile class (thanks, Rails)
+
+* Minor enhancements
+
+  * Updated for Rack 1.0
+  * Don't require rubygems (See http://gist.github.com/54177)
+  * Support HTTP Digest authentication with the #digest_authorize method
+  * #last_response returns a MockResponse instead of a Response
+    (Michael Fellinger)
+
+== 0.1.0 / 2009-03-02
+
+* 1 major enhancement
+
+  * Birthday!

data/vendor/rack-test/MIT-LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2008-2009 Bryan Helmkamp, Engine Yard Inc.
+
+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/rack-test/README.rdoc

@@ -0,0 +1,57 @@
+= Rack::Test
+
+- http://gitrdoc.com/brynary/rack-test
+- http://github.com/brynary/rack-test
+
+== Description
+
+Rack::Test is a small, simple testing API for Rack apps. It can be used on its
+own or as a reusable starting point for Web frameworks and testing libraries
+to build on. Most of its initial functionality is an extraction of Merb 1.0's
+request helpers feature.
+
+== Features
+
+* Maintains a cookie jar across requests
+* Easily follow redirects when desired
+* Set request headers to be used by all subsequent requests
+* Small footprint. Approximately 200 LOC
+
+== Example
+
+  require "rack/test"
+  
+  class HomepageTest < Test::Unit::TestCase
+    include Rack::Test::Methods
+    
+    def app
+      MyApp.new
+    end
+    
+    def test_redirect_logged_in_users_to_dashboard
+      authorize "bryan", "secret"
+      get "/"
+      follow_redirect!
+      
+      assert_equal "http://example.org/redirected", last_request.url
+      assert last_response.ok?
+    end
+    
+  end
+
+== Install
+
+To install the latest release as a gem:
+
+  sudo gem install rack-test
+
+== Authors
+
+- Maintained by {Bryan Helmkamp}[mailto:bryan@brynary.com]
+- Contributions from Simon Rozet and Pat Nakajima
+- Much of the original code was extracted from Merb 1.0's request helper
+
+== License
+
+Copyright (c) 2008-2009 Bryan Helmkamp, Engine Yard Inc.
+See MIT-LICENSE.txt in this directory.

data/vendor/rack-test/Rakefile

@@ -0,0 +1,62 @@
+require "rubygems"
+require "rake/rdoctask"
+require "rake/gempackagetask"
+require "rake/clean"
+require "spec/rake/spectask"
+require File.expand_path("./lib/rack/test")
+
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+end
+
+desc "Run all specs in spec directory with RCov"
+Spec::Rake::SpecTask.new(:rcov) do |t|
+  t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+  t.rcov = true
+  t.rcov_opts = lambda do
+    IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+  end
+end
+
+desc "Run the specs"
+task :default => :spec
+
+spec = Gem::Specification.new do |s|
+  s.name         = "rack-test"
+  s.version      = Rack::Test::VERSION
+  s.author       = "Bryan Helmkamp"
+  s.email        = "bryan" + "@" + "brynary.com"
+  s.homepage     = "http://github.com/brynary/rack-test"
+  s.summary      = "Simple testing API built on Rack"
+  s.description  = s.summary
+  s.files        = %w[History.txt Rakefile README.rdoc] + Dir["lib/**/*"]
+
+  # rdoc
+  s.has_rdoc         = true
+  s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
+end
+
+Rake::GemPackageTask.new(spec) do |package|
+  package.gem_spec = spec
+end
+
+desc "Delete generated RDoc"
+task :clobber_docs do
+  FileUtils.rm_rf("doc")
+end
+
+desc "Generate RDoc"
+task :docs => :clobber_docs do
+  system "hanna --title 'Rack::Test #{Rack::Test::VERSION} API Documentation'"
+end
+
+desc 'Install the package as a gem.'
+task :install => [:clean, :package] do
+  gem = Dir['pkg/*.gem'].first
+  sh "sudo gem install --no-rdoc --no-ri --local #{gem}"
+end
+
+desc 'Removes trailing whitespace'
+task :whitespace do
+  sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
+end

data/vendor/rack-test/lib/rack/mock_session.rb

@@ -0,0 +1,57 @@
+module Rack
+
+  class MockSession
+    attr_writer :cookie_jar
+    attr_reader :last_response
+    attr_reader :default_host
+
+    def initialize(app, default_host = Rack::Test::DEFAULT_HOST)
+      @app = app
+      @after_request = []
+      @default_host = default_host
+    end
+
+    def after_request(&block)
+      @after_request << block
+    end
+
+    def clear_cookies
+      @cookie_jar = Rack::Test::CookieJar.new([], @default_host)
+    end
+
+    def set_cookie(cookie, uri = nil)
+      cookie_jar.merge(cookie, uri)
+    end
+
+    def request(uri, env)
+      env["HTTP_COOKIE"] ||= cookie_jar.for(uri)
+      @last_request = Rack::Request.new(env)
+      status, headers, body = @app.call(@last_request.env)
+      @last_response = MockResponse.new(status, headers, body, env["rack.errors"].flush)
+      cookie_jar.merge(last_response.headers["Set-Cookie"], uri)
+
+      @after_request.each { |hook| hook.call }
+      @last_response
+    end
+
+    # Return the last request issued in the session. Raises an error if no
+    # requests have been sent yet.
+    def last_request
+      raise Rack::Test::Error.new("No request yet. Request a page first.") unless @last_request
+      @last_request
+    end
+
+    # Return the last response received in the session. Raises an error if
+    # no requests have been sent yet.
+    def last_response
+      raise Rack::Test::Error.new("No response yet. Request a page first.") unless @last_response
+      @last_response
+    end
+
+    def cookie_jar
+      @cookie_jar ||= Rack::Test::CookieJar.new([], @default_host)
+    end
+
+  end
+
+end

data/vendor/rack-test/lib/rack/test.rb

@@ -0,0 +1,246 @@
+unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__) + "/.."))
+  $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/.."))
+end
+
+require "uri"
+require "rack"
+require "rack/mock_session"
+require "rack/test/cookie_jar"
+require "rack/test/mock_digest_request"
+require "rack/test/utils"
+require "rack/test/methods"
+require "rack/test/uploaded_file"
+
+module Rack
+  module Test
+
+    VERSION = "0.4.0"
+
+    DEFAULT_HOST = "example.org"
+    MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"
+
+    # The common base class for exceptions raised by Rack::Test
+    class Error < StandardError; end
+
+    class Session
+      extend Forwardable
+      include Rack::Test::Utils
+
+      def_delegators :@rack_mock_session, :clear_cookies, :set_cookie, :last_response, :last_request
+
+      # Initialize a new session for the given Rack app
+      def initialize(mock_session)
+        @headers = {}
+
+        if mock_session.is_a?(MockSession)
+          @rack_mock_session = mock_session
+        else
+          @rack_mock_session = MockSession.new(mock_session)
+        end
+
+        @default_host = @rack_mock_session.default_host
+      end
+
+      # Issue a GET request for the given URI with the given params and Rack
+      # environment. Stores the issues request object in #last_request and
+      # the app's response in #last_response. Yield #last_response to a block
+      # if given.
+      #
+      # Example:
+      #   get "/"
+      def get(uri, params = {}, env = {}, &block)
+        env = env_for(uri, env.merge(:method => "GET", :params => params))
+        process_request(uri, env, &block)
+      end
+
+      # Issue a POST request for the given URI. See #get
+      #
+      # Example:
+      #   post "/signup", "name" => "Bryan"
+      def post(uri, params = {}, env = {}, &block)
+        env = env_for(uri, env.merge(:method => "POST", :params => params))
+        process_request(uri, env, &block)
+      end
+
+      # Issue a PUT request for the given URI. See #get
+      #
+      # Example:
+      #   put "/"
+      def put(uri, params = {}, env = {}, &block)
+        env = env_for(uri, env.merge(:method => "PUT", :params => params))
+        process_request(uri, env, &block)
+      end
+
+      # Issue a DELETE request for the given URI. See #get
+      #
+      # Example:
+      #   delete "/"
+      def delete(uri, params = {}, env = {}, &block)
+        env = env_for(uri, env.merge(:method => "DELETE", :params => params))
+        process_request(uri, env, &block)
+      end
+
+      # Issue a HEAD request for the given URI. See #get
+      #
+      # Example:
+      #   head "/"
+      def head(uri, params = {}, env = {}, &block)
+        env = env_for(uri, env.merge(:method => "HEAD", :params => params))
+        process_request(uri, env, &block)
+      end
+
+      # Issue a request to the Rack app for the given URI and optional Rack
+      # environment. Stores the issues request object in #last_request and
+      # the app's response in #last_response. Yield #last_response to a block
+      # if given.
+      #
+      # Example:
+      #   request "/"
+      def request(uri, env = {}, &block)
+        env = env_for(uri, env)
+        process_request(uri, env, &block)
+      end
+
+      # Set a header to be included on all subsequent requests through the
+      # session. Use a value of nil to remove a previously configured header.
+      #
+      # Example:
+      #   header "User-Agent", "Firefox"
+      def header(name, value)
+        if value.nil?
+          @headers.delete(name)
+        else
+          @headers[name] = value
+        end
+      end
+
+      # Set the username and password for HTTP Basic authorization, to be
+      # included in subsequent requests in the HTTP_AUTHORIZATION header.
+      #
+      # Example:
+      #   basic_authorize "bryan", "secret"
+      def basic_authorize(username, password)
+        encoded_login = ["#{username}:#{password}"].pack("m*")
+        header('HTTP_AUTHORIZATION', "Basic #{encoded_login}")
+      end
+
+      alias_method :authorize, :basic_authorize
+
+      def digest_authorize(username, password)
+        @digest_username = username
+        @digest_password = password
+      end
+
+      # Rack::Test will not follow any redirects automatically. This method
+      # will follow the redirect returned in the last response. If the last
+      # response was not a redirect, an error will be raised.
+      def follow_redirect!
+        unless last_response.redirect?
+          raise Error.new("Last response was not a redirect. Cannot follow_redirect!")
+        end
+
+        get(last_response["Location"])
+      end
+
+    private
+
+      def env_for(path, env)
+        uri = URI.parse(path)
+        uri.host ||= @default_host
+
+        env = default_env.merge(env)
+
+        env.update("HTTPS" => "on")                if URI::HTTPS === uri
+        env["X-Requested-With"] = "XMLHttpRequest" if env[:xhr]
+
+        if (env[:method] == "POST" || env["REQUEST_METHOD"] == "POST" ||
+            env[:method] == "PUT" || env["REQUEST_METHOD"] == "PUT") && !env.has_key?(:input)
+          env["CONTENT_TYPE"] ||= "application/x-www-form-urlencoded"
+
+          multipart = (Hash === env[:params]) &&
+            env[:params].any? { |_, v| UploadedFile === v }
+
+          if multipart
+            env[:input] = multipart_body(env.delete(:params))
+            env["CONTENT_LENGTH"] ||= env[:input].length.to_s
+            env["CONTENT_TYPE"] = "multipart/form-data; boundary=#{MULTIPART_BOUNDARY}"
+          else
+            env[:input] = params_to_string(env.delete(:params))
+          end
+        end
+
+        params = env[:params] || {}
+        params.update(parse_query(uri.query))
+
+        uri.query = requestify(params)
+
+        if env.has_key?(:cookie)
+          set_cookie(env.delete(:cookie), uri)
+        end
+
+        Rack::MockRequest.env_for(uri.to_s, env)
+      end
+
+      def process_request(uri, env)
+        uri = URI.parse(uri)
+        uri.host ||= @default_host
+
+        @rack_mock_session.request(uri, env)
+
+        if retry_with_digest_auth?(env)
+          auth_env = env.merge({
+            "HTTP_AUTHORIZATION"          => digest_auth_header,
+            "rack-test.digest_auth_retry" => true
+          })
+          auth_env.delete('rack.request')
+          process_request(uri.path, auth_env)
+        else
+          yield last_response if block_given?
+
+          last_response
+        end
+      end
+
+      def digest_auth_header
+        challenge = last_response["WWW-Authenticate"].split(" ", 2).last
+        params = Rack::Auth::Digest::Params.parse(challenge)
+
+        params.merge!({
+          "username"  => @digest_username,
+          "nc"        => "00000001",
+          "cnonce"    => "nonsensenonce",
+          "uri"       => last_request.path_info,
+          "method"    => last_request.env["REQUEST_METHOD"],
+        })
+
+        params["response"] = MockDigestRequest.new(params).response(@digest_password)
+
+        "Digest #{params}"
+      end
+
+      def retry_with_digest_auth?(env)
+        last_response.status == 401 &&
+        digest_auth_configured? &&
+        !env["rack-test.digest_auth_retry"]
+      end
+
+      def digest_auth_configured?
+        @digest_username
+      end
+
+      def default_env
+        { "rack.test" => true, "REMOTE_ADDR" => "127.0.0.1" }.merge(@headers)
+      end
+
+      def params_to_string(params)
+        case params
+        when Hash then requestify(params)
+        when nil  then ""
+        else params
+        end
+      end
+
+    end
+
+  end
+end