middleman 0.14.1 → 0.99.0.pre

data/lib/middleman/features/asset_host.rb

@@ -1,24 +1,21 @@
-class Middleman::Base
-  after_feature_init do
-    ::Compass.configuration do |config|
-      config.asset_host(&self.asset_host)
+class Middleman::Features::AssetHost
+  def initialize(app)
+    Middleman::Base.after_feature_init do
+      if Middleman::Base.asset_host.is_a?(Proc)
+        ::Compass.configuration.asset_host(&Middleman::Base.asset_host)
+      end
     end
-  end if self.enabled?(:asset_host) && self.asset_host && self.asset_host.is_a?(Proc)
-end
-
-class << Middleman::Base
-  alias_method :pre_asset_host_asset_url, :asset_url
-  def asset_url(path, prefix="", request=nil)
-    original_output = pre_asset_host_asset_url(path, prefix, request)
-    
-    valid_extensions = %w(.png .gif .jpg .jpeg .js .css)
     
-    if !self.enabled?(:asset_host) || path.include?("://") || !valid_extensions.include?(File.extname(path)) || !self.asset_host || !self.asset_host.is_a?(Proc) || !self.asset_host.respond_to?(:call)
-      return original_output
-    end
+    Middleman::Assets.register :asset_host do |path, prefix, request|
+      original_output = Middleman::Assets.before(:asset_host, path, prefix, request)
 
-    asset_prefix = self.asset_host.call(original_output)
-    
-    return File.join(asset_prefix, original_output)
+      valid_extensions = %w(.png .gif .jpg .jpeg .js .css)
+
+      asset_prefix = Middleman::Base.asset_host.call(original_output)
+
+      File.join(asset_prefix, original_output)
+    end
   end
 end
+
+Middleman::Features.register :asset_host, Middleman::Features::AssetHost

data/lib/middleman/features/automatic_image_sizes.rb

@@ -1,31 +1,31 @@
-require "middleman/fastimage"
+class Middleman::Features::AutomaticImageSizes
+  def initialize(app)
+    require "middleman/features/automatic_image_sizes/fastimage"
 
-class Middleman::Base
-  alias_method :pre_automatic_image_tag, :image_tag
-  helpers do
-    def image_tag(path, params={})
-      if !self.enabled?(:automatic_image_sizes)
-        return pre_automatic_image_tag(path, params)
-      end
-
-      if (!params[:width] || !params[:height]) && !path.include?("://")
-        params[:alt] ||= ""
-        http_prefix = settings.http_images_path rescue settings.images_dir
+    Middleman::Base.send :alias_method, :pre_automatic_image_tag, :image_tag
+    Middleman::Base.helpers do
+      def image_tag(path, params={})
+        if (!params[:width] || !params[:height]) && !path.include?("://")
+          params[:alt] ||= ""
+          http_prefix = settings.http_images_path rescue settings.images_dir
 
-        begin
-          real_path = File.join(settings.public, settings.images_dir, path)
-          if File.exists? real_path
-            dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true)
-            params[:width]  ||= dimensions[0]
-            params[:height] ||= dimensions[1]
+          begin
+            real_path = File.join(settings.public, settings.images_dir, path)
+            if File.exists? real_path
+              dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true)
+              params[:width]  ||= dimensions[0]
+              params[:height] ||= dimensions[1]
+            end
+          rescue
           end
-        rescue
-        end
 
-        capture_haml { haml_tag(:img, params.merge(:src => asset_url(path, http_prefix))) }
-      else
-        pre_automatic_image_tag(path, params)
+          capture_haml { haml_tag(:img, params.merge(:src => asset_url(path, http_prefix))) }
+        else
+          pre_automatic_image_tag(path, params)
+        end
       end
     end
   end
-end
+end
+
+Middleman::Features.register :automatic_image_sizes, Middleman::Features::AutomaticImageSizes

data/lib/middleman/features/cache_buster.rb

@@ -1,50 +1,43 @@
-class Middleman::Base  
-  after_feature_init do 
-    ::Compass.configuration do |config|
-      if self.enabled?(:cache_buster)
+class Middleman::Features::CacheBuster
+  def initialize(app)
+    Middleman::Assets.register :cache_buster do |path, prefix, request|
+      http_path = Middleman::Assets.before(:cache_buster, path, prefix, request)
+
+      if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
+        http_path
+      else
+        begin
+          prefix = Middleman::Base.images_dir if prefix == Middleman::Base.http_images_path
+        rescue
+        end
+
+        real_path_static  = File.join(Middleman::Base.public, prefix, path)
+
+        if File.readable?(real_path_static)
+          http_path << "?" + File.mtime(real_path_static).strftime("%s") 
+        elsif Middleman::Base.environment == "build"
+          real_path_dynamic = File.join(Middleman::Base.root, Middleman::Base.build_dir, prefix, path)
+          http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
+        end
+
+        http_path
+      end
+    end
+    
+    Middleman::Base.after_feature_init do 
+      ::Compass.configuration do |config|
         config.asset_cache_buster do |path, real_path|
           real_path = real_path.path if real_path.is_a? File
-          real_path = real_path.gsub(File.join(self.root, self.build_dir), self.public)
+          real_path = real_path.gsub(File.join(Middleman::Base.root, Middleman::Base.build_dir), Middleman::Base.public)
           if File.readable?(real_path)
             File.mtime(real_path).strftime("%s") 
           else
             $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
           end
         end
-      else
-        config.asset_cache_buster { false }
       end
     end
-    
-    ::Compass.configure_sass_plugin!
   end
 end
-    
-class << Middleman::Base    
-  alias_method :pre_cache_buster_asset_url, :asset_url
-  def asset_url(path, prefix="", request=nil)
-    http_path = pre_cache_buster_asset_url(path, prefix, request)
-    
-    return http_path unless self.enabled?(:cache_buster)
-    
-    if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
-      http_path
-    else
-      begin
-        prefix = self.images_dir if prefix == self.http_images_path
-      rescue
-      end
-      
-      real_path_static  = File.join(self.public, prefix, path)
-      
-      if File.readable?(real_path_static)
-        http_path << "?" + File.mtime(real_path_static).strftime("%s") 
-      elsif Middleman::Base.environment == "build"
-        real_path_dynamic = File.join(self.root, self.build_dir, prefix, path)
-        http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
-      end
-      
-      http_path
-    end
-  end
-end
+
+Middleman::Features.register :cache_buster, Middleman::Features::CacheBuster

data/lib/middleman/{helpers.rb → features/default_helpers.rb}

@@ -1,15 +1,9 @@
-module Middleman
-  class Base
-    def self.asset_url(path, prefix="", request=nil)
-      path.include?("://") ? path : File.join(self.http_prefix || "/", prefix, path)
-    end
+class Middleman::Features::DefaultHelpers
+  def initialize(app)
+    Middleman::Base.helpers Helpers
   end
   
   module Helpers
-    def haml_partial(name, options = {})
-      haml name.to_sym, options.merge(:layout => false)
-    end
-    
     def auto_stylesheet_link_tag(separator="/")
       path = request.path_info.dup
       path << self.class.index_file if path.match(%r{/$})
@@ -19,8 +13,9 @@ module Middleman
 
       css_file = File.join(self.class.public, self.class.css_dir, "#{path}.css")
       sass_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.sass")
+      scss_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.scss")
     
-      if File.exists?(css_file) || File.exists?(sass_file)
+      if File.exists?(css_file) || File.exists?(sass_file) || File.exists?(scss_file)
         stylesheet_link_tag "#{path}.css"
       end
     end
@@ -38,7 +33,7 @@ module Middleman
     end
     
     def asset_url(path, prefix="")
-      self.class.asset_url(path, prefix, request)
+      Middleman::Assets.get_url(path, prefix, request)
     end
     
     def link_to(title, url="#", params={})
@@ -69,3 +64,5 @@ module Middleman
     end
   end
 end
+
+Middleman::Features.register :default_helpers, Middleman::Features::DefaultHelpers, { :auto_enable => true }

data/lib/middleman/features/livereload.rb

@@ -0,0 +1,19 @@
+class Middleman::Features::LiveReload
+  def initialize(app)
+    return unless Middleman::Base.environment == :development
+    
+    begin
+      require 'livereload'
+    rescue LoadError
+      puts "Livereload not available. Install it with: gem install livereload"
+    end
+  
+    new_config = ::LiveReload::Config.new do |config|
+      config.exts = %w(haml sass scss coffee less builder)
+    end
+  
+    ::LiveReload.run [Middleman::Base.public, Middleman::Base.views], new_config
+  end
+end
+
+Middleman::Features.register :livereload, Middleman::Features::LiveReload

data/lib/middleman/features/minify_css.rb

@@ -0,0 +1,9 @@
+class Middleman::Features::MinifyCSS
+  def initialize(app)
+    Middleman::Base.after_feature_init do
+      ::Compass.configuration.output_style = :compressed
+    end
+  end
+end
+
+Middleman::Features.register :minify_css, Middleman::Features::MinifyCSS

data/lib/middleman/features/minify_javascript.rb

@@ -1,22 +1,20 @@
-module Middleman
-  module Minified
+class Middleman::Features::MinifyJavascript
+  def initialize(app)
+    Haml::Javascript.send :include, ::Haml::Filters::Base
+    
+    require "middleman/features/minify_javascript/rack"
+    app.use Middleman::Rack::MinifyJavascript
+  end
+  
+  module Haml
     module Javascript
-      include ::Haml::Filters::Base
       def render_with_options(text, options)
-        if Middleman::Base.respond_to?(:minify_javascript?) && Middleman::Base.minify_javascript?
-          compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
-          data = compressor.compress(text)
-          %Q{<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>}
-        else
-          <<END
-<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>
-  //<![CDATA[
-    #{text.rstrip.gsub("\n", "\n    ")}
-  //]]>
-</script>
-END
-        end
+        compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
+        data = compressor.compress(text)
+        %Q{<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>}
       end
     end
   end
-end
+end
+
+Middleman::Features.register :minify_javascript, Middleman::Features::MinifyJavascript

data/lib/middleman/features/minify_javascript/rack.rb

@@ -0,0 +1,31 @@
+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)
+        status, headers, response = @app.call(env)
+    
+        if env["PATH_INFO"].match(/\.js$/)
+          compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
+      
+          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
+    
+        [status, headers, response]
+      end
+    end
+    
+  end
+end

data/lib/middleman/features/relative_assets.rb

@@ -1,46 +1,35 @@
-class Middleman::Base  
-  after_feature_init do 
-    ::Compass.configuration do |config|
-      config.relative_assets = Proc.new do
-        Middleman::Base.enabled?(:relative_assets)
+class Middleman::Features::RelativeAssets
+  def initialize(app)
+    ::Compass.configuration.relative_assets = true
+  
+    Middleman::Assets.register :relative_assets do |path, prefix, request|
+      begin
+        prefix = Middleman::Base.images_dir if prefix == Middleman::Base.http_images_path
+      rescue
       end
-    end
-
-    ::Compass.configure_sass_plugin!
-  end
-end
-
-class << Middleman::Base
-  alias_method :pre_relative_asset_url, :asset_url
-  def asset_url(path, prefix="", request=nil)
-    if !self.enabled?(:relative_assets)
-      return pre_relative_asset_url(path, prefix, request)
-    end
-    
-    begin
-      prefix = self.images_dir if prefix == self.http_images_path
-    rescue
-    end
     
-    if path.include?("://")
-      pre_relative_asset_url(path, prefix, request)
-    elsif path[0,1] == "/"
-      path
-    else
-      path = File.join(prefix, path) if prefix.length > 0
-      request_path = request.path_info.dup
-      request_path << self.index_file if path.match(%r{/$})
-      request_path.gsub!(%r{^/}, '')
-      parts = request_path.split('/')
-
-      if parts.length > 1
-        arry = []
-        (parts.length - 1).times { arry << ".." }
-        arry << path
-        File.join(*arry)
-      else
+      if path.include?("://")
+        Middleman::Assets.before(:relative_assets, path, prefix, request)
+      elsif path[0,1] == "/"
         path
+      else
+        path = File.join(prefix, path) if prefix.length > 0
+        request_path = request.path_info.dup
+        request_path << Middleman::Base.index_file if path.match(%r{/$})
+        request_path.gsub!(%r{^/}, '')
+        parts = request_path.split('/')
+
+        if parts.length > 1
+          arry = []
+          (parts.length - 1).times { arry << ".." }
+          arry << path
+          File.join(*arry)
+        else
+          path
+        end
       end
     end
   end
-end
+end
+
+Middleman::Features.register :relative_assets, Middleman::Features::RelativeAssets

data/lib/middleman/features/slickmap.rb

@@ -1,92 +1,91 @@
-begin
-  require 'slickmap'
-  ::Compass.configure_sass_plugin!
-rescue LoadError
-  puts "Slickmap not available. Install it with: gem install compass-slickmap"
-end
+Entry = Struct.new(:dir, :children)
 
-if Middleman::Base.environment == "build"
-  Middleman::Builder.template :slickmap, "sitemap.html", "sitemap.html"
-end
+class Middleman::Features::Slickmap
+  def initialize(app)
+    require 'slickmap'
 
-Entry = Struct.new(:dir, :children)
+    if Middleman::Base.environment == "build"
+      Middleman::Builder.template :slickmap, "sitemap.html", "sitemap.html"
+    end
 
-class Middleman::Base
-  def build_sitemap(&block)    
-    @@utility = []
-    [recurse_sitemap(Middleman::Base.views, &block), @@utility]
-  end
-  
-  def recurse_sitemap(path, &block)
-    bad_ext = path.split('.html')[1]
-    path = path.gsub(bad_ext, '') if bad_ext
-    entry = Entry.new(path, [])
+    def build_sitemap(&block)    
+      @@utility = []
+      [recurse_sitemap(Middleman::Base.views, &block), @@utility]
+    end
 
-    #no "." or ".." dirs
-    Dir[File.join(path, "*")].each do |e|
-      next if !File.directory?(e) && !e.include?(".html")
-      if File.directory?(e)
-        entry.children << recurse_sitemap(e, &block)
-      elsif block_given?
-        how_to_handle = block.call(e)
-        if how_to_handle == :valid
+    def recurse_sitemap(path, &block)
+      bad_ext = path.split('.html')[1]
+      path = path.gsub(bad_ext, '') if bad_ext
+      entry = Entry.new(path, [])
+
+      #no "." or ".." dirs
+      Dir[File.join(path, "*")].each do |e|
+        next if !File.directory?(e) && !e.include?(".html")
+        if File.directory?(e)
           entry.children << recurse_sitemap(e, &block)
-        elsif how_to_handle == :utility
-          bad_ext = e.split('.html')[1]
-          e = e.gsub(bad_ext, '') if bad_ext
-          @@utility << e.gsub(Middleman::Base.views + "/", '')
+        elsif block_given?
+          how_to_handle = block.call(e)
+          if how_to_handle == :valid
+            entry.children << recurse_sitemap(e, &block)
+          elsif how_to_handle == :utility
+            bad_ext = e.split('.html')[1]
+            e = e.gsub(bad_ext, '') if bad_ext
+            @@utility << e.gsub(Middleman::Base.views + "/", '')
+          end
         end
       end
-    end
 
-    entry
-  end
-  
-  helpers do
-    def sitemap_node(n, first=false)
-      if n.children.length < 1
-        if !first && File.extname(n.dir).length > 0
-          haml_tag :li do
-            path = n.dir.gsub(self.class.views, '')
-            haml_concat link_to(File.basename(path), path)
-          end
-        end
-      else  
-        haml_tag(:li, :id => first ? "home" : nil) do
-          if first
-            haml_concat link_to("Homepage", "/" + self.class.index_file)
-          else
-            # we are a dir
-            index = n.children.find { |c| c.dir.include?(self.class.index_file) }
-            haml_concat link_to(index.dir.gsub(self.class.views + "/", '').gsub("/" + File.basename(index.dir), '').capitalize, index.dir.gsub(self.class.views, ''))
+      entry
+    end
+    
+    Middleman::Base.helpers do
+      def sitemap_node(n, first=false)
+        if n.children.length < 1
+          if !first && File.extname(n.dir).length > 0
+            haml_tag :li do
+              path = n.dir.gsub(self.class.views, '')
+              haml_concat link_to(File.basename(path), path)
+            end
           end
-      
-          other_children = n.children.select { |c| !c.dir.include?(self.class.index_file) }
-          if other_children.length > 0
+        else  
+          haml_tag(:li, :id => first ? "home" : nil) do
             if first
-              other_children.each { |i| sitemap_node(i) }
+              haml_concat link_to("Homepage", "/" + self.class.index_file)
             else
-              haml_tag :ul do
+              # we are a dir
+              index = n.children.find { |c| c.dir.include?(self.class.index_file) }
+              haml_concat link_to(index.dir.gsub(self.class.views + "/", '').gsub("/" + File.basename(index.dir), '').capitalize, index.dir.gsub(self.class.views, ''))
+            end
+
+            other_children = n.children.select { |c| !c.dir.include?(self.class.index_file) }
+            if other_children.length > 0
+              if first
                 other_children.each { |i| sitemap_node(i) }
+              else
+                haml_tag :ul do
+                  other_children.each { |i| sitemap_node(i) }
+                end
               end
             end
-          end
-        end  
+          end  
+        end
       end
     end
-  end
-  
-  get '/sitemap.html' do
-    # Return :utility to put it util top menu. False to ignore
-    @tree, @utility = build_sitemap do |file_name|
-      :valid
+
+    Middleman::Base.get '/sitemap.html' do
+      # Return :utility to put it util top menu. False to ignore
+      @tree, @utility = build_sitemap do |file_name|
+        :valid
+      end
+      haml :sitemap, :layout => false
     end
-    haml :sitemap, :layout => false
-  end
 
-  use_in_file_templates!
+    Middleman::Base.use_in_file_templates!
+  end
 end
 
+Middleman::Features.register :slickmap, Middleman::Features::Slickmap
+
 __END__
 
 @@ sitemap
@@ -97,7 +96,7 @@ __END__
     %title Sitemap
     %style{ :type => "text/css" }
       :sass
-        @import slickmap.sass
+        @import "slickmap"
         +slickmap
     :javascript
       window.onload = function() {