middleman 0.9.0.pre → 0.9.3

data/.gitignore

@@ -1,7 +1,6 @@
+*.sw?
 .DS_Store
 coverage
 rdoc
 pkg
-.sass-cache
-.sassc
-.tmp
+.sass-cache

data/README.rdoc

@@ -2,10 +2,6 @@
 
 The Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml and Sass producing only the cleanest and efficient markup.
 
-== Getting Started
-
-Everything you need to know is on the wiki: http://wiki.github.com/tdreyno/middleman
-
 == Copyright
 
 Copyright (c) 2009 Thomas Reynolds. See LICENSE for details.

data/Rakefile

@@ -1,36 +1,29 @@
-require 'lib/middleman'
+require 'rubygems'
 require 'rake'
-require 'spec/rake/spectask'
-require 'cucumber/rake/task'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "middleman"
-    gem.summary = %Q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
+    gem.summary = %Q{A static site generator utilizing Haml and Sass}
     gem.email = "tdreyno@gmail.com"
-    gem.homepage = "http://wiki.github.com/tdreyno/middleman"
+    gem.homepage = "http://github.com/tdreyno/middleman"
     gem.authors = ["Thomas Reynolds"]
     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.add_dependency("rack",                "~>1.0")
-    gem.add_dependency("thin",                "~>1.2.0")
-    gem.add_dependency("shotgun",             "~>0.8.0")
-    gem.add_dependency("templater",           "~>1.0.0")
-    gem.add_dependency("sinatra",             "~>1.0")
-    gem.add_dependency("sinatra-content-for", "~>0.2.0")
-    gem.add_dependency("rack-test",           "~>0.5.0")
-    gem.add_dependency("yui-compressor",      "~>0.9.0")
-    gem.add_dependency("haml",                "~>3.0")
-    gem.add_dependency("compass",             "~>0.10.0")
-    gem.add_dependency("json_pure",           "~>1.4.0")
-    gem.add_dependency("smusher",             "~>0.4.5")
-    gem.add_dependency("compass-slickmap",    "~>0.3.0")
-    # gem.add_dependency("livereload",          "~>1.4.0")
-    
-    gem.add_development_dependency("rspec")
-    gem.add_development_dependency("cucumber")
-    gem.add_development_dependency("jeweler")
+    gem.add_dependency("templater")
+    gem.add_dependency("sprockets")
+    gem.add_dependency("sinatra")
+    gem.add_dependency("sinatra-content-for")
+    gem.add_dependency("rack-test")
+    gem.add_dependency("yui-compressor")
+    gem.add_dependency("haml", ">=2.1.0")
+    gem.add_dependency("chriseppstein-compass")
+  end
+  
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
   end
   
   Jeweler::GemcutterTasks.new
@@ -38,15 +31,32 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
+require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
 task :spec => :check_dependencies
 
-task :default => [:cucumber, :spec]
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "middleman #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.9.0.pre
+0.9.3

data/bin/mm-build

@@ -1,12 +1,63 @@
 #!/usr/bin/env ruby
 
+require 'templater'
+
 ENV['MM_ENV'] = "build"
 
 # Require app
 require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
 require 'middleman/builder'
 
-# Middleman::Base.init!
-Middleman::Builder.init!
+Middleman::Base.init!
+
+module Generators
+  extend Templater::Manifold
+  desc "Build a staticmatic site"
+
+  class Builder < Templater::Generator
+    # Define source and desintation
+    def self.source_root; Dir.pwd; end
+    def destination_root; File.join(Dir.pwd, Middleman::Base.build_dir); end
+
+    # Override template to ask middleman for the correct extension to output
+    def self.template(name, *args, &block)
+      return if args[0].include?('layout')
+      
+      args.first.split('/').each do |part|
+        return if part[0,1] == '_'
+      end
+      
+      if (args[0] === args[1])
+        args[1] = args[0].gsub("#{File.basename(Middleman::Base.views)}/", "")
+                         .gsub("#{File.basename(Middleman::Base.public)}/", "")
+        if File.extname(args[1]) != ".js"
+          args[1] = args[1].gsub!(File.extname(args[1]), "") if File.basename(args[1]).split('.').length > 2
+        end
+      end
+      
+      super(name, *args, &block)
+    end
+
+    def self.file(name, *args, &block)
+      if (args[0] === args[1])
+        args[1] = args[0].gsub("#{File.basename(Middleman::Base.views)}/", "")
+                         .gsub("#{File.basename(Middleman::Base.public)}/", "")
+      end
+      super(name, *args, &block)
+    end
+    
+    glob! File.basename(Middleman::Base.public), Middleman::Base.supported_formats
+    glob! File.basename(Middleman::Base.views),  Middleman::Base.supported_formats
+  end
+
+  add :build, Builder
+end
+
+# Monkey-patch to use a dynamic renderer
+class Templater::Actions::Template
+  def render
+    ::Middleman::Builder.render_file(source, destination)
+  end
+end
 
-Middleman::Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))
+Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))

data/bin/mm-init

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
 require 'templater'
 
 module Generators
@@ -7,12 +6,11 @@ module Generators
   desc "Generator for streamlining staticmatic"
 
   class NewSite < Templater::Generator
-    desc "Creates a new middleman scaffold."
+    desc "Creates a new staticmatic scaffold."
     first_argument :location, :required => true, :desc => "Project location"
-    
-    option :css_dir, :desc => 'The path to the css files'
-    option :js_dir, :desc => 'The path to the javascript files'
-    option :images_dir, :desc => 'The path to the image files'
+
+    # css_dir
+    # images_dir
 
     def destination_root
       File.expand_path(location)
@@ -22,13 +20,12 @@ module Generators
       File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'template')
     end
     
-    template :init, "init.rb"
+    file :init, "init.rb"
     glob! :views
     glob! :public
-    
-    empty_directory :stylesheets, "public/stylesheets"#, File.join("public", css_dir)
-    empty_directory :javascripts, "public/javascripts"#, File.join("public", js_dir)
-    empty_directory :images, "public/images"#,      File.join("public", images_dir)
+    empty_directory :stylesheets, "public/stylesheets"
+    empty_directory :javascripts, "public/javascripts"
+    empty_directory :images,      "public/images"
   end
 
   add :setup, NewSite

data/bin/mm-server

@@ -1,61 +1,9 @@
 #!/usr/bin/env ruby
 
-# Non-blocking site rebuilding
-trap("TSTP") do 
-  fork do
-    require "open3"
-    first_run = true
-    Open3.popen3(%Q{cd "#{Dir.pwd}" && #{File.join(File.dirname(__FILE__), "mm-build")} | grep FORCED}) do |stdin, stdout, stderr|
-      puts "\n== Building the site..."
-      stdout.readlines.each do |l|
-        puts "== Updated:" if first_run
-        puts " " + l.split("[FORCED]").last.chomp
-        first_run = false
-      end
-      puts "== Build complete"
-    end
-  end
-end
-
-require 'optparse'
-
 # Require Middleman
 require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 
-env = ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
-options = { :Port => 4567, :AccessLog => [] }
-
-OptionParser.new { |opts|
-  opts.banner = "Usage: mm-server [rack options]"
-  opts.separator ""
-  opts.separator "Rack options:"
-  opts.on("-p", "--port PORT", "use PORT (default: 4567)") { |port|
-    options[:Port] = port
-  }
-  opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e|
-    env = e
-  }
-  opts.on("--debug", "Debug mode") {
-    ::Middleman::Base.set :logging, true
-  }
-  
-  opts.parse! ARGV
-}
-
-ENV['RACK_ENV'] = env
-
-class Middleman::Base
-  set :root, Dir.pwd
-end
-
-require 'shotgun'
-config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
-app = Shotgun.new(config, &lambda { |inner_app| Middleman::Base })
-
-require 'rubygems'
-require 'thin'
-Thin::Logging.silent = true
-
-Rack::Handler::Thin.run app, options do |inst|
-  puts "== The Middleman is standing watch on port #{options[:Port]}"
-end
+# Start Middleman
+Middleman::Base.set({ :server => %w[thin webrick],
+                      :root   => Dir.pwd })
+Middleman::Base.run!

data/deps.rip

@@ -0,0 +1,7 @@
+git://github.com/jnicklas/templater.git
+git://github.com/sstephenson/sprockets.git
+git://github.com/sinatra/sinatra.git
+git://github.com/nex3/haml.git
+git://github.com/chriseppstein/compass.git
+git://github.com/foca/sinatra-content-for.git
+git://github.com/brynary/rack-test.git

data/lib/middleman.rb

@@ -1,8 +1,4 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-require 'rubygems'
-
-module Middleman
-  autoload :Base, "middleman/base"  
-end
+require 'middleman/base'

data/lib/middleman/base.rb

@@ -1,147 +1,125 @@
-# We're riding on Sinatra, so let's include it
-require "sinatra/base"
-require "sinatra/content_for"
+require 'rubygems' unless ENV['NO_RUBYGEMS']
+require 'haml'
+require 'sinatra/base'
+require 'middleman/helpers'
 
-class Sinatra::Request
-  attr_accessor :layout
+def mime(ext, type)
+  ext = ".#{ext}" unless ext.to_s[0] == ?.
+  Rack::Mime::MIME_TYPES[ext.to_s] = type
 end
 
 module Middleman
   class Base < Sinatra::Base
     set :app_file, __FILE__
-    set :root, ENV["MM_DIR"] || Dir.pwd
-    set :reload, false
-    set :sessions, false
-    set :logging, false
+    set :root, Dir.pwd
     set :environment, ENV['MM_ENV'] || :development
-    set :index_file, "index.html"
-    set :js_dir, "javascripts"
+    set :supported_formats, []
+    set :index_file, 'index.html'
     set :css_dir, "stylesheets"
     set :images_dir, "images"
-    set :fonts_dir, "fonts"
     set :build_dir, "build"
-    set :http_prefix, nil
-    
-    helpers Sinatra::ContentFor
-    
-    set :features, []
-    def self.enable(*opts)
-      set :features, (self.features << opts).flatten
-      super
-    end
-    
-    def self.disable(*opts)
-      current = self.features
-      current -= opts.flatten
-      set :features, current
-      super
-    end
-    
-    def self.set(option, value=self, &block)
-      if block_given?
-        value = Proc.new { block }
-      end
-      
-      super(option, value, &nil)
-    end
-    
-    @@afters = []
-    def self.after_feature_init(&block)
-      @@afters << block
+
+    enable :compass
+    enable :content_for
+    enable :sprockets
+    #enable :slickmap
+    disable :cache_buster
+    disable :minify_css
+    disable :minify_javascript
+    disable :relative_assets
+    disable :markaby
+    disable :maruku
+    
+    # include helpers
+    helpers Middleman::Helpers
+    
+    # Default build features
+    configure :build do
+      enable :minify_css
+      enable :minify_javascript
+      enable :cache_buster
+      # disable :slickmap
     end
-    
-    # Rack helper for adding mime-types during local preview
-    def self.mime(ext, type)
-      ext = ".#{ext}" unless ext.to_s[0] == ?.
-      ::Rack::Mime::MIME_TYPES[ext.to_s] = type
+  
+    def template_exists?(path, renderer=nil)
+      template_path = path.dup
+      template_path << ".#{renderer}" if renderer
+      File.exists? File.join(options.views, template_path)
     end
     
-    @@layout = nil
-    def self.page(url, options={}, &block)
-      layout = @@layout
-      layout = options[:layout] if !options[:layout].nil?
-      
-      get(url) do
-        return yield if block_given?
-        process_request(layout)
+    # Base case renderer (do nothing), Should be over-ridden
+    module StaticRender
+      def render_path(path)
+        false
       end
     end
-    
-    def self.with_layout(layout, &block)
-      @@layout = layout
-      class_eval(&block) if block_given?
-    ensure
-      @@layout = nil
-    end
-    
-    def self.enabled?(name)
-      name = (name.to_s << "?").to_sym
-      self.respond_to?(name) && self.send(name)
-    end
-    
-    def enabled?(name)
-      self.class.enabled?(name)
-    end
-
-    # This will match all requests not overridden in the project's init.rb
+    include StaticRender
+  
+    # All other files
+    disable :static
     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
       path = request.path
-      path << settings.index_file if path.match(%r{/$})
+      path << options.index_file if path.match(%r{/$})
       path.gsub!(%r{^/}, '')
-
-      template_path = locate_template_file(path)
-      if template_path
-        content_type mime_type(File.extname(path)), :charset => 'utf-8'
-        
-        renderer = Middleman::Renderers.get_method(template_path)
-        if respond_to? renderer
+    
+      if content = render_path(path)
+        content_type media_type(File.extname(path)), :charset => 'utf-8'
+        status 200
+        content
+      else
+        # Otherwise, send the static file
+        path = File.join(options.public, request.path)
+        if File.exists?(path)
           status 200
-          return send(renderer, path.to_sym, { :layout => layout })
+          send_file(path)
+        else
+          status 404
         end
       end
-      
-      status 404
     end
     
-    def locate_template_file(path)
-      template_path = File.join(settings.views, "#{path}.*")
-      Dir.glob(template_path).first
-    end
-  end
-end
-
-require "middleman/assets"
-require "middleman/renderers"
-require "middleman/features"
-
-# The Rack App
-class Middleman::Base
-  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)
+    def self.run!(options={}, &block)
+      init!
+      set options
+      handler      = detect_rack_handler
+      handler_name = handler.name.gsub(/.*::/, '')
+      puts "== The Middleman is standing watch on port #{port}"
+      handler.run self, :Host => host, :Port => port do |server|
+        trap(:INT) do
+          ## Use thins' hard #stop! if available, otherwise just #stop
+          server.respond_to?(:stop!) ? server.stop! : server.stop
+          puts "\n== The Middleman has ended his patrol"
+        end
+      
+        if block_given?
+          block.call
+          ## Use thins' hard #stop! if available, otherwise just #stop
+          server.respond_to?(:stop!) ? server.stop! : server.stop
+        end
+      end
+    rescue Errno::EADDRINUSE => e
+      puts "== The Middleman is already standing watch on port #{port}!"
     end
     
-    # loop over enabled feature
-    features.flatten.each do |feature_name|
-      next unless send(:"#{feature_name}?")
-      $stderr.puts "== Enabling: #{feature_name.to_s.capitalize}" if logging?
-      Middleman::Features.run(feature_name, self)
+    def self.init!
+      # Check for local config
+      local_config = File.join(self.root, "init.rb")
+      if File.exists? local_config
+        puts "== Local config at: #{local_config}"
+        class_eval File.read(local_config)
+      end
+
+      require "middleman/features/haml"
+      
+      # loop over enabled feature
+      features_path = File.expand_path("features/*.rb", File.dirname(__FILE__))
+      Dir[features_path].each do |f|
+        feature_name = File.basename(f, '.rb')
+        option_name = :"#{feature_name}?"
+        if respond_to?(option_name) && send(option_name) === true
+          require "middleman/features/#{feature_name}"
+        end
+      end
     end
-    
-    use ::Rack::ConditionalGet if environment == :development
-    
-    @@afters.each { |block| class_eval(&block) }
-    
-    super
   end
-end
+end