middleman 1.1.3 → 1.1.4

data/lib/middleman/builder.rb

@@ -38,8 +38,9 @@ module Middleman
       end
     end
     
+    
     def source_paths
-      [
+      @source_paths ||= [
         Middleman::Server.public,
         Middleman::Server.views
       ]

data/lib/middleman/features.rb

@@ -60,10 +60,6 @@ module Middleman::Features
   # MinifyJavascript uses the YUI compressor to shrink JS files
   autoload :MinifyJavascript,    "middleman/features/minify_javascript"
 
-  # Slickmap (http://astuteo.com/slickmap/) is a beautiful sitemap tool which
-  # will attempt to generate a `sitemap.html` file from your project.
-  autoload :Slickmap,            "middleman/features/slickmap"
-
   # CodeRay is a syntax highlighter.
   autoload :CodeRay,             "middleman/features/code_ray"
 

data/lib/middleman/templates/default/config.tt

@@ -1,9 +1,10 @@
-# Automatic sitemaps
-# activate :slickmap
-
 # CodeRay syntax highlighting in Haml
 # activate :code_ray
 
+# Automatic sitemaps (gem install middleman-slickmap)
+# require "middleman-slickmap"
+# activate :slickmap
+
 # Automatic image dimension calculations
 # activate :automatic_image_sizes
 
@@ -54,6 +55,10 @@ configure :build do
   
   # Use relative URLs
   # activate :relative_assets
+  
+  # Compress PNGs after build (gem install middleman-smusher)
+  # require "middleman-smusher"
+  # activate :smusher
 
   # Generate ugly/obfuscated HTML from Haml
   # activate :ugly_haml

data/lib/middleman/templates/html5/config.tt

@@ -20,12 +20,13 @@ helpers do
   end
 end
 
-# Automatic sitemaps
-# activate :slickmap
-
 # CodeRay syntax highlighting in Haml
 # activate :code_ray
 
+# Automatic sitemaps (gem install middleman-slickmap)
+# require "middleman-slickmap"
+# activate :slickmap
+
 # Automatic image dimension calculations in Haml
 # activate :automatic_image_sizes
 
@@ -42,9 +43,10 @@ configure :build do
   
   # Use relative URLs
   # activate :relative_assets
-
-  # Generate ugly/obfuscated HTML from Haml
-  # activate :ugly_haml
+  
+  # Compress PNGs after build (gem install middleman-smusher)
+  # require "middleman-smusher"
+  # activate :smusher
   
   # Or use a different image path
   # set :http_path, "/Content/images/"

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/middleman.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("compass", ["0.11.beta.6"])
   s.add_runtime_dependency("chunky_png", ["~> 1.1.0"])
   s.add_runtime_dependency("oily_png", ["~> 1.0"]) unless defined?(JRUBY_VERSION)
-  s.add_runtime_dependency("compass-slickmap", ["~> 0.4.0"])
   s.add_runtime_dependency("coffee-script", ["~> 2.1.0"])
   s.add_runtime_dependency("less", ["~> 1.2.0"])
   # s.add_runtime_dependency("fssm", ["~> 0.2.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -07:00
+date: 2011-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -261,26 +261,10 @@ dependencies:
         version: "1.0"
   type: :runtime
   version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: compass-slickmap
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
-  type: :runtime
-  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -292,11 +276,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: less
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -308,11 +292,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -324,11 +308,11 @@ dependencies:
         - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id019
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -338,11 +322,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -352,7 +336,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id020
 description: 
 email: 
 - tdreyno@gmail.com
@@ -442,8 +426,6 @@ files:
 - 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/slickmap/template.html.haml
 - lib/middleman/features/ugly_haml.rb
 - lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/sass.rb

data/lib/middleman/features/slickmap.rb

@@ -1,90 +0,0 @@
-Entry = Struct.new(:dir, :children)
-
-module Middleman::Features::Slickmap
-  class << self
-    def registered(app)
-      require 'slickmap'
-
-      @sitemap_url = "sitemap.html"
-      @sitemap_url = app.sitemap_url if app.respond_to?(:slickmap_url)
-
-      if app.environment == :build
-        Middleman::Builder.template :slickmap, @sitemap_url, @sitemap_url
-      end
-
-      app.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
-
-      app.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
-    end
-    alias :included :registered
-  end
-  
-  def self.build_sitemap(&block)    
-    @@utility = []
-    [recurse_sitemap(Middleman::Server.views, &block), @@utility]
-  end
-
-  def self.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::Server.views + "/", '')
-        end
-      end
-    end
-
-    entry
-  end
-end

data/lib/middleman/features/slickmap/template.html.haml

@@ -1,27 +0,0 @@
-!!!
-%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"
-        +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)