move vendor into lib

This commit is contained in:
tdreyno 2009-09-24 16:24:41 -07:00
parent 1ef99ad757
commit ed26918b10
65 changed files with 27 additions and 68 deletions

View file

@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'middleman', 'sprockets_ext')
require "yui/compressor"
# Include content_for support
require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-content-for', 'lib', 'sinatra', 'content_for')
require File.join(File.dirname(__FILE__), '..', 'lib', 'vendor', 'sinatra-content-for', 'lib', 'sinatra', 'content_for')
class Middleman < Sinatra::Base
set :app_file, __FILE__
@ -80,8 +80,10 @@ class Middleman < Sinatra::Base
include ::Haml::Filters::Base
def render_with_options(text, options)
compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
data = compressor.compress(text.rstrip.gsub("\n", "\n "))
%Q{<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>}
data = compressor.compress(text)
<<END
<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>
END
end
end
end