middleman 3.0.0.alpha.2 → 3.0.0.alpha.3

data/lib/middleman/extensions/lorem.rb

@@ -0,0 +1,130 @@
+module Middleman::Extensions
+  module Lorem
+    class << self
+      def registered(app)
+        app.send :include, InstanceMethods
+      end
+      alias :included :registered
+    end
+  
+    module InstanceMethods
+      def lorem
+        @_lorem ||= LoremObject.new
+      end
+    end
+
+    # Adapted from Frank:
+    # https://github.com/blahed/frank/
+    # Copyright (c) 2010 Travis Dunn
+    # 
+    #   Permission is hereby granted, free of charge, to any person
+    #   obtaining a copy of this software and associated documentation
+    #   files (the "Software"), to deal in the Software without
+    #   restriction, including without limitation the rights to use,
+    #   copy, modify, merge, publish, distribute, sublicense, and/or sell
+    #   copies of the Software, and to permit persons to whom the
+    #   Software is furnished to do so, subject to the following
+    #   conditions:
+    # 
+    #   The above copyright notice and this permission notice shall be
+    #   included in all copies or substantial portions of the Software.
+    # 
+    #   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    #   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    #   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    #   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    #   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    #   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    #   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    #   OTHER DEALINGS IN THE SOFTWARE.
+    class LoremObject
+      WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
+
+      def word
+        words(1)
+      end
+
+      def words(total)
+        (1..total).map do
+          randm(WORDS)
+        end.join(' ')
+      end
+
+      def sentence
+        sentences(1)
+      end
+
+      def sentences(total)
+        (1..total).map do
+          words(randm(4..15)).capitalize
+        end.join('. ')
+      end
+
+      def paragraph
+        paragraphs(1)
+      end
+
+      def paragraphs(total)
+        (1..total).map do
+          sentences(randm(3..7)).capitalize
+        end.join("\n\n")
+      end
+
+      def date(fmt = '%a %b %d, %Y')
+        y = rand(20) + 1990
+        m = rand(12) + 1
+        d = rand(31) + 1
+        Time.local(y,m,d).strftime(fmt)
+      end
+
+      def name
+        "#{first_name} #{last_name}"
+      end
+
+      def first_name
+        names = "Judith Angelo Margarita Kerry Elaine Lorenzo Justice Doris Raul Liliana Kerry Elise Ciaran Johnny Moses Davion Penny Mohammed Harvey Sheryl Hudson Brendan Brooklynn Denis Sadie Trisha Jacquelyn Virgil Cindy Alexa Marianne Giselle Casey Alondra Angela Katherine Skyler Kyleigh Carly Abel Adrianna Luis Dominick Eoin Noel Ciara Roberto Skylar Brock Earl Dwayne Jackie Hamish Sienna Nolan Daren Jean Shirley Connor Geraldine Niall Kristi Monty Yvonne Tammie Zachariah Fatima Ruby Nadia Anahi Calum Peggy Alfredo Marybeth Bonnie Gordon Cara John Staci Samuel Carmen Rylee Yehudi Colm Beth Dulce Darius inley Javon Jason Perla Wayne Laila Kaleigh Maggie Don Quinn Collin Aniya Zoe Isabel Clint Leland Esmeralda Emma Madeline Byron Courtney Vanessa Terry Antoinette George Constance Preston Rolando Caleb Kenneth Lynette Carley Francesca Johnnie Jordyn Arturo Camila Skye Guy Ana Kaylin Nia Colton Bart Brendon Alvin Daryl Dirk Mya Pete Joann Uriel Alonzo Agnes Chris Alyson Paola Dora Elias Allen Jackie Eric Bonita Kelvin Emiliano Ashton Kyra Kailey Sonja Alberto Ty Summer Brayden Lori Kelly Tomas Joey Billie Katie Stephanie Danielle Alexis Jamal Kieran Lucinda Eliza Allyson Melinda Alma Piper Deana Harriet Bryce Eli Jadyn Rogelio Orlaith Janet Randal Toby Carla Lorie Caitlyn Annika Isabelle inn Ewan Maisie Michelle Grady Ida Reid Emely Tricia Beau Reese Vance Dalton Lexi Rafael Makenzie Mitzi Clinton Xena Angelina Kendrick Leslie Teddy Jerald Noelle Neil Marsha Gayle Omar Abigail Alexandra Phil Andre Billy Brenden Bianca Jared Gretchen Patrick Antonio Josephine Kyla Manuel Freya Kellie Tonia Jamie Sydney Andres Ruben Harrison Hector Clyde Wendell Kaden Ian Tracy Cathleen Shawn".split(" ")
+        names[rand(names.size)]
+      end
+
+      def last_name
+        names = "Chung Chen Melton Hill Puckett Song Hamilton Bender Wagner McLaughlin McNamara Raynor Moon Woodard Desai Wallace Lawrence Griffin Dougherty Powers May Steele Teague Vick Gallagher Solomon Walsh Monroe Connolly Hawkins Middleton Goldstein Watts Johnston Weeks Wilkerson Barton Walton Hall Ross Chung Bender Woods Mangum Joseph Rosenthal Bowden Barton Underwood Jones Baker Merritt Cross Cooper Holmes Sharpe Morgan Hoyle Allen Rich Rich Grant Proctor Diaz Graham Watkins Hinton Marsh Hewitt Branch Walton O'Brien Case Watts Christensen Parks Hardin Lucas Eason Davidson Whitehead Rose Sparks Moore Pearson Rodgers Graves Scarborough Sutton Sinclair Bowman Olsen Love McLean Christian Lamb James Chandler Stout Cowan Golden Bowling Beasley Clapp Abrams Tilley Morse Boykin Sumner Cassidy Davidson Heath Blanchard McAllister McKenzie Byrne Schroeder Griffin Gross Perkins Robertson Palmer Brady Rowe Zhang Hodge Li Bowling Justice Glass Willis Hester Floyd Graves Fischer Norman Chan Hunt Byrd Lane Kaplan Heller May Jennings Hanna Locklear Holloway Jones Glover Vick O'Donnell Goldman McKenna Starr Stone McClure Watson Monroe Abbott Singer Hall Farrell Lucas Norman Atkins Monroe Robertson Sykes Reid Chandler Finch Hobbs Adkins Kinney Whitaker Alexander Conner Waters Becker Rollins Love Adkins Black Fox Hatcher Wu Lloyd Joyce Welch Matthews Chappell MacDonald Kane Butler Pickett Bowman Barton Kennedy Branch Thornton McNeill Weinstein Middleton Moss Lucas Rich Carlton Brady Schultz Nichols Harvey Stevenson Houston Dunn West O'Brien Barr Snyder Cain Heath Boswell Olsen Pittman Weiner Petersen Davis Coleman Terrell Norman Burch Weiner Parrott Henry Gray Chang McLean Eason Weeks Siegel Puckett Heath Hoyle Garrett Neal Baker Goldman Shaffer Choi Carver".split(" ")
+        names[rand(names.size)]
+      end
+
+      def email
+        delimiters = [ '_', '-', '' ]
+        domains = %w(gmail.com yahoo.com hotmail.com email.com live.com me.com mac.com aol.com fastmail.com mail.com)
+        username = name.gsub(/[^\w]/, delimiters[rand(delimiters.size)])
+        "#{username}@#{domains[rand(domains.size)]}".downcase
+      end
+
+      def image(size, options={})
+        src              = "http://placehold.it/#{size}"
+        hex              = %w[a b c d e f 0 1 2 3 4 5 6 7 8 9]
+        background_color = options[:background_color]
+        color            = options[:color]
+
+        if options[:random_color]
+          background_color = hex.shuffle[0...6].join
+          color = hex.shuffle[0...6].join
+        end
+
+        src << "/#{background_color.sub(/^#/, '')}" if background_color
+        src << "/ccc" if background_color.nil? && color
+        src << "/#{color.sub(/^#/, '')}" if color
+        src << "&text=#{Rack::Utils::escape(options[:text])}" if options[:text]
+
+        src
+      end
+
+      private
+
+      def randm(range)
+        a = range.to_a
+        a[rand(a.length)]
+      end
+    end
+  end
+
+  register :lorem, Lorem
+end

data/lib/middleman/extensions/minify_css.rb

@@ -0,0 +1,15 @@
+module Middleman::Extensions
+  module MinifyCss
+    class << self
+      def registered(app)
+        require "middleman/extensions/minify_css/cssmin"
+        app.after_configuration do
+          set :css_compressor, ::CSSMin
+        end
+      end
+      alias :included :registered
+    end
+  end
+  
+  register :minify_css, MinifyCss
+end

data/lib/middleman/extensions/minify_javascript.rb

@@ -0,0 +1,54 @@
+module Middleman::Extensions
+  module MinifyJavascript
+    class << self
+      def registered(app)
+        require 'uglifier'
+        app.after_configuration do
+          set :js_compressor, ::Uglifier.new
+        end
+        app.use InlineJavascriptRack
+      end
+      alias :included :registered
+    end
+
+    class InlineJavascriptRack
+      def initialize(app, options={})
+        @app = app
+      end
+
+      def call(env)
+        status, headers, response = @app.call(env)
+
+        if env["PATH_INFO"].match(/\.html$/)
+          compressor = ::Uglifier.new
+
+          uncompressed_source = case(response)
+            when String
+              response
+            when Array
+              response.join
+            when Rack::Response
+              response.body.join
+            when Rack::File
+              File.read(response.path)
+          end
+
+          minified = uncompressed_source.gsub(/(<scri.*?\/\/<!\[CDATA\[\n)(.*?)(\/\/\]\].*?<\/script>)/m) do |m|
+            first = $1
+            uncompressed_source = $2
+            last = $3
+            minified_js = compressor.compile(uncompressed_source)
+
+            first << minified_js << "\n" << last
+          end
+          headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
+          response = [minified]
+        end
+
+        [status, headers, response]
+      end
+    end
+  end
+  
+  register :minify_javascript, MinifyJavascript
+end

data/lib/middleman/extensions/relative_assets.rb

@@ -0,0 +1,46 @@
+module Middleman::Extensions
+  module RelativeAssets
+    class << self
+      def registered(app)
+        app.compass_config do |config|
+          config.relative_assets = true
+        end
+      
+        app.send :include, InstanceMethods
+      end
+      alias :included :registered
+    end
+  
+    module InstanceMethods
+      def asset_url(path, prefix="")
+        begin
+          prefix = images_dir if prefix == http_images_path
+        rescue
+        end
+
+        if path.include?("://")
+          super(path, prefix)
+        elsif path[0,1] == "/"
+          path
+        else
+          path = File.join(prefix, path) if prefix.length > 0
+          request_path = @request_path.dup
+          request_path << 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
+  
+  register :relative_assets, RelativeAssets
+end

data/lib/middleman/extensions/sitemap_tree.rb

@@ -0,0 +1,38 @@
+module Middleman::Extensions
+  module SitemapTree
+    class << self
+      def registered(app)
+        app.helpers Helpers
+      end
+      alias :included :registered
+    end
+  
+    module Helpers
+      def sitemap_tree(regex=nil)
+        @sitemap_tree_cache = {}
+      
+        key = regex.nil? ? "all" : regex
+      
+        if !@sitemap_tree_cache.has_key?(key)
+          auto_hash = Hash.new{ |h,k| h[k] = Hash.new &h.default_proc }
+
+          app.sitemap.all_paths.each do |path|
+            next if !regex.nil? && !path.match(regex)
+            sub = auto_hash
+            path.split( "/" ).each{ |dir| sub[dir]; sub = sub[dir] }
+          end
+      
+          @sitemap_tree_cache[key] = auto_hash
+        end
+      
+        @sitemap_tree_cache[key]
+      end
+    
+      def html_sitemap
+        sitemap_tree(/\.html$/)
+      end
+    end
+  end
+
+  register :sitemap_tree, SitemapTree
+end

data/lib/middleman/guard.rb

@@ -1,35 +1,39 @@
 require "guard"
 require "guard/guard"
 require "rbconfig"
+require "net/http"
 
-if Config::CONFIG['host_os'].downcase =~ %r{mingw}
+if RbConfig::CONFIG['host_os'].downcase =~ %r{mingw}
   require "win32/process"
 end
 
 module Middleman
   module Guard
-    def self.add_guard(&block)
-      # Deprecation Warning
-      puts "== Middleman::Guard.add_guard has been removed. Update your extensions to versions which support this change."
-    end
-  
-    def self.start(options={})
-      options_hash = ""
-      options.each do |k,v|
-        options_hash << ", :#{k} => '#{v}'"
+    class << self
+      def add_guard(&block)
+        # Deprecation Warning
+        puts "== Middleman::Guard.add_guard has been removed. Update your extensions to versions which support this change."
       end
-      
-      guardfile_contents = %Q{
-        guard 'middleman'#{options_hash} do 
-          watch(%r{(.*)})
+  
+      def start(options={})
+        options_hash = ""
+        options.each do |k,v|
+          options_hash << ", :#{k} => '#{v}'"
         end
-      }
+      
+        guardfile_contents = %Q{
+          guard 'middleman'#{options_hash} do 
+            watch(%r{(.*)})
+          end
+        }
 
-      ::Guard.start({ :guardfile_contents => guardfile_contents })
+        ::Guard.start({ :guardfile_contents => guardfile_contents })
+      end
     end
   end
 end
 
+# @private
 module Guard
   class Middleman < Guard
     def initialize(watchers = [], options = {})
@@ -58,20 +62,16 @@ module Guard
       
       if needs_to_restart
         reload
-      elsif !@app.nil?
+      else
         paths.each do |path|
-          @app.logger.debug :file_change, Time.now, path if @app.settings.logging?
-          @app.file_did_change(path)
+          file_did_change(path)
         end
       end
     end
 
     def run_on_deletion(paths)
-      if !@app.nil?
-        paths.each do |path|
-          @app.logger.debug :file_remove, Time.now, path if @app.settings.logging?
-          @app.file_did_delete(path)
-        end
+      paths.each do |path|
+        file_did_delete(path)
       end
     end
     
@@ -80,19 +80,19 @@ module Guard
       # Quiet down Guard
       # ENV['GUARD_ENV'] = 'test' if @options[:debug] == "true"
       
-      env = (@options[:environment] || "development").to_sym
-      is_logging = @options.has_key?(:debug) && (@options[:debug] == "true")
-      @app = ::Middleman.server.inst do
-        set :environment, env
-        set :logging, is_logging
-      end
-      
-      app_rack = @app.class.to_rack_app
-
       @server_job = fork do
+        env = (@options[:environment] || "development").to_sym
+        is_logging = @options.has_key?(:debug) && (@options[:debug] == "true")
+        app = ::Middleman.server.inst do
+          set :environment, env
+          set :logging, is_logging
+        end
+      
+        app_rack = app.class.to_rack_app
+      
         opts = @options.dup
         opts[:app] = app_rack
-        puts "== The Middleman is standing watch on port #{opts[:Port]||4567}"
+        puts "== The Middleman is standing watch on port #{opts[:port]||4567}"
         ::Middleman.start_server(opts)
       end
     end
@@ -102,7 +102,20 @@ module Guard
       Process.kill("KILL", @server_job)
       Process.wait @server_job
       @server_job = nil
-      @app = nil
+      # @app = nil
+    end
+    
+    def talk_to_server(params={})
+      uri = URI.parse("http://#{@options[:host]}:#{@options[:port]}/__middleman__")
+      Net::HTTP.post_form(uri, {}.merge(params))
+    end
+    
+    def file_did_change(path)
+      talk_to_server :change => path
+    end
+    
+    def file_did_delete(path)
+      talk_to_server :delete => path
     end
   end
 end

data/lib/middleman/renderers/erb.rb

@@ -1,16 +1,14 @@
-require "tilt"
-
 module Middleman::Renderers::ERb
   class << self
     def registered(app)
-      app.send :include, InstanceMethods
-      
       app.set :erb_engine, :erb
       app.set :erb_engine_prefix, ::Tilt
       
       app.after_configuration do
         if erb_engine.is_a? Symbol
-          erb_engine = erb_tilt_template_from_symbol(erb_engine)
+          engine = engine.to_s
+          engine = engine == "erb" ? "ERB" : engine.camelize
+          erb_engine = erb_engine_prefix.const_get("#{engine}Template")
         end
         
         ::Tilt.prefer(erb_engine)
@@ -18,12 +16,4 @@ module Middleman::Renderers::ERb
     end
     alias :included :registered
   end
-  
-  module InstanceMethods
-    def erb_tilt_template_from_symbol(engine)
-      engine = engine.to_s
-      engine = engine == "erb" ? "ERB" : engine.camelize
-      erb_engine_prefix.const_get("#{engine}Template")
-    end
-  end
 end