middleman 0.9.7 → 0.9.8

data/Rakefile

@@ -47,15 +47,33 @@ task :spec => :check_dependencies
 task :default => :spec
 
 require 'rake/rdoctask'
+require 'sdoc'
+
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION')
     version = File.read('VERSION')
   else
     version = ""
   end
+  
+  # rdoc.template = 'direct'
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "middleman #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.exclude('lib/middleman/features/sprockets+ruby19.rb')
+end
+
+desc "Build and publish documentation using GitHub Pages."
+task :pages do
+  if !`git status`.include?('nothing to commit')
+    abort "dirty index - not publishing!"
+  end
+ 
+  Rake::Task[:rerdoc].invoke
+  `git checkout gh-pages`
+  `ls -1 | grep -v rdoc | xargs rm -rf; mv rdoc/* .; rm -rf rdoc`
+  `git commit -a -m "update docs"; git push origin gh-pages`
+  `git checkout master`
 end

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.8

data/bin/mm-build

@@ -48,16 +48,40 @@ module Generators
     
     glob! File.basename(Middleman::Base.public), Middleman::Base.supported_formats
     glob! File.basename(Middleman::Base.views),  Middleman::Base.supported_formats
+    
+    if Middleman::Base.slickmap?
+      template :slickmap, "sitemap.html", "sitemap.html"
+    end
   end
 
   add :build, Builder
 end
 
 # Monkey-patch to use a dynamic renderer
+class Templater::Actions::File
+  def identical?
+    if exists?
+      return true if File.mtime(source) < File.mtime(destination)
+      ::FileUtils.identical?(source, destination)
+    else
+      false
+    end
+  end
+end
+
 class Templater::Actions::Template
   def render
     ::Middleman::Builder.render_file(source, destination)
   end
+  
+  def identical?
+    if ::File.exists?(destination)
+      return true if File.exists?(source) && File.mtime(source) < File.mtime(destination)
+      ::File.read(destination) == render 
+    else
+      false
+    end
+  end
 end
 
 Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))

data/bin/mm-init

@@ -8,9 +8,10 @@ module Generators
   class NewSite < Templater::Generator
     desc "Creates a new staticmatic scaffold."
     first_argument :location, :required => true, :desc => "Project location"
-
-    # css_dir
-    # images_dir
+    
+    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'
 
     def destination_root
       File.expand_path(location)
@@ -20,12 +21,13 @@ module Generators
       File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'template')
     end
     
-    file :init, "init.rb"
+    template :init, "init.rb"
     glob! :views
     glob! :public
-    empty_directory :stylesheets, "public/stylesheets"
-    empty_directory :javascripts, "public/javascripts"
-    empty_directory :images,      "public/images"
+    
+    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)
   end
 
   add :setup, NewSite

data/lib/middleman/base.rb

@@ -4,19 +4,13 @@ require 'rubygems' unless ENV['NO_RUBYGEMS']
 # We're riding on Sinatra, so let's include it
 require 'sinatra/base'
 
-# Rack helper for adding mime-types during local preview
-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, Dir.pwd
     set :environment, ENV['MM_ENV'] || :development
-    set :supported_formats, []
-    set :index_file, 'index.html'
+    set :supported_formats, ["erb"]
+    set :index_file, "index.html"
     set :js_dir, "javascripts"
     set :css_dir, "stylesheets"
     set :images_dir, "images"
@@ -36,6 +30,7 @@ module Middleman
     disable :relative_assets
     disable :markaby
     disable :maruku
+    disable :smush_pngs
     
     # Default build features
     configure :build do
@@ -44,6 +39,12 @@ module Middleman
       enable :cache_buster
     end
   
+    # Rack helper for adding mime-types during local preview
+    def mime(ext, type)
+      ext = ".#{ext}" unless ext.to_s[0] == ?.
+      Rack::Mime::MIME_TYPES[ext.to_s] = type
+    end
+    
     # Convenience function to discover if a tempalte exists for the requested renderer (haml, sass, etc)
     def template_exists?(path, renderer=nil)
       template_path = path.dup

data/lib/middleman/builder.rb

@@ -5,7 +5,7 @@ require 'rack/test'
 module Middleman
   class Builder
     # The default render just requests the page over Rack and writes the response
-    def self.render_file(source, destination)      
+    def self.render_file(source, destination)
       request_path = destination.gsub(File.join(Dir.pwd, Middleman::Base.build_dir), "")
       browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base))
       browser.get(request_path)

data/lib/middleman/features/cache_buster.rb

@@ -1,17 +1,14 @@
 class Middleman::Base
+  alias_method :pre_cache_buster_asset_url, :asset_url
   helpers do
-    alias_method :pre_cache_buster_asset_url, :asset_url
     def asset_url(path, prefix="")
-      path = pre_cache_buster_asset_url(path, prefix)
-      if path.include?("://")
-        path
+      http_path = pre_cache_buster_asset_url(path, prefix)
+      if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
+        http_path
       else
-        real_path = File.join(options.public, path)
-        if File.readable?(real_path)
-          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
+        real_path = File.join(self.class.environment == "build" ? options.build_dir : options.public, prefix, path)
+        http_path << "?" + File.mtime(real_path).strftime("%s") if File.readable?(real_path)        
+        http_path
       end
     end
   end

data/lib/middleman/features/haml.rb

@@ -2,62 +2,64 @@ require 'haml'
 
 module Middleman
   module Haml
-    def self.included(base)
-      base.supported_formats << "haml"
-      base.helpers Middleman::HamlHelpers
-    end
+    module Renderer
+      def self.included(base)
+        base.supported_formats << "haml"
+        base.helpers Middleman::Haml::Helpers
+      end
     
-    def render_path(path)
-      if template_exists?(path, :haml)
-        result = nil
-        begin
-          result = haml(path.to_sym, :layout => File.extname(path) != ".xml")
-        rescue ::Haml::Error => e
-          result = "Haml Error: #{e}"
-          result << "<pre>Backtrace: #{e.backtrace.join("\n")}</pre>"
+      def render_path(path)
+        if template_exists?(path, :haml)
+          result = nil
+          begin
+            result = haml(path.to_sym, :layout => File.extname(path) != ".xml")
+          rescue ::Haml::Error => e
+            result = "Haml Error: #{e}"
+            result << "<pre>Backtrace: #{e.backtrace.join("\n")}</pre>"
+          end
+          result
+        else
+          super
         end
-        result
-      else
-        super
       end
     end
-  end
   
-  module HamlHelpers
-    def haml_partial(name, options = {})
-      item_name = name.to_sym
-      counter_name = "#{name}_counter".to_sym
-      if collection = options.delete(:collection)
-        collection.enum_for(:each_with_index).collect do |item,index|
-          haml_partial name, options.merge(:locals => {item_name => item, counter_name => index+1})
-        end.join
-      elsif object = options.delete(:object)
-        haml_partial name, options.merge(:locals => {item_name => object, counter_name => nil})
-      else
-        haml "_#{name}".to_sym, options.merge(:layout => false)
+    module Helpers
+      def haml_partial(name, options = {})
+        item_name = name.to_sym
+        counter_name = "#{name}_counter".to_sym
+        if collection = options.delete(:collection)
+          collection.enum_for(:each_with_index).collect do |item,index|
+            haml_partial name, options.merge(:locals => {item_name => item, counter_name => index+1})
+          end.join
+        elsif object = options.delete(:object)
+          haml_partial name, options.merge(:locals => {item_name => object, counter_name => nil})
+        else
+          haml "_#{name}".to_sym, options.merge(:layout => false)
+        end
       end
     end
-  end
   
-  module Table
-    include ::Haml::Filters::Base
+    module Table
+      include ::Haml::Filters::Base
 
-    def render(text)
-      output = '<div class="table"><table cellspacing="0" cellpadding="0">'
-      line_num = 0
-      text.each_line do |line|
-        line_num += 1
-        next if line.strip.empty?
-        output << %Q{<tr class="#{(line_num % 2 == 0) ? "even" : "odd" }#{(line_num == 1) ? " first" : "" }">}
+      def render(text)
+        output = '<div class="table"><table cellspacing="0" cellpadding="0">'
+        line_num = 0
+        text.each_line do |line|
+          line_num += 1
+          next if line.strip.empty?
+          output << %Q{<tr class="#{(line_num % 2 == 0) ? "even" : "odd" }#{(line_num == 1) ? " first" : "" }">}
 
-        columns = line.split("|").map { |p| p.strip }
-        columns.each_with_index do |col, i|
-          output << %Q{<td class="col#{i+1}">#{col}</td>}
-        end
+          columns = line.split("|").map { |p| p.strip }
+          columns.each_with_index do |col, i|
+            output << %Q{<td class="col#{i+1}">#{col}</td>}
+          end
 
-        output << "</tr>"
+          output << "</tr>"
+        end
+        output + "</table></div>"
       end
-      output + "</table></div>"
     end
   end
   
@@ -72,7 +74,7 @@ module Middleman
           static_version = options.public + request.path_info
           send_file(static_version) if File.exists? static_version
 
-          location_of_sass_file = options.environment == "build" ? "build" : "public"
+          location_of_sass_file = options.environment == "build" ? File.join(options.build_dir, options.css_dir) : "public"
           css_filename = File.join(Dir.pwd, location_of_sass_file) + request.path_info
           sass(path.to_sym, Compass.sass_engine_options.merge({ :css_filename => css_filename }))
         rescue Exception => e
@@ -125,6 +127,6 @@ END
 end
 
 class Middleman::Base
-  include Middleman::Haml
+  include Middleman::Haml::Renderer
   include Middleman::Sass
 end

data/lib/middleman/features/minify_javascript.rb

@@ -12,20 +12,20 @@ module Middleman
 END
       end
     end
-  end
   
-  module Compressor
-    def render_path(path)
-      if template_exists?(path, :js)
-        compressor = YUI::JavaScriptCompressor.new(:munge => true)
-        compressor.compress(super)
-      else
-        super
+    module StaticJavascript
+      def render_path(path)
+        if template_exists?(path, :js)
+          compressor = YUI::JavaScriptCompressor.new(:munge => true)
+          compressor.compress(super)
+        else
+          super
+        end
       end
     end
   end
   
   class Base
-    include Middleman::Compressor
+    include Middleman::Minified::StaticJavascript
   end
 end

data/lib/middleman/features/slickmap.rb

@@ -1,16 +1,83 @@
-require 'slickmap'
+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)
 
 class Middleman::Base
   def build_sitemap(&block)
-    # views - stylesheets
-    # public
-    # .select
-    #   block.call(this)
+    html_files = Dir[File.join(File.dirname(Middleman::Base.views), "**", "*.html*")]
+    
+    @@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, [])
+
+    #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
+          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
+
+    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, ''))
+          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
   
   get '/sitemap.html' do
-    @tree = build_sitemap do |file_name|
-      true
+    # 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
@@ -21,4 +88,30 @@ end
 __END__
 
 @@ sitemap
-%div.title Hello world!!!!!
+!!!
+%html{ :xmlns => "http://www.w3.org/1999/xhtml" }
+  %head
+    %meta{ :content => "text/html; charset=utf-8", "http-equiv" => "Content-type" }
+    %title Sitemap
+    %style{ :type => "text/css" }
+      :sass
+        @import slickmap.sass
+        +slickmap
+    :javascript
+      window.onload = function() {
+        document.getElementById('primaryNav').className = "col" + document.querySelectorAll("#primaryNav > li:not(#home)").length;
+      };
+
+  %body
+    .logo
+      %h1= @project_name || "Sitemap"
+      - if @project_subtitle
+        %h2= @project_subtitle
+    
+      - if @utility.length > 0
+        %ul#utilityNav
+          - @utility.each do |u|
+            %li= link_to u, u
+    
+    %ul#primaryNav
+      - sitemap_node(@tree, true)

data/lib/middleman/features/smush_pngs.rb

@@ -0,0 +1,58 @@
+require 'json'
+require 'open-uri'
+
+begin
+  require 'httpclient'
+rescue LoadError
+  puts "httpclient not available. Install it with: gem install httpclient"
+end
+
+module Middleman
+  module SmushPngs
+    def self.included(base)
+      base.supported_formats << "png"
+    end
+    
+    def render_path(file)
+      if File.extname(file) == ".png"
+        file = File.join(options.public, file)
+        optimized = optimized_image_data_for(file)
+
+        begin
+          raise "Error: got larger" if size(file) < optimized.size
+          raise "Error: empty file downloaded" if optimized.size < 20
+
+          optimized
+        rescue
+          File.read(file)
+        end
+      else
+        super
+      end
+    end
+
+  protected
+    def size(file)
+      File.exist?(file) ? File.size(file) : 0
+    end
+    
+    def optimized_image_data_for(file)
+      # I leave these urls here, just in case it stops working again...
+      # url = "http://smush.it/ws.php" # original, redirects to somewhere else..
+      url = 'http://ws1.adq.ac4.yahoo.com/ysmush.it/ws.php'
+      # url = "http://developer.yahoo.com/yslow/smushit/ws.php" # official but does not work
+      # url = "http://smushit.com/ysmush.it/ws.php" # used at the new page but does not hande uploads
+      # url = "http://smushit.eperf.vip.ac4.yahoo.com/ysmush.it/ws.php" # used at the new page but does not hande uploads
+      response = HTTPClient.post url, { 'files[]' => File.new(file) }
+      response = JSON.parse(response.body.content)
+      raise "smush.it: #{response['error']}" if response['error']
+      image_url = response['dest']
+      raise "no dest path found" unless image_url
+      open(image_url) { |source| source.read() }
+    end
+  end
+  
+  class Base
+    include Middleman::SmushPngs
+  end
+end

data/lib/middleman/template/{init.rb → init.rbt}

@@ -1,3 +1,7 @@
+<% 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 %>
+
 # Helpers
 helpers do
 end

data/middleman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-10-01}
+  s.date = %q{2009-10-06}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -41,10 +41,11 @@ Gem::Specification.new do |s|
      "lib/middleman/features/minify_javascript.rb",
      "lib/middleman/features/relative_assets.rb",
      "lib/middleman/features/slickmap.rb",
+     "lib/middleman/features/smush_pngs.rb",
      "lib/middleman/features/sprockets+ruby19.rb",
      "lib/middleman/features/sprockets.rb",
      "lib/middleman/helpers.rb",
-     "lib/middleman/template/init.rb",
+     "lib/middleman/template/init.rbt",
      "lib/middleman/template/views/index.html.haml",
      "lib/middleman/template/views/layout.html.haml",
      "lib/middleman/template/views/stylesheets/site.css.sass",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -07:00
+date: 2009-10-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,10 +128,11 @@ files:
 - lib/middleman/features/minify_javascript.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/slickmap.rb
+- lib/middleman/features/smush_pngs.rb
 - lib/middleman/features/sprockets+ruby19.rb
 - lib/middleman/features/sprockets.rb
 - lib/middleman/helpers.rb
-- lib/middleman/template/init.rb
+- lib/middleman/template/init.rbt
 - lib/middleman/template/views/index.html.haml
 - lib/middleman/template/views/layout.html.haml
 - lib/middleman/template/views/stylesheets/site.css.sass