middleman 0.13.2.pre → 0.14.0.pre2

data/Rakefile

@@ -23,7 +23,7 @@ begin
     gem.add_dependency("sinatra-content-for")
     gem.add_dependency("rack-test")
     gem.add_dependency("yui-compressor")
-    gem.add_dependency("haml", ">=3.0.0.beta.3")
+    gem.add_dependency("haml", ">=3.0.0.rc.1")
     gem.add_dependency("compass", ">=0.10.0.rc3")
     gem.add_dependency("fancy-buttons")
     gem.add_dependency("json_pure")

data/VERSION

@@ -1 +1 @@
-0.13.2.pre
+0.14.0.pre2

data/lib/middleman.rb

@@ -2,4 +2,19 @@ libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'rubygems'
-require 'middleman/base'
+
+module Middleman
+  
+  module Rack
+    autoload :Sprockets, "middleman/rack/sprockets"
+    autoload :MinifyJavascript, "middleman/rack/minify_javascript"
+    autoload :MinifyCSS, "middleman/rack/minify_css"
+  end
+
+  autoload :Base,    "middleman/base"
+  autoload :ERb,     "middleman/erb"
+  autoload :Haml,    "middleman/haml"
+  autoload :Sass,    "middleman/sass"
+  autoload :Helpers, "middleman/helpers"
+  
+end

data/lib/middleman/base.rb

@@ -12,6 +12,7 @@ module Middleman
     set :app_file, __FILE__
     set :root, ENV["MM_DIR"] || Dir.pwd
     set :reload, false
+    set :sessions, false
     set :logging, false
     set :environment, ENV['MM_ENV'] || :development
     set :supported_formats, %w(erb)
@@ -23,7 +24,6 @@ module Middleman
     set :build_dir, "build"
     set :http_prefix, nil
     
-    use ::Rack::ConditionalGet if environment == :development
     helpers Sinatra::ContentFor
     
     set :features, []
@@ -69,11 +69,8 @@ module Middleman
     # Base case renderer (do nothing), Should be over-ridden
     module StaticRender
       def render_path(path, layout)
-        if template_exists?(path, :erb)
-          erb(path.to_sym, :layout => layout)
-        else
-          false
-        end
+        return false if !template_exists?(path, :erb)
+        erb(path.to_sym, :layout => layout)
       end
     end
     include StaticRender
@@ -95,11 +92,6 @@ module Middleman
     ensure
       @@layout = nil
     end
-
-    # This will match all requests not overridden in the project's init.rb
-    not_found do
-      process_request
-    end
     
     def self.enabled?(name)
       name = (name.to_s << "?").to_sym
@@ -110,6 +102,11 @@ module Middleman
       self.class.enabled?(name)
     end
 
+    # This will match all requests not overridden in the project's init.rb
+    not_found do
+      process_request
+    end
+
   private
     def process_request(layout = :layout)
       # Normalize the path and add index if we're looking at a directory
@@ -129,15 +126,10 @@ module Middleman
   end
 end
 
+require "middleman/erb"
 # Haml is required & includes helpers
 require "middleman/haml"
 require "middleman/sass"
-require "middleman/helpers"
-require "middleman/rack/static"
-require "middleman/rack/sprockets"
-require "middleman/rack/minify_javascript"
-require "middleman/rack/minify_css"
-require "middleman/rack/downstream"
 
 class Middleman::Base
   helpers Middleman::Helpers
@@ -153,26 +145,21 @@ class Middleman::Base
   disable :automatic_image_sizes
   disable :relative_assets
   disable :cache_buster
+  disable :ugly_haml
   
   # Default build features
   configure :build do
   end
   
-  # Check for and evaluate local configuration
-  local_config = File.join(self.root, "init.rb")
-  if File.exists? local_config
-    puts "== Reading:  Local config" if logging?
-    Middleman::Base.class_eval File.read(local_config)
-    set :app_file, File.expand_path(local_config)
-  end
-  
-  use Middleman::Rack::Static
-  use Middleman::Rack::Sprockets
-  use Middleman::Rack::MinifyJavascript
-  use Middleman::Rack::MinifyCSS
-  use Middleman::Rack::Downstream
-  
   def self.new(*args, &block)
+    # Check for and evaluate local configuration
+    local_config = File.join(self.root, "init.rb")
+    if File.exists? local_config
+      puts "== Reading:  Local config" if logging?
+      Middleman::Base.class_eval File.read(local_config)
+      set :app_file, File.expand_path(local_config)
+    end
+    
     # loop over enabled feature
     features.flatten.each do |feature_name|
       next unless send(:"#{feature_name}?")
@@ -184,6 +171,15 @@ class Middleman::Base
       end
     end
     
+    use ::Rack::ConditionalGet            if environment == :development
+    use Middleman::Rack::MinifyJavascript if minify_javascript?
+    use Middleman::Rack::MinifyCSS        if minify_css?
+    
+    # Built-in javascript combination
+    use Middleman::Rack::Sprockets, :root      => Middleman::Base.root, 
+                                    :load_path => [ File.join("public", Middleman::Base.js_dir),
+                                                    File.join("views",  Middleman::Base.js_dir) ]
+    
     @@afters.each { |block| class_eval(&block) }
     
     super

data/lib/middleman/erb.rb

@@ -0,0 +1,24 @@
+require "erb"
+
+module Middleman
+  module ERb
+    module Renderer
+      def self.included(base)
+        base.supported_formats << "erb"
+      end
+    
+      def render_path(path, layout)
+        if template_exists?(path, :erb)
+          layout = false if File.extname(path) == ".xml"
+          erb(path.to_sym, :layout => layout)
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+class Middleman::Base
+  include Middleman::ERb::Renderer
+end

data/lib/middleman/haml.rb

@@ -13,7 +13,7 @@ module Middleman
           result = nil
           begin
             layout = false if File.extname(path) == ".xml"
-            result = haml(path.to_sym, :layout => layout)
+            result = haml(path.to_sym, :layout => layout, :ugly => Middleman::Base.enabled?(:ugly_haml))
           rescue ::Haml::Error => e
             result = "Haml Error: #{e}"
             result << "<pre>Backtrace: #{e.backtrace.join("\n")}</pre>"

data/lib/middleman/rack/minify_css.rb

@@ -10,19 +10,16 @@ class Middleman::Rack::MinifyCSS
   end
 
   def call(env)
-    if Middleman::Base.enabled?(:minify_css) &&
-       env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.css$/)
-
+    status, headers, response = @app.call(env)
+  
+    if Middleman::Base.enabled?(:minify_css) && env["PATH_INFO"].match(/\.css$/)
       compressor = ::YUI::CssCompressor.new
-
-      source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ?
-                 File.read(env["DOWNSTREAM"][2].path) :
-                 env["DOWNSTREAM"][2]
-
-      env["DOWNSTREAM"][2] = compressor.compress(source)
-      env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
+      
+      uncompressed_source = response.is_a?(::Rack::File) ? File.read(response.path) : response
+      response = compressor.compress(uncompressed_source)
+      headers["Content-Length"] = ::Rack::Utils.bytesize(response).to_s
     end
 
-    @app.call(env)
+    [status, headers, response]
   end
 end

data/lib/middleman/rack/minify_javascript.rb

@@ -10,19 +10,16 @@ class Middleman::Rack::MinifyJavascript
   end
 
   def call(env)
-    if Middleman::Base.enabled?(:minify_javascript) &&
-       env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.js$/) 
-      
+    status, headers, response = @app.call(env)
+    
+    if env["PATH_INFO"].match(/\.js$/)
       compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
       
-      source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ?
-                 File.read(env["DOWNSTREAM"][2].path) :
-                 env["DOWNSTREAM"][2]
-
-      env["DOWNSTREAM"][2] = compressor.compress(source)
-      env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
+      uncompressed_source = response.is_a?(::Rack::File) ? File.read(response.path) : response
+      response = compressor.compress(uncompressed_source)
+      headers["Content-Length"] = ::Rack::Utils.bytesize(response).to_s
     end
     
-    @app.call(env)
+    [status, headers, response]
   end
 end

data/lib/middleman/rack/sprockets.rb

@@ -1,34 +1,25 @@
-begin
-  require 'sprockets'
-  require 'middleman/rack/sprockets+ruby19' # Sprockets ruby 1.9 duckpunch
-rescue LoadError
-  puts "Sprockets not available. Install it with: gem install sprockets"
-end
+require 'sprockets'
   
 class Middleman::Rack::Sprockets
   def initialize(app, options={})
     @app = app
+    @options = options
   end
 
   def call(env)
-    path = env["PATH_INFO"]
-    
-    if env["DOWNSTREAM"] && path.match(/\.js$/)
-      source = "public" if File.exists?(File.join(Middleman::Base.views, path)) 
-      source = "views" if File.exists?(File.join(Middleman::Base.views, path))
+    if env["PATH_INFO"].match(/\.js$/)
+      public_file_path = File.join(Middleman::Base.public, env["PATH_INFO"])
+      view_file_path   = File.join(Middleman::Base.views,  env["PATH_INFO"])
       
-      if source
-        source_file = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? 
-                        env["DOWNSTREAM"][2].path : 
-                        env["DOWNSTREAM"][2]
+      source_file = Rack::File.new(Middleman::Base.public) if File.exists?(public_file_path) 
+      source_file = Rack::File.new(Middleman::Base.views)  if File.exists?(view_file_path)
       
-        secretary = ::Sprockets::Secretary.new( :root         => Middleman::Base.root,
-                                                :source_files => [ source_file ],
-                                                :load_path    => [ File.join("public", Middleman::Base.js_dir),
-                                                                   File.join("views", Middleman::Base.js_dir) ])
-    
-        env["DOWNSTREAM"][2] = secretary.concatenation.to_s
-        env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s
+      if source_file
+        status, headers, response = source_file.call(env)
+        secretary = ::Sprockets::Secretary.new(@options.merge( :source_files => [ response.path ] ))
+        response = secretary.concatenation.to_s
+        headers["Content-Length"] = ::Rack::Utils.bytesize(response).to_s
+        return [status, headers, response]
       end
     end
     
@@ -36,4 +27,35 @@ class Middleman::Rack::Sprockets
   end
 end
 
-Middleman::Base.supported_formats << "js"
+Middleman::Base.supported_formats << "js"
+
+# Sprockets ruby 1.9 duckpunch
+module Sprockets
+  class SourceFile
+    def source_lines
+      @lines ||= begin
+        lines = []
+
+        comments = []
+        File.open(pathname.absolute_location, 'rb') do |file|
+          file.each do |line|
+            lines << line = SourceLine.new(self, line, file.lineno)
+
+            if line.begins_pdoc_comment? || comments.any?
+              comments << line
+            end
+
+            if line.ends_multiline_comment?
+              if line.ends_pdoc_comment?
+                comments.each { |l| l.comment! }
+              end
+              comments.clear
+            end
+          end
+        end
+
+        lines
+      end
+    end
+  end
+end

data/lib/middleman/sass.rb

@@ -9,7 +9,7 @@ rescue LoadError
   puts "YUI-Compressor not available. Install it with: gem install yui-compressor"
 end
 
-module Middleman::Sass  
+module Middleman::Sass
   def self.included(base)
     base.supported_formats << "sass"
   end

data/middleman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.13.2.pre"
+  s.version = "0.14.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2010-04-18}
+  s.date = %q{2010-04-28}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "lib/middleman/base.rb",
      "lib/middleman/builder.rb",
      "lib/middleman/config.ru",
+     "lib/middleman/erb.rb",
      "lib/middleman/fastimage.rb",
      "lib/middleman/features/asset_host.rb",
      "lib/middleman/features/automatic_image_sizes.rb",
@@ -54,12 +55,9 @@ Gem::Specification.new do |s|
      "lib/middleman/features/smush_pngs.rb",
      "lib/middleman/haml.rb",
      "lib/middleman/helpers.rb",
-     "lib/middleman/rack/downstream.rb",
      "lib/middleman/rack/minify_css.rb",
      "lib/middleman/rack/minify_javascript.rb",
-     "lib/middleman/rack/sprockets+ruby19.rb",
      "lib/middleman/rack/sprockets.rb",
-     "lib/middleman/rack/static.rb",
      "lib/middleman/sass.rb",
      "lib/middleman/template/init.rbt",
      "lib/middleman/template/views/index.html.haml",
@@ -124,7 +122,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra-content-for>, [">= 0"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0"])
       s.add_runtime_dependency(%q<yui-compressor>, [">= 0"])
-      s.add_runtime_dependency(%q<haml>, [">= 3.0.0.beta.3"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.0.0.rc.1"])
       s.add_runtime_dependency(%q<compass>, [">= 0.10.0.rc3"])
       s.add_runtime_dependency(%q<fancy-buttons>, [">= 0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])
@@ -143,7 +141,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra-content-for>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<yui-compressor>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 3.0.0.beta.3"])
+      s.add_dependency(%q<haml>, [">= 3.0.0.rc.1"])
       s.add_dependency(%q<compass>, [">= 0.10.0.rc3"])
       s.add_dependency(%q<fancy-buttons>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 0"])
@@ -163,7 +161,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra-content-for>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<yui-compressor>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 3.0.0.beta.3"])
+    s.add_dependency(%q<haml>, [">= 3.0.0.rc.1"])
     s.add_dependency(%q<compass>, [">= 0.10.0.rc3"])
     s.add_dependency(%q<fancy-buttons>, [">= 0"])
     s.add_dependency(%q<json_pure>, [">= 0"])

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   prerelease: true
   segments: 
   - 0
-  - 13
-  - 2
-  - pre
-  version: 0.13.2.pre
+  - 14
+  - 0
+  - pre2
+  version: 0.14.0.pre2
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 -07:00
+date: 2010-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,9 +138,9 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta
-        - 3
-        version: 3.0.0.beta.3
+        - rc
+        - 1
+        version: 3.0.0.rc.1
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -280,6 +280,7 @@ files:
 - lib/middleman/base.rb
 - lib/middleman/builder.rb
 - lib/middleman/config.ru
+- lib/middleman/erb.rb
 - lib/middleman/fastimage.rb
 - lib/middleman/features/asset_host.rb
 - lib/middleman/features/automatic_image_sizes.rb
@@ -291,12 +292,9 @@ files:
 - lib/middleman/features/smush_pngs.rb
 - lib/middleman/haml.rb
 - lib/middleman/helpers.rb
-- lib/middleman/rack/downstream.rb
 - lib/middleman/rack/minify_css.rb
 - lib/middleman/rack/minify_javascript.rb
-- lib/middleman/rack/sprockets+ruby19.rb
 - lib/middleman/rack/sprockets.rb
-- lib/middleman/rack/static.rb
 - lib/middleman/sass.rb
 - lib/middleman/template/init.rbt
 - lib/middleman/template/views/index.html.haml

data/lib/middleman/rack/downstream.rb

@@ -1,9 +0,0 @@
-class Middleman::Rack::Downstream
-  def initialize(app, options={})
-    @app = app
-  end
-
-  def call(env)
-    env["DOWNSTREAM"] || @app.call(env)
-  end
-end

data/lib/middleman/rack/sprockets+ruby19.rb

@@ -1,29 +0,0 @@
-module Sprockets
-  class SourceFile
-    def source_lines
-      @lines ||= begin
-        lines = []
-
-        comments = []
-        File.open(pathname.absolute_location, 'rb') do |file|
-          file.each do |line|
-            lines << line = SourceLine.new(self, line, file.lineno)
-
-            if line.begins_pdoc_comment? || comments.any?
-              comments << line
-            end
-
-            if line.ends_multiline_comment?
-              if line.ends_pdoc_comment?
-                comments.each { |l| l.comment! }
-              end
-              comments.clear
-            end
-          end
-        end
-
-        lines
-      end
-    end
-  end
-end

data/lib/middleman/rack/static.rb

@@ -1,18 +0,0 @@
-class Middleman::Rack::Static
-  def initialize(app, options={})
-    @app = app
-  end
-
-  def call(env)
-    public_file_path = File.join(Middleman::Base.public, env["PATH_INFO"])
-    view_file_path   = File.join(Middleman::Base.views, env["PATH_INFO"])
-
-    if File.exists?(public_file_path) && !File.directory?(public_file_path)
-      env["DOWNSTREAM"] = ::Rack::File.new(Middleman::Base.public).call(env)
-    elsif File.exists?(view_file_path) && !File.directory?(view_file_path)
-      env["DOWNSTREAM"] = ::Rack::File.new(Middleman::Base.views).call(env)
-    end
-    
-    @app.call(env)
-  end
-end