middleman-core 3.0.0.beta.1 → 3.0.0.beta.2

data/lib/middleman-core/core_extensions/routing.rb

@@ -1,17 +1,30 @@
+# Routing extension
 module Middleman::CoreExtensions::Routing
+  
+  # Setup extension
   class << self
+    
+    # Once registered
     def registered(app)
+      # Include methods
       app.send :include, InstanceMethods
     end
+    
     alias :included :registered
   end
   
+  # Routing instance methods
   module InstanceMethods
+    
     # Takes a block which allows many pages to have the same layout
-    # with_layout :admin do
-    #   page "/admin/"
-    #   page "/admin/login.html"
-    # end
+    #
+    #   with_layout :admin do
+    #     page "/admin/"
+    #     page "/admin/login.html"
+    #   end
+    #
+    # @param [String, Symbol] layout_name
+    # @return [void]
     def with_layout(layout_name, &block)
       old_layout = layout
     
@@ -22,27 +35,36 @@ module Middleman::CoreExtensions::Routing
     end
     
     # The page method allows the layout to be set on a specific path
-    # page "/about.html", :layout => false
-    # page "/", :layout => :homepage_layout
+    #
+    #   page "/about.html", :layout => false
+    #   page "/", :layout => :homepage_layout
+    #
+    # @param [String] url
+    # @param [Hash] opts
+    # @return [void]
     def page(url, opts={}, &block)
-      if url.include?("*")
-        url = Regexp.new(url.gsub("*", "(.*)").gsub(/^\//, "^"))
-      end
+      a_block = block_given? ? block : nil
       
-      if url.is_a?(Regexp) && !opts.empty?
-        provides_metadata_for_path url do |url|
-          { :options => opts }
+      # Default layout
+      opts[:layout] = layout if opts[:layout].nil?
+
+      # If the url is a regexp
+      if url.is_a?(Regexp) || url.include?("*")
+        
+        # Use the metadata loop for matching against paths at runtime
+        sitemap.provides_metadata_for_path url do |url|
+          { :options => opts, :blocks => [a_block] }
         end
         
         return
       end
       
-      opts[:layout] = layout if opts[:layout].nil?
-      
+      # Normalized path
       url = full_path(url)
 
+      # Setup proxy
       if opts.has_key?(:proxy)
-        reroute(url, opts[:proxy])
+        proxy(url, opts[:proxy])
         
         if opts.has_key?(:ignore) && opts[:ignore]
           ignore(opts[:proxy])
@@ -56,14 +78,11 @@ module Middleman::CoreExtensions::Routing
           opts.delete(:ignore)
         end
       end
-
-      a_block = block_given? ? block : nil
-      if a_block || !opts.empty?
-        sitemap.page(url) do
-          template.options = opts
-          template.blocks  = [a_block]
-        end
+      
+      # Setup a metadata matcher for rendering those options
+      sitemap.provides_metadata_for_path url do |url|
+        { :options => opts, :blocks => [a_block] }
       end
     end
   end
-end
+end

data/lib/middleman-core/core_extensions/show_exceptions.rb

@@ -1,9 +1,17 @@
-require 'rack/showexceptions'
-
+# Support rack/showexceptions during development
 module Middleman::CoreExtensions::ShowExceptions
+  
+  # Setup extension
   class << self
+    
+    # Once registered
     def registered(app)
+      # Require lib
+      require 'rack/showexceptions'
+      
+      # When in dev
       app.configure :development do
+        # Include middlemare
         if show_exceptions
           use ::Middleman::CoreExtensions::ShowExceptions::Middleware
         end
@@ -11,6 +19,8 @@ module Middleman::CoreExtensions::ShowExceptions
     end
   end
   
+  # Custom exception class
+  # TODO: Style this ourselves
   class Middleware < ::Rack::ShowExceptions
   end
-end
+end

data/lib/middleman-core/extensions/asset_host.rb

@@ -1,21 +1,36 @@
+# Extensions namespace
 module Middleman::Extensions
+  
+  # Asset Host module
   module AssetHost
+    
+    # Setup extension
     class << self
+      
+      # Once registered
       def registered(app)
+        # Default to no host
         app.set :asset_host, false
       
+        # Include methods
         app.send :include, InstanceMethods
       end
+      
       alias :included :registered
     end
   
+    # Asset Host Instance Methods
     module InstanceMethods
+      
+      # Override default asset url helper to include asset hosts
+      #
+      # @param [String] path
+      # @param [String] prefix
+      # @return [String]
       def asset_url(path, prefix="")
         original_output = super
         return original_output unless asset_host
 
-        # valid_extensions = %w(.png .gif .jpg .jpeg .svg .svgz .js .css)
-
         asset_prefix = if asset_host.is_a?(Proc)
           asset_host.call(original_output)
         elsif asset_host.is_a?(String)
@@ -26,4 +41,7 @@ module Middleman::Extensions
       end
     end
   end
-end
+  
+  # Register the extension
+  register :asset_host, AssetHost
+end

data/lib/middleman-core/extensions/automatic_image_sizes.rb

@@ -1,15 +1,33 @@
+# Extensions namespace
 module Middleman::Extensions
+  
+  # Automatic Image Sizes extension
   module AutomaticImageSizes
+    
+    # Setup extension
     class << self
+      
+      # Once registered
       def registered(app)
+        # Include 3rd-party fastimage library
         require "middleman-core/extensions/automatic_image_sizes/fastimage"
 
+        # Include methods
         app.send :include, InstanceMethods
       end
+      
       alias :included :registered
     end
   
+    # Automatic Image Sizes Instance Methods
     module InstanceMethods
+      
+      # Override default image_tag helper to automatically calculate and include
+      # image dimensions.
+      #
+      # @param [String] path
+      # @param [Hash] params
+      # @return [String]
       def image_tag(path, params={})
         if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://")
           params[:alt] ||= ""
@@ -34,5 +52,6 @@ module Middleman::Extensions
     end
   end
   
+  # Register the extension
   register :automatic_image_sizes, AutomaticImageSizes
-end
+end

data/lib/middleman-core/extensions/directory_indexes.rb

@@ -1,62 +1,57 @@
+# Extensions namespace
 module Middleman::Extensions
+  
+  # Directory Indexes extension
   module DirectoryIndexes
+    
+    # Setup extension
     class << self
-      def registered(app)
-        app.send :include, InstanceMethods
-        app.before do
-          next if sitemap.exists?(@original_path)
-
-          prefix         = @original_path.sub(/\/$/, "")
-          indexed_path   = prefix + "/" + index_file
-        
-          extensioned_path = prefix + File.extname(index_file)
-          is_ignored = ignored_directory_indexes.include?(extensioned_path)
-        
-          if !sitemap.exists?(indexed_path) && !is_ignored
-            parts         = @original_path.split("/")
-            last_part     = parts.last
-            last_part_ext = File.extname(last_part)
-        
-            if last_part_ext.blank?
-              # This is a folder, redirect to index
-              @request_path = extensioned_path
-            end
-          end
-        end
       
-        app.build_reroute do |destination, request_path|
-          index_ext      = File.extname(index_file)
-          new_index_path = "/#{index_file}"
-
-          if ignored_directory_indexes.include?(request_path)
-            false
-          elsif request_path =~ /#{new_index_path}$/
-            false
-          else
-            [
-              destination.sub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
-              request_path
-            ]
-          end
+      # Once registered
+      def registered(app)
+        app.ready do
+          sitemap.register_resource_list_manipulator(
+            :directory_indexes, 
+            DirectoryIndexManager.new(self)
+          )
         end
       end
+
       alias :included :registered
     end
-  
-    module InstanceMethods
-      def ignored_directory_indexes
-        @_ignored_directory_indexes ||= []
-      end
     
-      def page(url, options={}, &block)
-        if options.has_key?(:directory_index) && !options["directory_index"]
-          ignored_directory_indexes << url
-        else
-          super
+    class DirectoryIndexManager
+      def initialize(app)
+        @app = app
+      end
+      
+      # Update the main sitemap resource list
+      # @return [void]
+      def manipulate_resource_list(resources)
+        index_file = @app.index_file
+        new_index_path = "/#{index_file}"
+        
+        resources.each do |resource|
+          # Check if it would be pointless to reroute
+          next if resource.path == index_file || 
+                  resource.path.end_with?(new_index_path) || 
+                  File.extname(index_file) != resource.ext
+          
+          # Check if frontmatter turns directory_index off
+          d = resource.data
+          next if d && d["directory_index"] == false
+        
+          # Check if file metadata (options set by "page" in config.rb) turns directory_index off
+          if resource.metadata[:options] && resource.metadata[:options][:directory_index] == false
+            next
+          end
+          
+          resource.destination_path = resource.path.chomp(File.extname(index_file)) + new_index_path
         end
       end
     end
   end
   
+  # Register the extension
   register :directory_indexes, DirectoryIndexes
-end
+end

data/lib/middleman-core/extensions/lorem.rb

@@ -1,17 +1,34 @@
+# Extension namespace
 module Middleman::Extensions
+  
+  # Lorem helper
   module Lorem
+    
+    # Setup extension
     class << self
+      
+      # Once registered
       def registered(app)
+        # Include methods
         app.send :include, InstanceMethods
       end
+      
       alias :included :registered
     end
   
+    # Lorem extension instance methods
     module InstanceMethods
+      # Access to the Lorem object
+      # @return [Middleman::Extensions::Lorem::LoremObject]
       def lorem
-        @_lorem ||= LoremObject.new(self)
+        @_lorem ||= LoremObject.new
       end
       
+      # Return a placeholder image using placekitten.com
+      #
+      # @param [String] size
+      # @param [Hash] options
+      # @return [String]
       def placekitten(size, options={})
         options[:domain] = "http://placekitten.com"
         lorem.image(size, options)
@@ -43,42 +60,57 @@ module Middleman::Extensions
     #   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     #   OTHER DEALINGS IN THE SOFTWARE.
     class LoremObject
+      # Words for use in lorem text
       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 initialize(app)
-        @app = app
-      end
-      
+      # Get one placeholder word
+      # @return [String]
       def word
         words(1)
       end
 
+      # Get some number of placeholder words
+      # @param [Fixnum] total
+      # @return [String]
       def words(total)
         (1..total).map do
           randm(WORDS)
         end.join(' ')
       end
 
+      # Get one placeholder sentence
+      # @return [String]
       def sentence
         sentences(1)
       end
 
+      # Get some number of placeholder sentences
+      # @param [Fixnum] total
+      # @return [String]
       def sentences(total)
         (1..total).map do
           words(randm(4..15)).capitalize
         end.join('. ')
       end
 
+      # Get one placeholder paragraph
+      # @return [String]
       def paragraph
         paragraphs(1)
       end
 
+      # Get some number of placeholder paragraphs
+      # @param [Fixnum] total
+      # @return [String]
       def paragraphs(total)
         (1..total).map do
           sentences(randm(3..7)).capitalize
         end.join("\n\n")
       end
 
+      # Get a placeholder date
+      # @param [String] fmt
+      # @return [String]
       def date(fmt = '%a %b %d, %Y')
         y = rand(20) + 1990
         m = rand(12) + 1
@@ -86,20 +118,28 @@ module Middleman::Extensions
         Time.local(y,m,d).strftime(fmt)
       end
 
+      # Get a placeholder name
+      # @return [String]
       def name
         "#{first_name} #{last_name}"
       end
 
+      # Get a placeholder first name
+      # @return [String]
       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
 
+      # Get a placeholder last name
+      # @return [String]
       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
 
+      # Get a placeholder email address
+      # @return [String]
       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)
@@ -107,6 +147,10 @@ module Middleman::Extensions
         "#{username}@#{domains[rand(domains.size)]}".downcase
       end
 
+      # Get a placeholder image, using placehold.it by default
+      # @param [String] size
+      # @param [Hash] options
+      # @return [String]
       def image(size, options={})
         domain           = options[:domain] || "http://placehold.it"
         src              = "#{domain}/#{size}"
@@ -129,12 +173,16 @@ module Middleman::Extensions
 
       private
 
+      # Pick a random item from a given range
+      # @param [Range] range
+      # @return [Object]
       def randm(range)
         a = range.to_a
         a[rand(a.length)]
       end
     end
   end
-
+  
+  # Register the extension
   register :lorem, Lorem
 end

data/lib/middleman-core/extensions.rb

@@ -0,0 +1,179 @@
+module Middleman
+
+  # Backwards compatibility namespace
+  module Features
+  end
+
+  module CoreExtensions
+    # File Change Notifier
+    autoload :FileWatcher,    "middleman-core/core_extensions/file_watcher"
+
+    # In-memory Sitemap
+    autoload :Sitemap,        "middleman-core/core_extensions/sitemap"
+
+    # Add Builder callbacks
+    autoload :Builder,        "middleman-core/core_extensions/builder"
+
+    # Custom Feature API
+    autoload :Extensions,     "middleman-core/core_extensions/extensions"
+
+    # Asset Path Pipeline
+    autoload :Assets,         "middleman-core/core_extensions/assets"
+
+    # Data looks at the data/ folder for YAML files and makes them available
+    # to dynamic requests.
+    autoload :Data,           "middleman-core/core_extensions/data"
+
+    # Parse YAML from templates
+    autoload :FrontMatter,    "middleman-core/core_extensions/front_matter"
+
+    # External helpers looks in the helpers/ folder for helper modules
+    autoload :ExternalHelpers, "middleman-core/core_extensions/external_helpers"
+
+    # DefaultHelpers are the built-in dynamic template helpers.
+    autoload :DefaultHelpers, "middleman-core/core_extensions/default_helpers"
+
+    # Extended version of Padrino's rendering
+    autoload :Rendering,      "middleman-core/core_extensions/rendering"
+
+    # Pass custom options to views
+    autoload :Routing,        "middleman-core/core_extensions/routing"
+
+    # Catch and show exceptions at the Rack level
+    autoload :ShowExceptions, "middleman-core/core_extensions/show_exceptions"
+    
+    # i18n
+    autoload :I18n,           "middleman-core/core_extensions/i18n"
+  end
+  
+  module Extensions
+    # Provide Apache-style index.html files for directories
+    autoload :DirectoryIndexes,    "middleman-core/extensions/directory_indexes"
+
+    # Lorem provides a handful of helpful prototyping methods to generate
+    # words, paragraphs, fake images, names and email addresses.
+    autoload :Lorem,               "middleman-core/extensions/lorem"
+
+    # AutomaticImageSizes inspects the images used in your dynamic templates
+    # and automatically adds width and height attributes to their HTML
+    # elements.
+    autoload :AutomaticImageSizes, "middleman-core/extensions/automatic_image_sizes"
+
+    # AssetHost allows you to setup multiple domains to host your static
+    # assets. Calls to asset paths in dynamic templates will then rotate
+    # through each of the asset servers to better spread the load.
+    autoload :AssetHost,           "middleman-core/extensions/asset_host"
+  
+    class << self
+      def registered
+        @_registered ||= {}
+      end
+
+      # Register a new extension. Choose a name which will be
+      # used to activate the extension in config.rb, like this:
+      #
+      #     activate :my_extension
+      #
+      # Provide your extension module either as the namespace
+      # parameter, or return it from the block:
+      #
+      # @param [Symbol] name The name of the extension
+      # @param [Module] namespace The extension module
+      # @param [String] version A RubyGems-style version string stating
+      #                         the versions of middleman this extension
+      #                         is compatible with.
+      # @yield Instead of passing a module in namespace, you can provide
+      #        a block which returns your extension module. This gives
+      #        you the ability to require other files only when the
+      #        extension is activated.
+      def register(name, namespace=nil, version=nil, &block)
+        # If we've already got a matching extension that passed the
+        # version check, bail out.
+        return if registered.has_key?(name.to_sym) &&
+        !registered[name.to_sym].is_a?(String)
+
+        if block_given?
+          version = namespace
+        end
+
+        passed_version_check = true
+        if !version.nil?
+          requirement = ::Gem::Requirement.create(version)
+          if !requirement.satisfied_by?(Middleman::GEM_VERSION)
+            passed_version_check = false
+          end
+        end
+
+        registered[name.to_sym] = if !passed_version_check
+          "== #{name} failed version check. Requested #{version}, got #{Middleman::VERSION}"
+        elsif block_given?
+          block
+        elsif namespace
+          namespace
+        end
+      end
+
+      def load(name)
+        name = name.to_sym
+        return nil unless registered.has_key?(name)
+
+        extension = registered[name]
+        if extension.is_a?(Proc)
+          extension = extension.call() || nil
+          registered[name] = extension
+        end
+
+        extension
+      end
+    end
+  end
+
+  # Where to look in gems for extensions to auto-register
+  EXTENSION_FILE = File.join("lib", "middleman_extension.rb") unless const_defined?(:EXTENSION_FILE)
+
+  class << self
+    # Automatically load extensions from available RubyGems
+    # which contain the EXTENSION_FILE
+    #
+    # @private
+    def load_extensions_in_path
+      if defined?(Bundler)
+        Bundler.require
+      else
+        extensions = rubygems_latest_specs.select do |spec|
+          spec_has_file?(spec, EXTENSION_FILE)
+        end
+
+        extensions.each do |spec|
+          require spec.name
+        end
+      end
+    end
+
+    # Backwards compatible means of finding all the latest gemspecs
+    # available on the system
+    #
+    # @private
+    # @return [Array] Array of latest Gem::Specification
+    def rubygems_latest_specs
+      # If newer Rubygems
+      if ::Gem::Specification.respond_to? :latest_specs
+        ::Gem::Specification.latest_specs
+      else
+        ::Gem.source_index.latest_specs
+      end
+    end
+
+    # Where a given Gem::Specification has a specific file. Used
+    # to discover extensions and Sprockets-supporting gems.
+    #
+    # @private
+    # @param [Gem::Specification]
+    # @param [String] Path to look for
+    # @return [Boolean] Whether the file exists
+    def spec_has_file?(spec, path)
+      full_path = File.join(spec.full_gem_path, path)
+      File.exists?(full_path)
+    end
+  end
+end