middleman-core 3.2.2 → 3.3.0

data/lib/middleman-core/meta_pages/config_setting.rb

@@ -1,3 +1,5 @@
+require 'pp'
+
 module Middleman
   module MetaPages
     # View class for a config entry
@@ -13,22 +15,18 @@ module Middleman
         content = ''
         key_classes = ['key']
         key_classes << 'modified' if @setting.value_set?
-        content << content_tag(:span, @setting.key.inspect, :class => key_classes.join(' '))
+        content << content_tag(:span, @setting.key.pretty_inspect.strip, :class => key_classes.join(' '))
         content << ' = '
-        content << content_tag(:span, @setting.value.inspect, :class => 'value')
-        if @setting.default
+        content << content_tag(:span, @setting.value.pretty_inspect.strip, :class => 'value')
+        if @setting.default && @setting.value_set? && @setting.default != @setting.value
           content << content_tag(:span, :class => 'default') do
-            if @setting.value_set?
-              "Default: #{@setting.default.inspect}"
-            else
-              '(Default)'
-            end
+            "(Default: #{@setting.default.inspect})"
           end
         end
 
         if @setting.description
           content << content_tag(:p, :class => 'description') do
-            CGI::escapeHTML(@setting.description)
+            @setting.description
           end
         end
 

data/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -1,7 +1,4 @@
-if !defined?(::Padrino::Helpers)
-  require 'vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/support_lite'
-  require 'vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers'
-end
+require 'padrino-helpers'
 
 module Middleman
   module MetaPages
@@ -15,7 +12,9 @@ module Middleman
       end
 
       def render
-        content_tag :div, :class => 'resource-details' do
+        classes = 'resource-details'
+        classes << ' ignored' if @resource.ignored?
+        content_tag :div, :class => classes do
           content_tag :table do
             content = ''
             resource_properties.each do |label, value|
@@ -33,24 +32,34 @@ module Middleman
 
       # A hash of label to value for all the properties we want to display
       def resource_properties
-        props = {
-          'Path' => @resource.path,
-          'Build Path' => @resource.destination_path,
-          'URL' => content_tag(:a, @resource.url, :href => @resource.url),
-          'Source File' => @resource.source_file,
-        }
+        props = {}
+        props['Path'] = @resource.path
+
+        build_path = @resource.destination_path
+        build_path = 'Not built' if ignored?
+        props['Build Path'] = build_path if @resource.path != build_path
+        props['URL'] = content_tag(:a, @resource.url, :href => @resource.url) unless ignored?
+        props['Source File'] = @resource.source_file.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '')
 
         data = @resource.data
-        props['Data'] = data unless data.empty?
+        props['Data'] = data.inspect unless data.empty?
+
+        meta = @resource.metadata
+        options = meta[:options]
+        props['Options'] = options.inspect unless options.empty?
 
-        options = @resource.metadata[:options]
-        props['Options'] = options unless options.empty?
+        locals = meta[:locals].keys
+        props['Locals'] = locals.join(', ') unless locals.empty?
 
         props
       end
 
+      def ignored?
+        @resource.ignored?
+      end
+
       def css_classes
-        ['resource']
+        ['resource'].concat(ignored? ? ['ignored'] : [])
       end
     end
   end

data/lib/middleman-core/meta_pages/sitemap_tree.rb

@@ -45,7 +45,11 @@ module Middleman
       end
 
       def css_classes
-        ['tree']
+        ['tree'].concat(ignored? ? ['ignored'] : [])
+      end
+
+      def ignored?
+        @children.values.all?(&:ignored?)
       end
 
       protected

data/lib/middleman-core/meta_pages/templates/config.html.erb

@@ -13,7 +13,7 @@
     <a href="/__middleman/">&laquo; back</a>
     <h1>Middleman Configuration</h1>
 
-    <p>This page shows the current configuration of your Middleman application.</p>
+    <p>This page shows the current configuration of your Middleman application. <a href="http://middlemanapp.com/advanced/configuration/">Read more about configuring Middleman.</a></p>
 
     <p>
       <a href="#core">Core configuration</a>
@@ -48,7 +48,7 @@
       <% end %>
 
       <% registered_extensions.keys.each do |ext_name| %>
-      <li><span class="extension"><%= ext_name.inspect %></span> (Inactive)</li>
+      <li><span class="extension inactive"><%= ext_name.inspect %></span></li>
       <% end %>
     </ul>
     </article>

data/lib/middleman-core/meta_pages/templates/index.html.erb

@@ -5,17 +5,27 @@
     <title>Middleman Info</title>
     <link type="text/css" rel="stylesheet" href="/__middleman/assets/meta.css">
   </head>
-  
+
   <body>
     <div class="container">
-      <h1>Middleman Information</h1>
+      <article id="main">
+        <h1>Middleman Information</h1>
 
-      <ul>
-        <li><a href="/__middleman/sitemap/">Sitemap</a></li>
-        <li><a href="/__middleman/config/">Configuration</a></li>
-        <li><a href="http://middlemanapp.com">Middleman Guides</a></li>
-      </ul>
+        <ul class="nav-list">
+          <li>
+            <a href="/__middleman/sitemap/">Sitemap</a>
+            <p>The structure of your site as understood by Middleman.</p>
+          </li>
+          <li>
+            <a href="/__middleman/config/">Configuration</a>
+            <p>All available configuration options and their current values.</p>
+          </li>
+          <li>
+            <a href="http://middlemanapp.com">Middleman Guides</a>
+            <p>Documentation about Middleman's features.</p>
+          </li>
+        </ul>
+      </article>
     </div>
   </body>
 </html>
-    

data/lib/middleman-core/meta_pages/templates/sitemap.html.erb

@@ -2,17 +2,17 @@
 <html>
   <head>
     <meta charset="utf-8">
-        
+
     <title>Middleman Sitemap</title>
 
-    
+
     <link type="text/css" rel="stylesheet" href="/__middleman/assets/meta.css">
     <link type="text/css" rel="stylesheet" href="/__middleman/assets/sitemap.css">
     <script src="/__middleman/assets/jquery-1.8.2.min.js"></script>
     <script src="/__middleman/assets/jquery.details-1.6.min.js"></script>
     <script src="/__middleman/assets/sitemap.js"></script>
   </head>
-  
+
   <body>
     <div class="container">
       <article id="main">
@@ -20,7 +20,7 @@
         <h1>Middleman Sitemap</h1>
 
         <p>This page shows all of the pages in
-        the <a href="http://middlemanapp.com/advanced/sitemap/">sitemap</a>,
+        <a href="http://middlemanapp.com/advanced/sitemap/">the sitemap</a>,
         Middleman's view of your site.</p>
 
         <%= sitemap_tree.render %>
@@ -28,4 +28,3 @@
     </div>
   </body>
 </html>
-

data/lib/middleman-core/preview_server.rb

@@ -133,10 +133,12 @@ module Middleman
             @webrick.stop
           else
             added_and_modified.each do |path|
+              next if app.files.ignored?(path)
               app.files.did_change(path)
             end
 
             removed.each do |path|
+              next if app.files.ignored?(path)
               app.files.did_delete(path)
             end
           end
@@ -164,9 +166,10 @@ module Middleman
       # @return [void]
       def setup_webrick(is_logging)
         http_opts = {
-          :BindAddress => host,
-          :Port        => port,
-          :AccessLog   => []
+          :BindAddress        => host,
+          :Port               => port,
+          :AccessLog          => [],
+          :DoNotReverseLookup => true
         }
 
         if is_logging

data/lib/middleman-core/renderers/erb.rb

@@ -7,30 +7,28 @@ module Middleman
 
         # once registered
         def registered(app)
-          # Setup a default ERb engine
-          app.config.define_setting :erb_engine, :erb, 'The engine to use for rendering ERb templates'
-          app.config.define_setting :erb_engine_prefix, ::Tilt, 'The parent module for ERb template engines'
-
           app.before_configuration do
             template_extensions :erb => :html
           end
 
           # After config
           app.after_configuration do
-            # Find the user's prefered engine
-            # Convert symbols to classes
-            if config[:erb_engine].is_a? Symbol
-              engine = engine.to_s
-              engine = engine == 'erb' ? 'ERB' : engine.camelize
-              config[:erb_engine] = config[:erb_engine_prefix].const_get("#{engine}Template")
-            end
-
-            # Tell Tilt to use the preferred engine
-            ::Tilt.prefer(config[:erb_engine])
+            ::Tilt.prefer(Template, :erb)
           end
         end
         alias :included :registered
       end
+
+      class Template < ::Tilt::ErubisTemplate
+        ##
+        # In preamble we need a flag `__in_erb_template` and SafeBuffer for padrino apps.
+        #
+        def precompiled_preamble(locals)
+          original = super
+          "__in_erb_template = true\n" << original
+          #.rpartition("\n").first << "#{@outvar} = _buf = ActiveSupport::SafeBuffer.new\n"
+        end
+      end
     end
   end
 end

data/lib/middleman-core/renderers/haml.rb

@@ -1,6 +1,16 @@
 # Require gem
 require 'haml'
 
+module SafeTemplate
+  def render(*)
+    super.html_safe
+  end
+end
+
+class Tilt::HamlTemplate
+  include SafeTemplate
+end
+
 module Middleman
   module Renderers
 

data/lib/middleman-core/renderers/markdown.rb

@@ -49,7 +49,11 @@ module Middleman
                 ::Tilt.prefer(markdown_engine_klass, *markdown_exts)
               end
             rescue LoadError
-              logger.warn "Requested Markdown engine (#{config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?"
+              # If they just left it at the default engine and don't happen to have it,
+              # then they're using middleman-core bare and we shouldn't bother them.
+              if config.setting(:markdown_engine).value_set?
+                logger.warn "Requested Markdown engine (#{config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?"
+              end
             end
           end
         end

data/lib/middleman-core/renderers/sass.rb

@@ -14,10 +14,6 @@ module Middleman
           # Default sass options
           app.config.define_setting :sass, {}, 'Sass engine options'
 
-          # Location of SASS .sass-cache directory.
-          # @return [String]
-          app.config.define_setting :sass_cache_path, File.join(app.root_path, '.sass-cache'), 'Location of sass cache' # runtime compile of path
-
           app.before_configuration do
             template_extensions :scss => :css,
                                 :sass => :css

data/lib/middleman-core/renderers/slim.rb

@@ -1,6 +1,20 @@
 # Load gem
 require 'slim'
 
+module SafeTemplate
+  def render(*)
+    super.html_safe
+  end
+end
+
+class Slim::Template
+  include SafeTemplate
+
+  def precompiled_preamble(locals)
+    "__in_slim_template = true\n" << super
+  end
+end
+
 module Middleman
   module Renderers
 
@@ -29,10 +43,9 @@ module Middleman
               :context => self
             }
 
-            slim_embedded = defined?(::Slim::Embedded) ? ::Slim::Embedded : ::Slim::EmbeddedEngine
-
+            ::Slim::Embedded::SassEngine.disable_option_validator!
             %w(sass scss markdown).each do |engine|
-              slim_embedded.default_options[engine.to_sym] = context_hack
+              ::Slim::Embedded.default_options[engine.to_sym] = context_hack
             end
           end
         end

data/lib/middleman-core/sitemap/resource.rb

@@ -111,7 +111,7 @@ module Middleman
 
         relative_source = Pathname(source_file).relative_path_from(Pathname(app.root))
 
-        instrument 'render.resource', :path => relative_source  do
+        instrument 'render.resource', :path => relative_source, :destination_path => destination_path  do
           md   = metadata.dup
           opts = md[:options].deep_merge(opts)
 

data/lib/middleman-core/step_definitions.rb

@@ -3,10 +3,11 @@ MIDDLEMAN_BIN_PATH  = File.join(MIDDLEMAN_ROOT_PATH, 'bin')
 ENV['PATH'] = "#{MIDDLEMAN_BIN_PATH}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
 require 'aruba/cucumber'
+require 'aruba/jruby'
 require 'middleman-core/step_definitions/middleman_steps'
 require 'middleman-core/step_definitions/builder_steps'
 require 'middleman-core/step_definitions/server_steps'
 
 Before do
-  @aruba_timeout_seconds = 30
+  @aruba_timeout_seconds = RUBY_PLATFORM == 'java' ? 120 : 60
 end

data/lib/middleman-core/templates.rb

@@ -96,7 +96,9 @@ require 'middleman-core/templates/mobile'
 require 'middleman-more/templates/smacss'
 
 # Local templates
-require 'middleman-core/templates/local'
+if ENV['HOME'] # Sometimes HOME doesn't exist, in which case there's no point to local templates
+  require 'middleman-core/templates/local'
+end
 
 # Barebones template
 require 'middleman-core/templates/empty'

data/lib/middleman-core/templates/shared/Gemfile.tt

@@ -8,4 +8,7 @@ gem "middleman", "~><%= Middleman::VERSION %>"
 gem "middleman-livereload", "~> 3.1.0"
 
 # For faster file watcher updates on Windows:
-gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
+gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
+
+# Windows does not come with time zone data
+gem "tzinfo-data", platforms: [:mswin, :mingw]

data/lib/middleman-core/templates/shared/config.tt

@@ -36,7 +36,9 @@
 # activate :automatic_image_sizes
 
 # Reload the browser automatically whenever files change
-# activate :livereload
+# configure :development do
+#   activate :livereload
+# end
 
 # Methods defined in the helpers block are available in templates
 # helpers do

data/lib/middleman-core/templates/shared/gitignore

@@ -10,8 +10,9 @@
 # Ignore the build directory
 /build
 
-# Ignore Sass' cache
+# Ignore cache
 /.sass-cache
+/.cache
 
 # Ignore .DS_store file
 .DS_Store

data/lib/middleman-core/util.rb

@@ -28,7 +28,7 @@ module Middleman
         return false if Tilt.registered?(ext.sub('.', ''))
 
         dot_ext = (ext.to_s[0] == ?.) ? ext.dup : ".#{ext}"
-        
+
         if mime = ::Rack::Mime.mime_type(dot_ext, nil)
           !nonbinary_mime?(mime)
         else
@@ -113,21 +113,27 @@ module Middleman
         end
       end
 
-      # Get a recusive list of files inside a set of paths.
+      # Get a recusive list of files inside a path.
       # Works with symlinks.
       #
-      # @param paths Some paths string or Pathname
-      # @return [Array] An array of filenames
-      def all_files_under(*paths)
-        paths.flat_map do |p|
-          path = Pathname(p)
-
-          if path.directory?
-            all_files_under(*path.children)
-          elsif path.file?
-            path
-          end
-        end.compact
+      # @param path Some path string or Pathname
+      # @param ignore A proc/block that returns true if a given path should be ignored - if a path
+      #               is ignored, nothing below it will be searched either.
+      # @return [Array<Pathname>] An array of Pathnames for each file (no directories)
+      def all_files_under(path, &ignore)
+        path = Pathname(path)
+
+        return [] if ignore && ignore.call(path)
+
+        if path.directory?
+          path.children.flat_map do |child|
+            all_files_under(child, &ignore)
+          end.compact
+        elsif path.file?
+          [path]
+        else
+          []
+        end
       end
 
       # Given a source path (referenced either absolutely or relatively)
@@ -248,7 +254,7 @@ module Middleman
         s.each_byte do |c|
           return true if binary_bytes.include?(c)
         end
-        
+
         false
       end
 
@@ -278,4 +284,4 @@ module Middleman
       end
     end
   end
-end
+end