middleman 0.12.0.pre → 0.12.0.pre2

data/Gemfile

@@ -1,6 +1,6 @@
 bundle_path "lib/middleman/vendor/gems"
 bin_path "lib/middleman/vendor/bin"
-disable_rubygems
+# disable_rubygems
 # disable_system_gems
 
 gem "shotgun"
@@ -11,7 +11,7 @@ gem "sinatra-content-for"
 gem "rack-test"
 gem "yui-compressor"
 gem "haml"
-gem "compass"
+gem "compass", "0.10.0.pre2"
 gem "json_pure"
 gem "smusher"
 gem "compass-slickmap"

data/VERSION

@@ -1 +1 @@
-0.12.0.pre
+0.12.0.pre2

data/bin/mm-build

@@ -6,7 +6,7 @@ ENV['MM_ENV'] = "build"
 require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
 require 'middleman/builder'
 
-#Middleman::Base.init!
+# Middleman::Base.init!
 Middleman::Builder.init!
 
 Middleman::Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))

data/features/generator.feature

@@ -0,0 +1,8 @@
+Feature: Generator
+  In order to generate static assets for client
+
+  Scenario: Copying template files
+    Given generated directory at "generator-test"
+    Then template files should exist at "generator-test"
+    And empty directories should exist at "generator-test"
+    And cleanup at "generator-test"

data/features/step_definitions/env.rb

@@ -1,2 +1,3 @@
+ENV["MM_DIR"] = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
 require File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'lib', 'middleman')
 require "rack/test"

data/features/step_definitions/generator_steps.rb

@@ -0,0 +1,24 @@
+require 'fileutils'
+
+Then /^template files should exist at "([^\"]*)"$/ do |dirname|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", dirname)
+  template_glob = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "lib", "middleman", "template", "*/**/*")
+  
+  Dir[template_glob].each do |f|
+    next if File.directory?(f)
+    File.exists?("#{target}/#{f.split('template/')[1]}").should be_true
+  end
+end
+
+Then /^empty directories should exist at "([^\"]*)"$/ do |dirname|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", dirname)
+  
+  %w(views/stylesheets public/stylesheets public/javascripts public/images).each do |d|
+    File.exists?("#{target}/#{d}").should be_true
+  end
+end
+
+Then /^cleanup at "([^\"]*)"$/ do |dirname|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", dirname)
+  FileUtils.rm_rf(target)
+end

data/features/step_definitions/middleman_steps.rb

@@ -1,10 +1,15 @@
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
   enable_or_disable = (state == "enabled") ? :enable : :disable
-  Middleman::Base.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
   Middleman::Base.send(enable_or_disable, feature.to_sym)
   @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base.new))
 end
 
+Given /^generated directory at "([^\"]*)"$/ do |dirname|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", dirname)
+  init_cmd = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "mm-init")
+  `cd #{File.dirname(target)} && #{init_cmd} #{File.basename(target)}`
+end
+
 When /^I go to "([^\"]*)"$/ do |url|
   @browser.get(url)
 end

data/lib/middleman/base.rb

@@ -9,7 +9,7 @@ end
 module Middleman
   class Base < Sinatra::Base
     set :app_file, __FILE__
-    set :root, Dir.pwd
+    set :root, ENV["MM_DIR"] || Dir.pwd
     set :reload, false
     set :logging, false
     set :environment, ENV['MM_ENV'] || :development
@@ -18,21 +18,23 @@ module Middleman
     set :js_dir, "javascripts"
     set :css_dir, "stylesheets"
     set :images_dir, "images"
+    set :fonts_dir, "fonts"
     set :build_dir, "build"
     set :http_prefix, nil
     
     use Rack::ConditionalGet if environment == :development
     helpers Sinatra::ContentFor
     
-    @@features = []
-    
+    set :features, []
     def self.enable(*opts)
-      @@features << opts
+      set :features, (self.features << opts).flatten
       super
     end
     
     def self.disable(*opts)
-      @@features -= opts
+      current = self.features
+      current -= opts.flatten
+      set :features, current
       super
     end
     
@@ -67,14 +69,14 @@ module Middleman
     include StaticRender
     
     def self.page(url, options={}, &block)
+      layout = @@layout
+      layout = options[:layout] if !options[:layout].nil?
+      
       get(url) do
-        request.layout = @@layout if (@@layout ||= nil)
-        request.layout = options[:layout] if options[:layout]
-        
         if block_given?
           yield
         else
-          process_request
+          process_request(layout)
         end
       end
     end
@@ -85,21 +87,26 @@ 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
+      self.respond_to?(name) && self.send(name)
+    end
 
   private
-    def process_request
+    def process_request(layout = :layout)
       # Normalize the path and add index if we're looking at a directory
       path = request.path
       path << options.index_file if path.match(%r{/$})
       path.gsub!(%r{^/}, '')
 
       # If the enabled renderers succeed, return the content, mime-type and an HTTP 200
-      if content = render_path(path, (request.layout || :layout))
+      if content = render_path(path, layout)
         content_type media_type(File.extname(path)), :charset => 'utf-8'
         status 200
         content
@@ -116,13 +123,13 @@ 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
   
-  use Middleman::Rack::Static
-  use Middleman::Rack::Sprockets
-  
   # Features disabled by default
   disable :slickmap
   disable :cache_buster
@@ -139,17 +146,23 @@ class Middleman::Base
   configure :build do
   end
   
-  def self.new(*args, &bk)
-    # 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?
-      class_eval File.read(local_config)
-      set :app_file, File.expand_path(local_config)
-    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, &bk)    
     # loop over enabled feature
-    @@features.flatten.each do |feature_name|
+    features.flatten.each do |feature_name|
       next unless send(:"#{feature_name}?")
       
       feature_path = "features/#{feature_name}"

data/lib/middleman/features/minify_css.rb

@@ -1,18 +0,0 @@
-module Middleman
-  module Minified
-    module Sass
-      include ::Haml::Filters::Base
-
-      def render(text)
-        result = ::Sass::Engine.new(text, ::Sass::Plugin.engine_options).render
-        
-        if Middleman::Base.respond_to?(:minify_css?) && Middleman::Base.minify_css?
-          compressor = YUI::CssCompressor.new
-          compressor.compress(result)
-        else
-          result
-        end
-      end
-    end
-  end
-end

data/lib/middleman/rack/downstream.rb

@@ -0,0 +1,17 @@
+module Middleman
+  module Rack
+    class Downstream
+      def initialize(app, options={})
+        @app = app
+      end
+
+      def call(env)
+        if env["DOWNSTREAM"]
+          env["DOWNSTREAM"]
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/middleman/rack/minify_css.rb

@@ -0,0 +1,27 @@
+begin
+  require "yui/compressor"
+rescue LoadError
+  puts "YUI-Compressor not available. Install it with: gem install yui-compressor"
+end
+  
+module Middleman
+  module Rack
+    class MinifyCSS
+      def initialize(app, options={})
+        @app = app
+      end
+
+      def call(env)
+        if env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.css$/) && Middleman::Base.enabled?(:minify_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
+        end
+        
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/middleman/rack/minify_javascript.rb

@@ -0,0 +1,29 @@
+begin
+  require "yui/compressor"
+rescue LoadError
+  puts "YUI-Compressor not available. Install it with: gem install yui-compressor"
+end
+  
+module Middleman
+  module Rack
+    class MinifyJavascript
+      def initialize(app, options={})
+        @app = app
+      end
+
+      def call(env)
+        if env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.js$/) && Middleman::Base.enabled?(:minify_javascript)
+          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
+        end
+        
+        @app.call(env)
+      end
+    end
+  end
+end
+
+# Middleman::Base.supported_formats << "js"

data/lib/middleman/rack/sprockets.rb

@@ -5,12 +5,6 @@ begin
 rescue LoadError
   puts "Sprockets not available. Install it with: gem install sprockets"
 end
-
-begin
-  require "yui/compressor"
-rescue LoadError
-  puts "YUI-Compressor not available. Install it with: gem install yui-compressor"
-end
   
 module Middleman
   module Rack
@@ -20,31 +14,26 @@ module Middleman
       end
 
       def call(env)
-        path   = env["PATH_INFO"]
-        source = File.join(Middleman::Base.views, path)
-            
-        if path.match(/\.js$/)
-          if File.exists?(source)
-            secretary = ::Sprockets::Secretary.new( :root   => Middleman::Base.root,
-                                                    :source_files => [ File.join("views", path) ],
-                                                    :load_path    => [ File.join("public", Middleman::Base.js_dir),
-                                                                       File.join("views", Middleman::Base.js_dir) ])
+        path = env["PATH_INFO"]
+        
+        source_pub  = File.join(Middleman::Base.views, path)
+        source_view = File.join(Middleman::Base.views, path)
+        source = "public" if File.exists?(source_pub) 
+        source = "views" if File.exists?(source_view)
+        
+        if env["DOWNSTREAM"] && path.match(/\.js$/) && source
+          source_file = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? env["DOWNSTREAM"][2].path : env["DOWNSTREAM"][2]
           
-            result = secretary.concatenation.to_s
-          else
-            result = File.read(File.join(Middleman::Base.public, path))
-          end
-          
-          
-          if Middleman::Base.respond_to?(:minify_javascript?) && Middleman::Base.minify_javascript?
-            compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
-            result = compressor.compress(result)
-          end
-
-          [200, { "Content-Type" => "text/javascript" }, [result]]
-        else
-          @app.call(env)
+          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
         end
+        
+        @app.call(env)
       end
     end
   end

data/lib/middleman/rack/static.rb

@@ -3,25 +3,21 @@ module Middleman
     class Static
       def initialize(app, options={})
         @app = app
-        root = Middleman::Base.public
-        @file_server = ::Rack::File.new(root)
-      end
-
-      def templatize_js?(path)
-        path.match(/\.js$/) && Middleman::Base.respond_to?(:minify_javascript?) && Middleman::Base.minify_javascript?
       end
 
       def call(env)
-        path = env["PATH_INFO"]
-        file_path = File.join(Middleman::Base.public, path)
-        
-        if templatize_js?(path)
-          @app.call(env)
-        elsif path.include?("favicon.ico") || (File.exists?(file_path) && !File.directory?(file_path))
-          @file_server.call(env)
-        else
-          @app.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)
+          file_server = ::Rack::File.new(Middleman::Base.public)
+          env["DOWNSTREAM"] = file_server.call(env)
+        elsif File.exists?(view_file_path) && !File.directory?(view_file_path)
+          file_server = ::Rack::File.new(Middleman::Base.views)
+          env["DOWNSTREAM"] = file_server.call(env)
         end
+        
+        @app.call(env)
       end
     end
   end

data/lib/middleman/sass.rb

@@ -23,7 +23,7 @@ module Middleman
           
           css_filename = File.join(location_of_sass_file, request.path_info)
           result = sass(path.to_sym, ::Compass.sass_engine_options.merge({ :css_filename => css_filename }))
-          if options.respond_to?(:minify_css?) && options.minify_css?
+          if options.enabled?(:minify_css?)
             YUI::CssCompressor.new.compress(result) 
           else
             result
@@ -84,7 +84,9 @@ class Middleman::Base
     ::Compass.configuration do |config|
       config.project_path          = self.root
       config.sass_dir              = File.join(File.basename(self.views), self.css_dir)
-      config.output_style          = :nested
+      config.output_style          = self.enabled?(:minify_css) ? :compressed : :nested
+      config.line_comments         = false
+      config.fonts_dir             = File.join(File.basename(self.public), self.fonts_dir)
       config.css_dir               = File.join(File.basename(self.public), self.css_dir)
       config.images_dir            = File.join(File.basename(self.public), self.images_dir)      
       config.http_images_path      = self.http_images_path rescue File.join(self.http_prefix || "/", self.images_dir)
@@ -102,5 +104,6 @@ class Middleman::Base
     end
     
     ::Compass.configure_sass_plugin!
+    Sass::Plugin.options.update(:line_comments => false)
   end
 end