middleman 0.14.1 → 0.99.0.pre

data/lib/middleman/features/smush_pngs.rb

@@ -1,9 +1,9 @@
-require "middleman/builder"
+class Middleman::Features::SmushPngs
+  def initialize(app)
+    require "middleman/builder"
 
-module Middleman
-  class Builder
-    alias_method :pre_smush_after_run, :after_run
-    def after_run
+    Middleman::Base.alias_method  :pre_smush_after_run, :after_run
+    Middleman::Base.define_method :after_run do
       pre_smush_after_run
       smush_dir = File.join(Middleman::Base.build_dir, Middleman::Base.images_dir)
       
@@ -33,4 +33,6 @@ module Middleman
       end
     end
   end
-end
+end
+
+Middleman::Features.register :smush_pngs, Middleman::Features::SmushPngs

data/lib/middleman/features/ugly_haml.rb

@@ -0,0 +1,7 @@
+class Middleman::Features::UglyHaml
+  def initialize(app)
+    Middleman::Base.set :haml, Middleman::Base.settings.haml.merge({ :ugly_haml => true })
+  end
+end
+
+Middleman::Features.register :ugly_haml, Middleman::Features::UglyHaml

data/lib/middleman/renderers.rb

@@ -0,0 +1,26 @@
+module Middleman
+
+  module Renderers
+    @@render_method_for_template_types = {}
+  
+    def self.register(method_name, template_type)
+      @@render_method_for_template_types[template_type.to_s] = method_name
+    end
+  
+    def self.get_method(template_path)
+      template_type = Tilt[template_path].to_s
+      @@render_method_for_template_types[template_type]
+    end
+
+  end
+end
+
+# Types built into Sinatra
+Middleman::Renderers.register(:less,    Tilt::LessTemplate)
+Middleman::Renderers.register(:haml,    Tilt::HamlTemplate)
+Middleman::Renderers.register(:builder, Tilt::BuilderTemplate)
+Middleman::Renderers.register(:erb,     Tilt::ERBTemplate)
+
+%w(haml
+   sass
+   coffee).each { |renderer| require "middleman/renderers/#{renderer}" }

data/lib/middleman/renderers/coffee.rb

@@ -0,0 +1,28 @@
+class Middleman::Base
+  def coffee(template, options={}, locals={})
+    options[:layout] = false
+    render :coffee, template, options, locals
+  end
+end
+
+unless defined? Tilt::CoffeeTemplate
+  # CoffeeScript info:
+  # http://jashkenas.github.com/coffee-script/
+  class Tilt::CoffeeTemplate < Tilt::Template
+    def initialize_engine
+      return if defined? ::CoffeeScript
+      require_template_library 'coffee-script'
+    end
+
+    def prepare
+      @output = nil
+    end
+
+    def evaluate(scope, locals, &block)
+      @output ||= ::CoffeeScript::compile(data, options)
+    end
+  end
+  Tilt.register 'coffee', Tilt::CoffeeTemplate
+end
+
+Middleman::Renderers.register(:coffee, Tilt::CoffeeTemplate)

data/lib/middleman/renderers/haml.rb

@@ -1,30 +1,7 @@
 require "haml"
 
 module Middleman
-  module Haml
-    module Renderer
-      def self.included(base)
-        base.supported_formats << "haml"
-        base.helpers Middleman::Haml::Helpers
-      end
-    
-      def render_path(path, layout)
-        if template_exists?(path, :haml)
-          result = nil
-          begin
-            layout = false if File.extname(path) == ".xml"
-            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>"
-          end
-          result
-        else
-          super
-        end
-      end
-    end
-  
+  module Haml  
     module Helpers
       def haml_partial(name, options = {})
         item_name = name.to_sym
@@ -66,5 +43,5 @@ module Middleman
 end
 
 class Middleman::Base
-  include Middleman::Haml::Renderer
+  helpers Middleman::Haml::Helpers
 end

data/lib/middleman/renderers/sass.rb

@@ -1,93 +1,18 @@
 require "sass"
 require "compass"
-require "fancy-buttons"
-
-begin
-  require "yui/compressor"
-rescue LoadError
-  puts "YUI-Compressor not available. Install it with: gem install yui-compressor"
-end
-
-module Middleman::Sass
-  def self.included(base)
-    base.supported_formats << "sass"
-  end
-
-  def render_path(path, layout)
-    if template_exists?(path, :sass)
-      begin
-        static_version = settings.public + request.path_info
-        send_file(static_version) if File.exists? static_version
-
-        location_of_sass_file = settings.environment == "build" ? 
-                                  File.join(Dir.pwd, settings.build_dir) : 
-                                  settings.public
-        
-        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 enabled?(:minify_css)
-          ::YUI::CssCompressor.new.compress(result) 
-        else
-          result
-        end
-      rescue Exception => e
-        sass_exception_string(e)
-      end
-    else
-      super
-    end
-  end
-
-  # Handle Sass errors
-  def sass_exception_string(e)
-    e_string = "#{e.class}: #{e.message}"
-
-    if e.is_a? ::Sass::SyntaxError
-      e_string << "\non line #{e.sass_line}"
-
-      if e.sass_filename
-        e_string << " of #{e.sass_filename}"
-
-        if File.exists?(e.sass_filename)
-          e_string << "\n\n"
-
-          min = [e.sass_line - 5, 0].max
-          begin
-            File.read(e.sass_filename).rstrip.split("\n")[
-              min .. e.sass_line + 5
-            ].each_with_index do |line, i|
-              e_string << "#{min + i + 1}: #{line}\n"
-            end
-          rescue
-            e_string << "Couldn't read sass file: #{e.sass_filename}"
-          end
-        end
-      end
-    end
-    <<END
-/*
-#{e_string}
-
-Backtrace:\n#{e.backtrace.join("\n")}
-*/
-body:before {
-white-space: pre;
-font-family: monospace;
-content: "#{e_string.gsub('"', '\"').gsub("\n", '\\A ')}"; }
-END
-  end
-end
 
 class Middleman::Base
-  include Middleman::Sass
+  def scss(template, options={}, locals={})
+    options[:layout] = false
+    render :scss, template, options, locals
+  end
 
   after_feature_init do
     ::Compass.configuration do |config|
-      config.cache_path            = File.join(self.root, ".sassc") # For sassc files
+      config.cache_path            = File.join(self.root, ".sass-cache") # For sassc files
       config.project_path          = self.root
       config.sass_dir              = File.join(File.basename(self.views), self.css_dir)
-      config.output_style          = self.enabled?(:minify_css) ? :compressed : :nested
+      config.output_style          = :nested
       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)      
@@ -98,17 +23,45 @@ class Middleman::Base
       config.add_import_path(config.sass_dir)
     end
     
-    ::Compass.configure_sass_plugin!
-    Sass::Plugin.options.update(:line_comments => true, :debug_info => true)
-    
     configure :build do
       ::Compass.configuration do |config|
         config.css_dir       = File.join(File.basename(self.build_dir), self.css_dir)
         config.images_dir    = File.join(File.basename(self.build_dir), self.images_dir)
       end
-      
-      ::Compass.configure_sass_plugin!
-      Sass::Plugin.options.update(:line_comments => false, :debug_info => false)
+    end
+  end
+end
+
+class Tilt::SassPlusCSSFilenameTemplate < Tilt::SassTemplate
+  def sass_options
+    location_of_sass_file = Middleman::Base.environment == "build" ? 
+                              File.join(Middleman::Base.root, Middleman::Base.build_dir) : 
+                              Middleman::Base.public
+
+    parts = basename.split('.')
+    parts.pop
+    css_filename = File.join(location_of_sass_file, Middleman::Base.css_dir, parts.join("."))
+    super.merge(::Compass.configuration.to_sass_engine_options).merge(:css_filename => css_filename)
+  end
+end
+Tilt.register 'sass', Tilt::SassPlusCSSFilenameTemplate
+Middleman::Renderers.register(:sass, Tilt::SassPlusCSSFilenameTemplate)
+
+class Tilt::ScssPlusCSSFilenameTemplate < Tilt::SassPlusCSSFilenameTemplate
+  def sass_options
+    super.merge(:syntax => :scss)
+  end
+end
+Tilt.register 'scss', Tilt::ScssPlusCSSFilenameTemplate
+Middleman::Renderers.register(:scss, Tilt::ScssPlusCSSFilenameTemplate)
+
+
+module Middleman::Haml
+  module Sass
+    include ::Haml::Filters::Base
+
+    def render(text)
+      ::Sass::Engine.new(text, ::Compass.configuration.to_sass_engine_options).render
     end
   end
 end

data/lib/middleman/template/init.rbt

@@ -1,6 +1,14 @@
-<% if css_dir %>set :css_dir, "<%= css_dir -%>"<% end %>
-<% if js_dir %>set :js_dir, "<%= js_dir -%>"<% end %>
-<% if images_dir %>set :images_dir, "<%= images_dir -%>"<% end %>
+# Automatic sitemaps
+# enable :slickmap
+
+# Automatic image dimension calculations
+# enable :automatic_image_sizes
+
+# Per-page layout changes
+# With no layout
+# page "/path/to/file.html", :layout => false
+# With alternative layout
+# page "/path/to/file.html", :layout => :otherlayout
 
 # Helpers
 helpers do
@@ -9,11 +17,26 @@ helpers do
   end
 end
 
-# Automatic sitemaps
-# enable :slickmap
+<% if css_dir %>
+set :css_dir, "<%= css_dir -%>"
+<% else %>
+# Change the CSS directory
+# set :css_dir, "alternative_css_directory"
+<% end %>
 
-# Automatic image dimension calculations
-# enable :automatic_image_sizes
+<% if js_dir %>
+set :js_dir, "<%= js_dir -%>"
+<% else %>
+# Change the JS directory
+# set :js_dir, "alternative_js_directory"
+<% end %>
+
+<% if images_dir %>
+set :images_dir, "<%= images_dir -%>"
+<% else %>
+# Change the images directory
+# set :images_dir, "alternative_image_directory"
+<% end %>
 
 # Build-specific configuration
 configure :build do

data/middleman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.14.1"
+  s.version = "0.99.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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-08-06}
+  s.date = %q{2010-09-05}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -40,26 +40,27 @@ Gem::Specification.new do |s|
      "features/step_definitions/middleman_steps.rb",
      "features/step_definitions/page_layout_steps.rb",
      "lib/middleman.rb",
+     "lib/middleman/assets.rb",
      "lib/middleman/base.rb",
      "lib/middleman/builder.rb",
      "lib/middleman/config.ru",
-     "lib/middleman/fastimage.rb",
+     "lib/middleman/features.rb",
      "lib/middleman/features/asset_host.rb",
      "lib/middleman/features/automatic_image_sizes.rb",
+     "lib/middleman/features/automatic_image_sizes/fastimage.rb",
      "lib/middleman/features/cache_buster.rb",
+     "lib/middleman/features/default_helpers.rb",
+     "lib/middleman/features/livereload.rb",
      "lib/middleman/features/minify_css.rb",
      "lib/middleman/features/minify_javascript.rb",
+     "lib/middleman/features/minify_javascript/rack.rb",
      "lib/middleman/features/relative_assets.rb",
      "lib/middleman/features/slickmap.rb",
      "lib/middleman/features/smush_pngs.rb",
-     "lib/middleman/helpers.rb",
-     "lib/middleman/rack/minify_css.rb",
-     "lib/middleman/rack/minify_javascript.rb",
-     "lib/middleman/rack/sprockets.rb",
-     "lib/middleman/renderers/builder.rb",
-     "lib/middleman/renderers/erb.rb",
+     "lib/middleman/features/ugly_haml.rb",
+     "lib/middleman/renderers.rb",
+     "lib/middleman/renderers/coffee.rb",
      "lib/middleman/renderers/haml.rb",
-     "lib/middleman/renderers/less.rb",
      "lib/middleman/renderers/sass.rb",
      "lib/middleman/template/init.rbt",
      "lib/middleman/template/views/index.html.haml",
@@ -70,7 +71,6 @@ Gem::Specification.new do |s|
      "spec/builder_spec.rb",
      "spec/fixtures/sample/init.rb",
      "spec/fixtures/sample/public/images/blank.gif",
-     "spec/fixtures/sample/public/javascripts/to-be-included.js",
      "spec/fixtures/sample/public/static.html",
      "spec/fixtures/sample/public/stylesheets/auto-css.css",
      "spec/fixtures/sample/public/stylesheets/static.css",
@@ -86,7 +86,6 @@ Gem::Specification.new do |s|
      "spec/fixtures/sample/views/index.html.haml",
      "spec/fixtures/sample/views/inline-css.html.haml",
      "spec/fixtures/sample/views/inline-js.html.haml",
-     "spec/fixtures/sample/views/javascripts/empty-with-include.js",
      "spec/fixtures/sample/views/layout.haml",
      "spec/fixtures/sample/views/maruku.html.maruku",
      "spec/fixtures/sample/views/page-classes.html.haml",
@@ -94,6 +93,8 @@ Gem::Specification.new do |s|
      "spec/fixtures/sample/views/stylesheets/asset_host.css.sass",
      "spec/fixtures/sample/views/stylesheets/relative_assets.css.sass",
      "spec/fixtures/sample/views/stylesheets/site.css.sass",
+     "spec/fixtures/sample/views/stylesheets/site_scss.css.scss",
+     "spec/fixtures/sample/views/stylesheets/test_less.css.less",
      "spec/helpers_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -101,80 +102,68 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{middleman}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/builder_spec.rb",
+    "spec/builder_spec.rb",
+     "spec/fixtures/sample/init.rb",
      "spec/helpers_spec.rb",
-     "spec/fixtures/sample/init.rb"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
-      s.add_runtime_dependency(%q<thin>, [">= 0"])
-      s.add_runtime_dependency(%q<shotgun>, [">= 0.8"])
-      s.add_runtime_dependency(%q<templater>, [">= 0"])
-      s.add_runtime_dependency(%q<sprockets>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
-      s.add_runtime_dependency(%q<sinatra-content-for>, [">= 0"])
-      s.add_runtime_dependency(%q<less>, [">= 0"])
-      s.add_runtime_dependency(%q<builder>, [">= 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"])
-      s.add_runtime_dependency(%q<compass>, [">= 0.10"])
-      s.add_runtime_dependency(%q<fancy-buttons>, [">= 0"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-      s.add_runtime_dependency(%q<smusher>, [">= 0"])
-      s.add_runtime_dependency(%q<compass-slickmap>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<thin>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<shotgun>, ["~> 0.8.0"])
+      s.add_runtime_dependency(%q<templater>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<sinatra>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<sinatra-content-for>, ["~> 0.2.0"])
+      s.add_runtime_dependency(%q<rack-test>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<yui-compressor>, ["~> 0.9.0"])
+      s.add_runtime_dependency(%q<haml>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<compass>, ["~> 0.10.0"])
+      s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.0"])
+      s.add_runtime_dependency(%q<smusher>, ["~> 0.4.5"])
+      s.add_runtime_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<thin>, [">= 0"])
-      s.add_dependency(%q<shotgun>, [">= 0.8"])
-      s.add_dependency(%q<templater>, [">= 0"])
-      s.add_dependency(%q<sprockets>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 1.0"])
-      s.add_dependency(%q<sinatra-content-for>, [">= 0"])
-      s.add_dependency(%q<less>, [">= 0"])
-      s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<yui-compressor>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 3.0"])
-      s.add_dependency(%q<compass>, [">= 0.10"])
-      s.add_dependency(%q<fancy-buttons>, [">= 0"])
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<smusher>, [">= 0"])
-      s.add_dependency(%q<compass-slickmap>, [">= 0"])
+      s.add_dependency(%q<rack>, ["~> 1.0"])
+      s.add_dependency(%q<thin>, ["~> 1.2.0"])
+      s.add_dependency(%q<shotgun>, ["~> 0.8.0"])
+      s.add_dependency(%q<templater>, ["~> 1.0.0"])
+      s.add_dependency(%q<sinatra>, ["~> 1.0"])
+      s.add_dependency(%q<sinatra-content-for>, ["~> 0.2.0"])
+      s.add_dependency(%q<rack-test>, ["~> 0.5.0"])
+      s.add_dependency(%q<yui-compressor>, ["~> 0.9.0"])
+      s.add_dependency(%q<haml>, ["~> 3.0"])
+      s.add_dependency(%q<compass>, ["~> 0.10.0"])
+      s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
+      s.add_dependency(%q<smusher>, ["~> 0.4.5"])
+      s.add_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<thin>, [">= 0"])
-    s.add_dependency(%q<shotgun>, [">= 0.8"])
-    s.add_dependency(%q<templater>, [">= 0"])
-    s.add_dependency(%q<sprockets>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 1.0"])
-    s.add_dependency(%q<sinatra-content-for>, [">= 0"])
-    s.add_dependency(%q<less>, [">= 0"])
-    s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<yui-compressor>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 3.0"])
-    s.add_dependency(%q<compass>, [">= 0.10"])
-    s.add_dependency(%q<fancy-buttons>, [">= 0"])
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<smusher>, [">= 0"])
-    s.add_dependency(%q<compass-slickmap>, [">= 0"])
+    s.add_dependency(%q<rack>, ["~> 1.0"])
+    s.add_dependency(%q<thin>, ["~> 1.2.0"])
+    s.add_dependency(%q<shotgun>, ["~> 0.8.0"])
+    s.add_dependency(%q<templater>, ["~> 1.0.0"])
+    s.add_dependency(%q<sinatra>, ["~> 1.0"])
+    s.add_dependency(%q<sinatra-content-for>, ["~> 0.2.0"])
+    s.add_dependency(%q<rack-test>, ["~> 0.5.0"])
+    s.add_dependency(%q<yui-compressor>, ["~> 0.9.0"])
+    s.add_dependency(%q<haml>, ["~> 3.0"])
+    s.add_dependency(%q<compass>, ["~> 0.10.0"])
+    s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
+    s.add_dependency(%q<smusher>, ["~> 0.4.5"])
+    s.add_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])