middleman 0.99.1.pre → 0.99.2.pre

data/lib/middleman/features/asset_host.rb

@@ -1,21 +1,22 @@
-class Middleman::Features::AssetHost
-  def initialize(app, config)
-    Middleman::Server.after_feature_init do
-      if Middleman::Server.asset_host.is_a?(Proc)
-        ::Compass.configuration.asset_host(&Middleman::Server.asset_host)
+module Middleman::Features::AssetHost
+  class << self
+    def registered(app)
+      app.after_feature_init do
+        if Middleman::Server.asset_host.is_a?(Proc)
+          ::Compass.configuration.asset_host(&Middleman::Server.asset_host)
+        end
       end
-    end
-    
-    Middleman::Assets.register :asset_host do |path, prefix, request|
-      original_output = Middleman::Assets.before(:asset_host, path, prefix, request)
 
-      valid_extensions = %w(.png .gif .jpg .jpeg .js .css)
+      Middleman::Assets.register :asset_host do |path, prefix, request|
+        original_output = Middleman::Assets.before(:asset_host, path, prefix, request)
+
+        valid_extensions = %w(.png .gif .jpg .jpeg .js .css)
 
-      asset_prefix = Middleman::Server.asset_host.call(original_output)
+        asset_prefix = Middleman::Server.asset_host.call(original_output)
 
-      File.join(asset_prefix, original_output)
+        File.join(asset_prefix, original_output)
+      end
     end
+    alias :included :registered
   end
-end
-
-Middleman::Features.register :asset_host, Middleman::Features::AssetHost
+end

data/lib/middleman/features/automatic_image_sizes.rb

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

data/lib/middleman/features/cache_buster.rb

@@ -1,43 +1,44 @@
-class Middleman::Features::CacheBuster
-  def initialize(app, config)
-    Middleman::Assets.register :cache_buster do |path, prefix, request|
-      http_path = Middleman::Assets.before(:cache_buster, path, prefix, request)
+module Middleman::Features::CacheBuster
+  class << self
+    def registered(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::Server.images_dir if prefix == Middleman::Server.http_images_path
-        rescue
-        end
+        if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
+          http_path
+        else
+          begin
+            prefix = Middleman::Server.images_dir if prefix == Middleman::Server.http_images_path
+          rescue
+          end
 
-        real_path_static  = File.join(Middleman::Server.public, prefix, path)
+          real_path_static  = File.join(Middleman::Server.public, prefix, path)
 
-        if File.readable?(real_path_static)
-          http_path << "?" + File.mtime(real_path_static).strftime("%s") 
-        elsif Middleman::Server.environment == :build
-          real_path_dynamic = File.join(Middleman::Server.root, Middleman::Server.build_dir, prefix, path)
-          http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
-        end
+          if File.readable?(real_path_static)
+            http_path << "?" + File.mtime(real_path_static).strftime("%s") 
+          elsif Middleman::Server.environment == :build
+            real_path_dynamic = File.join(Middleman::Server.root, Middleman::Server.build_dir, prefix, path)
+            http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
+          end
 
-        http_path
+          http_path
+        end
       end
-    end
-    
-    Middleman::Server.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(Middleman::Server.root, Middleman::Server.build_dir), Middleman::Server.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)}"
+
+      app.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(Middleman::Server.root, Middleman::Server.build_dir), Middleman::Server.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
         end
       end
     end
+    alias :included :registered
   end
-end
-
-Middleman::Features.register :cache_buster, Middleman::Features::CacheBuster
+end

data/lib/middleman/features/default_helpers.rb

@@ -1,6 +1,9 @@
-class Middleman::Features::DefaultHelpers
-  def initialize(app, config)
-    Middleman::Server.helpers Helpers
+module Middleman::Features::DefaultHelpers
+  class << self
+    def registered(app)
+      app.helpers Middleman::Features::DefaultHelpers::Helpers
+    end
+    alias :included :registered
   end
   
   module Helpers
@@ -14,8 +17,9 @@ class Middleman::Features::DefaultHelpers
       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")
+      less_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.less")
     
-      if File.exists?(css_file) || File.exists?(sass_file) || File.exists?(scss_file)
+      if File.exists?(css_file) || File.exists?(sass_file) || File.exists?(scss_file) || File.exists?(less_file)
         stylesheet_link_tag "#{path}.css"
       end
     end
@@ -36,33 +40,22 @@ class Middleman::Features::DefaultHelpers
       Middleman::Assets.get_url(path, prefix, request)
     end
     
-    def link_to(title, url="#", params={})
-      params.merge!(:href => url)
-      params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
-      %Q{<a #{params}>#{title}</a>}
-    end
-
-    def image_tag(path, params={})
-      params[:alt] ||= ""
-      prefix = settings.http_images_path rescue settings.images_dir
-      params = params.merge(:src => asset_url(path, prefix))
-      params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
-      "<img #{params} />"
-    end
-
-    def javascript_include_tag(path, params={})
-      params = params.merge(:src => asset_url(path, settings.js_dir), :type => "text/javascript")
-      params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
-      "<script #{params}></script>"
-    end
-
-    def stylesheet_link_tag(path, params={})
-      params[:rel] ||= "stylesheet"
-      params = params.merge(:href => asset_url(path, settings.css_dir), :type => "text/css")
-      params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
-      "<link #{params} />"
-    end
+    # Padrino's asset handling needs to pass through ours
+    def asset_path(kind, source)
+       return source if source =~ /^http/
+       asset_folder  = case kind
+         when :css    then settings.css_dir
+         when :js     then settings.js_dir
+         when :images then settings.images_dir
+         else kind.to_s
+       end
+       source = source.to_s.gsub(/\s/, '')
+       ignore_extension = (asset_folder.to_s == kind.to_s) # don't append extension
+       source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
+       result_path   = source if source =~ %r{^/} # absolute path
+       result_path ||= asset_url(source, asset_folder)
+       timestamp = asset_timestamp(result_path)
+       "#{result_path}#{timestamp}"
+     end
   end
-end
-
-Middleman::Features.register :default_helpers, Middleman::Features::DefaultHelpers, { :auto_enable => true }
+end

data/lib/middleman/features/livereload.rb

@@ -1,4 +1,4 @@
-class Middleman::Features::LiveReload
+module Middleman::Features::LiveReload
   def initialize(app, config)
     return unless Middleman::Server.environment == :development
     

data/lib/middleman/features/minify_css.rb

@@ -1,9 +1,10 @@
-class Middleman::Features::MinifyCSS
-  def initialize(app, config)
-    Middleman::Server.after_feature_init do
-      ::Compass.configuration.output_style = :compressed
+module Middleman::Features::MinifyCss
+  class << self
+    def registered(app)
+      app.after_feature_init do
+        ::Compass.configuration.output_style = :compressed
+      end
     end
+    alias :included :registered
   end
-end
-
-Middleman::Features.register :minify_css, Middleman::Features::MinifyCSS
+end

data/lib/middleman/features/minify_javascript.rb

@@ -1,11 +1,14 @@
-class Middleman::Features::MinifyJavascript
-  def initialize(app, config)
-    Haml::Javascript.send :include, ::Haml::Filters::Base
-    
-    require "middleman/features/minify_javascript/rack"
-    app.use Middleman::Rack::MinifyJavascript
+module Middleman::Features::MinifyJavascript
+  class << self
+    def registered(app)
+      Middleman::Features::MinifyJavascript::Haml::Javascript.send :include, ::Haml::Filters::Base
+
+      require "middleman/features/minify_javascript/rack"
+      app.use Middleman::Rack::MinifyJavascript
+    end
+    alias :included :registered
   end
-  
+
   module Haml
     module Javascript
       def render_with_options(text, options)
@@ -15,6 +18,4 @@ class Middleman::Features::MinifyJavascript
       end
     end
   end
-end
-
-Middleman::Features.register :minify_javascript, Middleman::Features::MinifyJavascript
+end

data/lib/middleman/features/relative_assets.rb

@@ -1,35 +1,36 @@
-class Middleman::Features::RelativeAssets
-  def initialize(app, config)
-    ::Compass.configuration.relative_assets = true
-  
-    Middleman::Assets.register :relative_assets do |path, prefix, request|
-      begin
-        prefix = Middleman::Server.images_dir if prefix == Middleman::Server.http_images_path
-      rescue
-      end
-    
-      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::Server.index_file if path.match(%r{/$})
-        request_path.gsub!(%r{^/}, '')
-        parts = request_path.split('/')
+module Middleman::Features::RelativeAssets
+  class << self
+    def registered(app)
+      ::Compass.configuration.relative_assets = true
 
-        if parts.length > 1
-          arry = []
-          (parts.length - 1).times { arry << ".." }
-          arry << path
-          File.join(*arry)
-        else
+      Middleman::Assets.register :relative_assets do |path, prefix, request|
+        begin
+          prefix = Middleman::Server.images_dir if prefix == Middleman::Server.http_images_path
+        rescue
+        end
+
+        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::Server.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
+    alias :included :registered
   end
-end
-
-Middleman::Features.register :relative_assets, Middleman::Features::RelativeAssets
+end

data/lib/middleman/features/slickmap.rb

@@ -1,57 +1,60 @@
 Entry = Struct.new(:dir, :children)
 
-class Middleman::Features::Slickmap
-  def initialize(app, config)
-    require 'slickmap'
+module Middleman::Features::Slickmap
+  class << self
+    def registered(app)
+      require 'slickmap'
 
-    @sitemap_url = config[:url] || "sitemap.html"
+      @sitemap_url = config[:url] || "sitemap.html"
 
-    if Middleman::Server.environment == :build
-      Middleman::Builder.template :slickmap, @sitemap_url, @sitemap_url
-    end
-    
-    Middleman::Server.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, ''))
-            end
+      if Middleman::Server.environment == :build
+        Middleman::Builder.template :slickmap, @sitemap_url, @sitemap_url
+      end
 
-            other_children = n.children.select { |c| !c.dir.include?(self.class.index_file) }
-            if other_children.length > 0
+      Middleman::Server.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
-                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
 
-    Middleman::Server.get "/#{@sitemap_url}" do
-      # Return :utility to put it util top menu. False to ignore
-      @tree, @utility = Middleman::Features::Slickmap.build_sitemap do |file_name|
-        :valid
+      Middleman::Server.get "/#{@sitemap_url}" do
+        # Return :utility to put it util top menu. False to ignore
+        @tree, @utility = Middleman::Features::Slickmap.build_sitemap do |file_name|
+          :valid
+        end
+
+        haml "template.html".to_sym, :layout => false, :views => File.expand_path(File.join(File.dirname(__FILE__), "slickmap"))
       end
-      
-      haml "template.html".to_sym, :layout => false, :views => File.expand_path(File.join(File.dirname(__FILE__), "slickmap"))
     end
+    alias :included :registered
   end
   
   def self.build_sitemap(&block)    
@@ -83,6 +86,4 @@ class Middleman::Features::Slickmap
 
     entry
   end
-end
-
-Middleman::Features.register :slickmap, Middleman::Features::Slickmap
+end