middleman-core 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 399878e22fa5885a804711e6492dca948a8b31f6
-  data.tar.gz: 85bfe5dd5d745dc7cfb3dff4f92bdc5fcc0bec2e
+  metadata.gz: ec86e75a709ebacbc0ae4fd050a256758886f76f
+  data.tar.gz: 631a42d3975ab12e85936cd886447c1e46a0eefe
 SHA512:
-  metadata.gz: aecbe3601a5a83dc338598bf3eda63906ebb3ee2f6c22e3d27786763245e0e89b1245d731dda9561c8914c0491482ef4aac432f777722ed62bd14c09cf732aef
-  data.tar.gz: 807a69fdf80e525bda9d44fd08615395a6bd23bca2c846480fc05b095ef38ec729e9fef8ab42397859964fb5e71b8e132c76e4b8459fc2a35c99da4228100ab3
+  metadata.gz: 362ba5051eaba3f44b7a02bb9ff7a3f1bd95b65246c8b56ec5d26985045aaf7d8e45282441ac2a6ec17b8613934d5e2049bc1f3f02332e33d4517eb4d5c2f2eb
+  data.tar.gz: 221fec08ab0e003b107cfc8627f65f22f2b6b1e4b81a3793735c2b11c05c3ff2c2ba45d9d74fc7cb5fe07f7873f365b5eeaa048a0d71076e5c3fd4d4586e3a22

data/features/cli_init.feature

@@ -15,19 +15,29 @@ Feature: Middleman CLI
       | source/javascripts/all.js                     |
       | source/stylesheets/all.css                    |
       | source/stylesheets/normalize.css              |
-      
+
+  Scenario: Create a new project in the current directory
+    Given a directory named "MY_PROJECT"
+    When I cd to "MY_PROJECT"
+    And I run `middleman init`
+    Then the exit status should be 0
+    And the following files should exist:
+      | Gemfile                                       |
+      | config.rb                                     |
+      | source/index.html.erb                         |
+
   Scenario: Create a new project (alias i)
     When I run `middleman i MY_PROJECT`
     Then a directory named "MY_PROJECT" should exist
-    
+
   Scenario: Create a new project (alias new)
     When I run `middleman new MY_PROJECT`
     Then a directory named "MY_PROJECT" should exist
-  
+
   Scenario: Create a new project (alias n)
     When I run `middleman n MY_PROJECT`
     Then a directory named "MY_PROJECT" should exist
-    
+
   Scenario: Create a new project with Rack
     When I run `middleman init MY_PROJECT --rack`
     Then a directory named "MY_PROJECT" should exist
@@ -36,7 +46,7 @@ Feature: Middleman CLI
       | config.rb                                     |
       | config.ru                                     |
       | Gemfile                                       |
-      
+
   Scenario: Create a new HTML5 project
     When I run `middleman init MY_PROJECT --template=html5`
     Then a directory named "MY_PROJECT" should exist
@@ -54,7 +64,7 @@ Feature: Middleman CLI
       | layouts/layout.erb                            |
       | humans.txt                                    |
       | js/main.js                                    |
-      
+
   Scenario: Create a new HTML5 project with Rack
     When I run `middleman init MY_PROJECT --rack --template=html5`
     Then a directory named "MY_PROJECT" should exist
@@ -63,7 +73,7 @@ Feature: Middleman CLI
       | config.rb                                     |
       | config.ru                                     |
       | Gemfile                                       |
-    
+
   Scenario: Create a new Mobile HTML5 project
     When I run `middleman init MY_PROJECT --template=mobile`
     Then a directory named "MY_PROJECT" should exist
@@ -79,7 +89,7 @@ Feature: Middleman CLI
       | index.html                                    |
       | humans.txt                                    |
       | js/libs/respond.min.js                        |
-      
+
   Scenario: Create a new Mobile HTML5 project with Rack
     When I run `middleman init MY_PROJECT --rack --template=mobile`
     Then a directory named "MY_PROJECT" should exist

data/features/helpers_select_tag.feature

@@ -11,7 +11,7 @@ Feature: select_tag helper
     When I go to "/select_tag.html"
     Then I should see:
     """
-    <select name="colors"><option value="">Choose a color</option>
+    <select name="colors" include_blank="Choose a color"><option value="">Choose a color</option>
     <option value="red">red</option>
     <option value="blue">blue</option>
     <option value="blorange">blorange</option>

data/features/layouts_dir.feature

@@ -28,3 +28,11 @@ Feature: Layouts dir
     When I go to "/index.html"
     Then I should see "contents of the layout"
 
+  Scenario: Prefer a layout in the layouts_dir to one with the same name in the root
+    Given a fixture app "layouts-dir-app"
+    And a file named "config.rb" with:
+    """
+    """
+    And the Server is running
+    When I go to "/ambiguous.html"
+    Then I should see "contents of the layout in layouts_dir"

data/features/markdown_redcarpet.feature

@@ -86,8 +86,8 @@ Feature: Markdown (Redcarpet) support
     Then I should see "![dust mite](http://dust.mite/image.png)"
     And I should not see "<img"
     When I go to "/with_toc_data.html"
-    Then I should see 'id="toc_0"'
-    And I should see 'id="toc_1"'
+    Then I should see 'id="first-header"'
+    And I should see 'id="second-header"'
     When I go to "/hard_wrap.html"
     Then I should see "br"
     When I go to "/link.html"

data/fixtures/asciidoc-app/source/layouts/default.erb

@@ -5,6 +5,5 @@
 </head>
 <body>
 <%= yield %>
-
 </body>
 </html>

data/fixtures/capture-html-app/source/capture_html_haml.html.haml

@@ -1,4 +1,4 @@
-- capture_html :from_template do
+= capture_html :from_template do
   %h1= "I am the yielded content haml"
 
 %p I am in the template

data/fixtures/content-for-app/source/content_for_haml.html.haml

@@ -1,4 +1,4 @@
-- content_for :from_template do
+= content_for :from_template do
   = "I am the yielded content haml <s>with html tags</s>"
 
 %p I am in the template

data/fixtures/frontmatter-settings-app/source/layouts/override.erb

@@ -1,2 +1 @@
-<%= yield %>
- Override.
+<%= yield %> Override.

data/fixtures/frontmatter-settings-neighbor-app/source/layouts/override.erb

@@ -1,2 +1 @@
-<%= yield %>
- Override.
+<%= yield %> Override.

data/fixtures/layouts-dir-app/source/ambiguous.html.erb

@@ -0,0 +1,5 @@
+---
+layout: other
+---
+
+Hello

data/fixtures/layouts-dir-app/source/layouts/other.erb

@@ -0,0 +1,3 @@
+contents of the layout in layouts_dir
+
+<%= yield %>

data/fixtures/layouts-dir-app/source/other.erb

@@ -0,0 +1,3 @@
+contents of the layout in the root
+
+<%= yield %>

data/fixtures/link-to-app/source/link_to_haml.html.haml

@@ -1,2 +1,2 @@
-- link_to "/" do
+= link_to "/" do
   %s haml with html tags

data/fixtures/link-to-app/source/link_to_slim.html.slim

@@ -1,2 +1,2 @@
-- link_to "/" do
+= link_to "/" do
   s slim with html tags

data/fixtures/nested-layout-app/source/layouts/inner_haml.haml

@@ -1,3 +1,3 @@
-- wrap_layout :outer_haml do
+= wrap_layout :outer_haml do
   Inner
   = yield

data/fixtures/nested-layout-app/source/layouts/inner_slim.slim

@@ -1,3 +1,3 @@
-- wrap_layout :outer_slim do
+= wrap_layout :outer_slim do
   h3 Inner
   == yield

data/fixtures/nested-layout-app/source/layouts/outer_haml.haml

@@ -1,3 +1,3 @@
-- wrap_layout :master_haml do
+= wrap_layout :master_haml do
   Outer
   = yield

data/fixtures/nested-layout-app/source/layouts/outer_slim.slim

@@ -1,3 +1,3 @@
-- wrap_layout :master_slim do
+= wrap_layout :master_slim do
   h2 Outer
   == yield

data/lib/middleman-core/application.rb

@@ -6,15 +6,14 @@ require 'i18n'
 
 # Don't fail on invalid locale, that's not what our current
 # users expect.
-::I18n.config.enforce_available_locales = false
+::I18n.enforce_available_locales = false
 
 # Use ActiveSupport JSON
 require 'active_support/json'
 require 'active_support/core_ext/integer/inflections'
-require 'active_support/core_ext/float/rounding'
 
 # Simple callback library
-require 'vendored-middleman-deps/hooks-0.2.0/lib/hooks'
+require 'hooks'
 
 # Our custom logger
 require 'middleman-core/logger'
@@ -32,6 +31,7 @@ module Middleman
 
     # Uses callbacks
     include Hooks
+    include Hooks::InstanceHooks
 
     # Before request hook
     define_hook :before
@@ -39,6 +39,9 @@ module Middleman
     # Ready (all loading and parsing of extensions complete) hook
     define_hook :ready
 
+    # Runs before the build is started
+    define_hook :before_build
+
     # Runs after the build is finished
     define_hook :after_build
 
@@ -223,6 +226,12 @@ module Middleman
     end
     alias :inspect :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
 
+    # Hooks clones _hooks from the class to the instance.
+    # https://github.com/apotonick/hooks/blob/master/lib/hooks/instance_hooks.rb#L10
+    # Middleman expects the same list of hooks for class and instance hooks:
+    def _hooks
+      self.class._hooks
+    end
   end
 end
 

data/lib/middleman-core/cli/build.rb

@@ -1,6 +1,3 @@
-require 'middleman-core'
-require 'middleman-core/logger'
-
 require 'fileutils'
 require 'set'
 
@@ -50,6 +47,9 @@ module Middleman::Cli
         raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?'
       end
 
+      require 'middleman-core'
+      require 'middleman-core/logger'
+
       # Use Rack::Test for inspecting a running server for output
       require 'rack'
       require 'rack/test'
@@ -65,6 +65,8 @@ module Middleman::Cli
       opts[:glob]  = options['glob'] if options.has_key?('glob')
       opts[:clean] = options['clean']
 
+      self.class.shared_instance.run_hook :before_build, self
+
       action BuildAction.new(self, opts)
 
       self.class.shared_instance.run_hook :after_build, self

data/lib/middleman-core/cli/console.rb

@@ -32,7 +32,7 @@ module Middleman::Cli
           set :environment, opts[:environment].to_sym
         end
 
-        logger(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
+        ::Middleman::Logger.singleton(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
       end
 
       # TODO: get file watcher / reload! working in console

data/lib/middleman-core/cli/init.rb

@@ -43,7 +43,7 @@ module Middleman::Cli
       :desc    => 'Skip Git ignores and keeps'
     # The init task
     # @param [String] name
-    def init(name)
+    def init(name = '.')
       key = options[:template].to_sym
       unless ::Middleman::Templates.registered.has_key?(key)
         raise Thor::Error.new "Unknown project template '#{key}'"

data/lib/middleman-core/core_extensions.rb

@@ -35,7 +35,6 @@ require 'middleman-more/core_extensions/i18n'
 begin
   require 'middleman-more/core_extensions/compass'
 rescue LoadError
-  $stderr.puts "Compass not installed: #{$!}"
 end
 
 ###

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

@@ -7,12 +7,13 @@ module Middleman
     module FileWatcher
 
       IGNORE_LIST = [
-        /^bin\//,
-        /^\.bundle\//,
-        /^vendor\//,
-        /^\.sass-cache\//,
-        /^\.cache\//,
-        /^\.git\//,
+        /^bin(\/|$)/,
+        /^\.bundle(\/|$)/,
+        /^vendor(\/|$)/,
+        /^node_modules(\/|$)/,
+        /^\.sass-cache(\/|$)/,
+        /^\.cache(\/|$)/,
+        /^\.git(\/|$)/,
         /^\.gitignore$/,
         /\.DS_Store/,
         /^\.rbenv-.*$/,
@@ -38,7 +39,7 @@ module Middleman
           end
 
           app.after_configuration do
-            config[:file_watcher_ignore] << %r{^#{config[:build_dir]}\/}
+            config[:file_watcher_ignore] << %r{^#{config[:build_dir]}(\/|$)}
           end
 
           # After config, load everything else
@@ -99,7 +100,6 @@ module Middleman
         # @return [void]
         def did_change(path)
           path = Pathname(path)
-          return if ignored?(path)
           logger.debug "== File Change: #{path}"
           @known_paths << path
           self.run_callbacks(path, :changed)
@@ -111,7 +111,6 @@ module Middleman
         # @return [void]
         def did_delete(path)
           path = Pathname(path)
-          return if ignored?(path)
           logger.debug "== File Deletion: #{path}"
           @known_paths.delete(path)
           self.run_callbacks(path, :deleted)
@@ -131,7 +130,7 @@ module Middleman
             glob = (path + '**').to_s
             subset = @known_paths.select { |p| p.fnmatch(glob) }
 
-            ::Middleman::Util.all_files_under(path).each do |filepath|
+            ::Middleman::Util.all_files_under(path, &method(:ignored?)).each do |filepath|
               next if only_new && subset.include?(filepath)
 
               subset.delete(filepath)
@@ -156,7 +155,6 @@ module Middleman
           @known_paths.include?(p)
         end
 
-      protected
         # Whether this path is ignored
         # @param [Pathname] path
         # @return [Boolean]
@@ -165,6 +163,8 @@ module Middleman
           app.config[:file_watcher_ignore].any? { |r| path =~ r }
         end
 
+      protected
+
         # Notify callbacks for a file given an array of callbacks
         #
         # @param [Pathname] path The file that was changed

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

@@ -157,7 +157,7 @@ module Middleman
               content = render_individual_file(path, locs, opts, context)
               path = File.basename(path, File.extname(path))
             rescue LocalJumpError
-              raise "Tried to render a layout (calls yield) at #{path} like it was a template. Non-default layouts need to be in #{source}/#{layout_dir}."
+              raise "Tried to render a layout (calls yield) at #{path} like it was a template. Non-default layouts need to be in #{source}/#{config[:layouts_dir]}."
             end
           end
 
@@ -190,42 +190,29 @@ module Middleman
           locals = options[:locals]
 
           found_partial = false
-          engine        = nil
+          resolve_opts = { try_without_underscore: true }
 
           # If the path is known to the sitemap
           if resource = sitemap.find_resource_by_path(current_path)
             current_dir = File.dirname(resource.source_file)
-            engine = File.extname(resource.source_file)[1..-1].to_sym
+            resolve_opts[:preferred_engine] = File.extname(resource.source_file)[1..-1].to_sym
 
             # Look for partials relative to the current path
             relative_dir = File.join(current_dir.sub(%r{^#{Regexp.escape(self.source_dir)}/?}, ''), data)
 
-            # Try to use the current engine first
-            found_partial, found_engine = resolve_template(relative_dir, :preferred_engine => engine, :try_without_underscore => true)
-
-            # Fall back to any engine available
-            if !found_partial
-              found_partial, found_engine = resolve_template(relative_dir, :try_without_underscore => true)
-            end
+            found_partial = resolve_template(relative_dir, resolve_opts)
           end
 
           # Look in the partials_dir for the partial with the current engine
-          partials_path = File.join(config[:partials_dir], data)
-          if !found_partial && !engine.nil?
-            found_partial, found_engine = resolve_template(partials_path, :preferred_engine => engine, :try_without_underscore => true)
-          end
-
-          # Look in the root with any engine
           if !found_partial
-            found_partial, found_engine = resolve_template(partials_path, :try_without_underscore => true)
+            partials_path = File.join(config[:partials_dir], data)
+            found_partial = resolve_template(partials_path, resolve_opts)
           end
 
+          raise ::Middleman::CoreExtensions::Rendering::TemplateNotFound, "Could not locate partial: #{data}" unless found_partial
+
           # Render the partial if found, otherwide throw exception
-          if found_partial
-            render_individual_file(found_partial, locals, options, self, &block)
-          else
-            raise ::Middleman::CoreExtensions::Rendering::TemplateNotFound, "Could not locate partial: #{data}"
-          end
+          render_individual_file(found_partial, locals, options, self, &block)
         end
 
         # Render an on-disk file. Used for everything, including layouts.
@@ -370,26 +357,14 @@ module Middleman
           # Whether we've found the layout
           layout_path = false
 
-          # If we prefer a specific engine
-          if !preferred_engine.nil?
-            # Check root
-            layout_path, layout_engine = resolve_template(name, :preferred_engine => preferred_engine)
-
-            # Check layouts folder
-            if !layout_path
-              layout_path, layout_engine = resolve_template(File.join(config[:layouts_dir], name.to_s), :preferred_engine => preferred_engine)
-            end
-          end
+          resolve_opts = {}
+          resolve_opts[:preferred_engine] = preferred_engine if !preferred_engine.nil?
 
-          # Check root, no preference
-          if !layout_path
-            layout_path, layout_engine = resolve_template(name)
-          end
+          # Check layouts folder
+          layout_path = resolve_template(File.join(config[:layouts_dir], name.to_s), resolve_opts)
 
-          # Check layouts folder, no preference
-          if !layout_path
-            layout_path, layout_engine = resolve_template(File.join(config[:layouts_dir], name.to_s))
-          end
+          # If we didn't find it, check root
+          layout_path = resolve_template(name, resolve_opts) unless layout_path
 
           # Return the path
           layout_path
@@ -440,7 +415,8 @@ module Middleman
 
         # Find a template on disk given a output path
         # @param [String] request_path
-        # @param [Hash] options
+        # @option options [Boolean] :preferred_engine If set, try this engine first, then fall back to any engine.
+        # @option options [Boolean] :try_without_underscore
         # @return [Array<String, Symbol>, Boolean]
         def resolve_template(request_path, options={})
           # Find the path by searching or using the cache
@@ -450,48 +426,46 @@ module Middleman
             on_disk_path  = File.expand_path(relative_path, self.source_dir)
 
             # By default, any engine will do
-            preferred_engine = '*'
+            preferred_engines = ['*']
 
-            # Unless we're specifically looking for a preferred engine
+            # If we're specifically looking for a preferred engine
             if options.has_key?(:preferred_engine)
               extension_class = ::Tilt[options[:preferred_engine]]
               matched_exts = []
 
               # Get a list of extensions for a preferred engine
-              # TODO: Cache this
-              ::Tilt.mappings.each do |ext, engines|
-                next unless engines.include? extension_class
-                matched_exts << ext
-              end
+              matched_exts = ::Tilt.mappings.select do |ext, engines|
+                engines.include? extension_class
+              end.keys
 
-              # Change the glob to only look for the matched extensions
-              if matched_exts.length > 0
-                preferred_engine = '{' + matched_exts.join(',') + '}'
-              else
-                return false
+              # Prefer to look for the matched extensions
+              unless matched_exts.empty?
+                preferred_engines.unshift('{' + matched_exts.join(',') + '}')
               end
             end
 
-            # Look for files that match
-            path_with_ext = on_disk_path + '.' + preferred_engine
-
-            found_path = Dir[path_with_ext].find do |path|
-              ::Tilt[path]
+            search_paths = preferred_engines.flat_map do |preferred_engine|
+              path_with_ext = on_disk_path + '.' + preferred_engine
+              paths = [path_with_ext]
+              if options[:try_without_underscore]
+                paths << path_with_ext.sub(relative_path, relative_path.sub(/^_/, '').sub(/\/_/, '/'))
+              end
+              paths
             end
 
-            if !found_path && options[:try_without_underscore] &&
-              path_no_underscore = path_with_ext.
-                sub(relative_path, relative_path.sub(/^_/, '').
-                sub(/\/_/, '/'))
-              found_path = Dir[path_no_underscore].find do |path|
+            found_path = nil
+            search_paths.each do |path_with_ext|
+              found_path = Dir[path_with_ext].find do |path|
                 ::Tilt[path]
               end
+              break if found_path
             end
 
             # If we found one, return it and the found engine
-            if found_path || files.exists?(on_disk_path)
-              engine = found_path ? File.extname(found_path)[1..-1].to_sym : nil
-              [ found_path || on_disk_path, engine ]
+            if found_path
+              found_path
+            elsif File.exists?(on_disk_path)
+              on_disk_path
             else
               false
             end