RubyGems - middleman-core - Versions diffs - 4.0.0.rc.1 → 4.0.0.rc.2 - Mend

middleman-core 4.0.0.rc.1 → 4.0.0.rc.2

Files changed (415) hide show

data/fixtures/preview-server-app/config.rb ADDED

File without changes

data/fixtures/preview-server-app/source/index.html.erb ADDED

	@@ -0,0 +1 @@
1	+ <h1>Welcome</h1>

data/fixtures/preview-server-app/source/layout.erb ADDED

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/preview-server-app/source/layouts/custom.erb ADDED

@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>Custom Layout</title>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/preview-server-app/source/real.html ADDED

	@@ -0,0 +1 @@
1	+ I am real

data/fixtures/preview-server-app/source/real/index.html.erb ADDED

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+I am real: <%= @num %>

data/fixtures/preview-server-app/source/should_be_ignored.html ADDED

	@@ -0,0 +1 @@
1	+ <h1>Ignore me!</h1>

data/fixtures/preview-server-app/source/should_be_ignored2.html ADDED

	@@ -0,0 +1 @@
1	+ <h1>Ignore me! 2</h1>

data/fixtures/preview-server-app/source/should_be_ignored3.html ADDED

	@@ -0,0 +1 @@
1	+ <h1>Ignore me! 3</h1>

data/fixtures/preview-server-app/source/static.html ADDED

	@@ -0,0 +1 @@
1	+ Static, no code!

data/fixtures/preview-server-hook-app/config.rb ADDED

@@ -0,0 +1,19 @@
+set :layout, false
+class MyFeature < Middleman::Extension
+  def initialize(app, options_hash = {}, &block)
+    super
+    app.before_server do |server_information|
+      puts "/// #{server_information.listeners.first} ///"
+      puts "/// #{server_information.port} ///"
+      puts "/// #{server_information.server_name} ///"
+      puts "/// #{server_information.site_addresses.first} ///"
+      puts "/// ### END ### ///"
+    end
+  end
+end
+::Middleman::Extensions.register(:my_feature, MyFeature)
+activate :my_feature

data/fixtures/preview-server-hook-app/source/index.html.erb ADDED

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>preview-server-hook-app</title>
+  </head>
+  <body>
+    <h1>preview-server-hook-app</h1>
+  </body>
+</html>

data/fixtures/related-files-app/config.rb ADDED

File without changes

data/fixtures/related-files-app/source/index.html.erb ADDED

File without changes

data/fixtures/related-files-app/source/partials/_test.erb ADDED

File without changes

data/fixtures/related-files-app/source/partials/_test2.haml ADDED

File without changes

data/fixtures/related-files-app/source/stylesheets/_include3.sass ADDED

File without changes

data/fixtures/related-files-app/source/stylesheets/_include4.scss ADDED

File without changes

data/fixtures/related-files-app/source/stylesheets/include1.css ADDED

File without changes

data/fixtures/related-files-app/source/stylesheets/include2.css.scss ADDED

File without changes

data/fixtures/related-files-app/source/stylesheets/site.css.scss ADDED

File without changes

data/fixtures/relative-assets-app/source/absolute_image_relative_css.html.erb ADDED

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <%= stylesheet_link_tag :relative_assets, relative: true %>
+    <%= javascript_include_tag :app, relative: true  %>
+  </head>
+  <body>
+    <%= image_tag "blank.gif" %>
+  </body>
+</html>

data/fixtures/relative-assets-app/source/javascripts/app.js ADDED

@@ -0,0 +1,3 @@
+function hello() {
+  console.log('world');
+}

data/fixtures/relative-assets-app/source/relative_image.html.erb CHANGED

@@ -1,6 +1,7 @@
 <html>
   <head>
     <%= stylesheet_link_tag :relative_assets %>
+    <%= javascript_include_tag :app %>
   </head>
   <body>
     <%= image_tag "blank.gif" %>

data/fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb ADDED

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <%= stylesheet_link_tag :relative_assets, relative: false %>
+    <%= javascript_include_tag :app, relative: false  %>
+  </head>
+  <body>
+    <%= image_tag "blank.gif" %>
+  </body>
+</html>

data/lib/middleman-core/application.rb CHANGED

@@ -1,5 +1,3 @@
-# Use ActiveSupport JSON
-require 'active_support/json'
 require 'active_support/core_ext/integer/inflections'
 require 'middleman-core/contracts'
@@ -35,7 +33,9 @@ module Middleman
       # Root project directory (overwritten in middleman build/server)
       # @return [String]
       def root
-        ENV['MM_ROOT'] || Dir.pwd
+        r = ENV['MM_ROOT'] ? ENV['MM_ROOT'].dup : ::Middleman::Util.current_directory
+        r.encode!('UTF-8', 'UTF-8-MAC') if RUBY_PLATFORM =~ /darwin/
+        r
       end
       # Pathname-addressed root
@@ -68,13 +68,17 @@ module Middleman
     Contract SetOf[MapDescriptor]
     attr_reader :mappings
-    # Which host preview should start on.
-    # @return [Fixnum]
-    define_setting :host, '0.0.0.0', 'The preview server host'
     # Which port preview should start on.
     # @return [Fixnum]
-    define_setting :port, 4567, 'The preview server port'
+    config.define_setting :port, 4567, 'The preview server port'
+    # Which server name should be used
+    # @return [NilClass, String]
+    config.define_setting :server_name, nil, 'The server name of preview server'
+    # Which bind address the preview server should use
+    # @return [NilClass, String]
+    config.define_setting :bind_address, nil, 'The bind address of the preview server'
     # Whether to serve the preview server over HTTPS.
     # @return [Boolean]
@@ -120,15 +124,15 @@ module Middleman
     # @return [String]
     define_setting :js_dir,      'javascripts', 'Location of javascripts within source'
-    # Location of stylesheets within source. Used by Compass.
+    # Location of stylesheets within source.
     # @return [String]
     define_setting :css_dir,     'stylesheets', 'Location of stylesheets within source'
-    # Location of images within source. Used by HTML helpers and Compass.
+    # Location of images within source. Used by HTML helpers.
     # @return [String]
     define_setting :images_dir,  'images', 'Location of images within source'
-    # Location of fonts within source. Used by Compass.
+    # Location of fonts within source.
     # @return [String]
     define_setting :fonts_dir,   'fonts', 'Location of fonts within source'
@@ -140,7 +144,7 @@ module Middleman
     # @return [String]
     define_setting :build_dir,   'build', 'Where to build output files'
-    # Default prefix for building paths. Used by HTML helpers and Compass.
+    # Default prefix for building paths. Used by HTML helpers.
     # @return [String]
     define_setting :http_prefix, '/', 'Default prefix for building paths'
@@ -162,7 +166,7 @@ module Middleman
     # Setup callbacks which can exclude paths from the sitemap
     define_setting :ignored_sitemap_matchers, {
       # Files starting with an underscore, but not a double-underscore
-      partials: proc { |file|
+      partials: proc do |file|
         ignored = false
         file[:relative_path].ascend do |f|
@@ -173,14 +177,20 @@ module Middleman
         end
         ignored
-      },
+      end,
-      layout: proc { |file, _sitemap_app|
+      layout: proc do |file, _sitemap_app|
         file[:relative_path].to_s.start_with?('layout.') ||
           file[:relative_path].to_s.start_with?('layouts/')
-      }
+      end
     }, 'Callbacks that can exclude paths from the sitemap'
+    # Set textual delimiters that denote the start and end of frontmatter
+    define_setting :frontmatter_delims, {
+      json: [%w(;;; ;;;)],
+      yaml: [%w(--- ---), %w(--- ...)]
+    }, 'Allowed frontmatter delimiters'
     define_setting :watcher_disable, false, 'If the Listen watcher should not run'
     define_setting :watcher_force_polling, false, 'If the Listen watcher should run in polling mode'
     define_setting :watcher_latency, nil, 'The Listen watcher latency'
@@ -212,7 +222,8 @@ module Middleman
         :before_shutdown,
         :before, # Before Rack requests
         :before_render,
-        :after_render
+        :after_render,
+        :before_server
       ])
       @middleware = Set.new
@@ -330,8 +341,9 @@ module Middleman
     end
     # Whether we're in a specific environment
+    # @param [Symbol] key
     # @return [Boolean]
-    Contract Bool
+    Contract Symbol => Bool
     def environment?(key)
       config[:environment] == key
     end
@@ -386,6 +398,20 @@ module Middleman
       execute_callbacks(:before_shutdown)
     end
+    # Set attributes (global variables)
+    #
+    # @deprecated Prefer accessing settings through "config".
+    #
+    # @param [Symbol] key Name of the attribue
+    # @param value Attribute value
+    # @return [void]
+    def set(key, value=nil, &block)
+      logger.warn "Warning: `set :#{key}` is deprecated. Use `config[:#{key}] =` instead."
+      value = block if block_given?
+      config[key] = value
+    end
     # Work around this bug: http://bugs.ruby-lang.org/issues/4521
     # where Ruby will call to_s/inspect while printing exception
     # messages, which can take a long time (minutes at full CPU)

data/lib/middleman-core/builder.rb CHANGED

@@ -54,7 +54,6 @@ module Middleman
       @app.execute_callbacks(:before_build, [self])
       queue_current_paths if @cleaning
-      prerender_css
       output_files
@@ -67,39 +66,14 @@ module Middleman
       !@has_error
     end
-    # Pre-request CSS to give Compass a chance to build sprites
-    # @return [Array<Resource>] List of css resources that were output.
-    Contract ResourceList
-    def prerender_css
-      logger.debug '== Prerendering CSS'
-      css_files = @app.sitemap.resources.select do |resource|
-        resource.ext == '.css'
-      end.each(&method(:output_resource))
-      logger.debug '== Checking for Compass sprites'
-      # Double-check for compass sprites
-      @app.files.find_new_files!
-      @app.sitemap.ensure_resource_list_updated!
-      css_files
-    end
     # Find all the files we need to output and do so.
     # @return [Array<Resource>] List of resources that were output.
     Contract ResourceList
     def output_files
       logger.debug '== Building files'
-      # Sort paths to be built by the above order. This is primarily so Compass can
-      # find files in the build folder when it needs to generate sprites for the
-      # css files.
-      #
-      # Loop over all the paths and build them.
       @app.sitemap.resources
         .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
-        .reject { |resource| resource.ext == '.css' }
         .select { |resource| !@glob || File.fnmatch(@glob, resource.destination_path) }
         .each(&method(:output_resource))
     end
@@ -213,7 +187,7 @@ module Middleman
       end
       @to_clean = paths.select do |path|
-        path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
+        path.realpath.relative_path_from(@build_dir.realpath).to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
       end
       # handle UTF-8-MAC filename on MacOS

data/lib/middleman-core/callback_manager.rb CHANGED

@@ -8,8 +8,8 @@ module Middleman
     Contract Any
     def initialize
-      @callbacks = ::Hamster.hash
-      @subscribers = ::Hamster.vector
+      @callbacks = ::Hamster::Hash.empty
+      @subscribers = ::Hamster::Vector.empty
     end
     Contract RespondTo[:define_singleton_method], ArrayOf[Symbol] => Any
@@ -55,7 +55,7 @@ module Middleman
     Contract Or[Symbol, ArrayOf[Symbol]] => ::Hamster::Vector
     def callbacks_for(keys)
       immutable_keys = keys.is_a?(Symbol) ? keys : ::Hamster::Vector.new(keys)
-      @callbacks.get(immutable_keys) || ::Hamster.vector
+      @callbacks.get(immutable_keys) || ::Hamster::Vector.empty
     end
   end
 end

data/lib/middleman-core/configuration.rb CHANGED

@@ -150,7 +150,7 @@ module Middleman
       # Whether or not there has been a value set beyond the default
       def value_set?
-        @value_set
+        @value_set == true
       end
     end
   end

data/lib/middleman-core/core_extensions/collections/step_context.rb CHANGED

@@ -11,7 +11,7 @@ module Middleman
         attr_reader :descriptors
         def initialize
-          @descriptors = ::Hamster.set
+          @descriptors = ::Hamster::Set.empty
         end
         def method_missing(name, *args, &block)

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

@@ -99,10 +99,10 @@ module Middleman
           basename  = File.basename(data_path, extension)
           if %w(.yaml .yml).include?(extension)
-            data, postscript = ::Middleman::Util::Data.parse(file[:full_path], :yaml)
+            data, postscript = ::Middleman::Util::Data.parse(file[:full_path], @app.config[:frontmatter_delims], :yaml)
             data[:postscript] = postscript if !postscript.nil? && data.is_a?(Hash)
           elsif extension == '.json'
-            data, _postscript = ::Middleman::Util::Data.parse(file[:full_path], :json)
+            data, _postscript = ::Middleman::Util::Data.parse(file[:full_path], @app.config[:frontmatter_delims], :json)
           else
             return
           end

data/lib/middleman-core/core_extensions/default_helpers.rb CHANGED

@@ -7,7 +7,8 @@ require 'padrino-helpers'
 class Padrino::Helpers::OutputHelpers::ErbHandler
   # Force Erb capture not to use safebuffer
   def capture_from_template(*args, &block)
-    self.output_buffer, buf_was = '', output_buffer
+    self.output_buffer = ''
+    buf_was = output_buffer
     raw = block.call(*args)
     captured = template.instance_variable_get(:@_out_buf)
     self.output_buffer = buf_was
@@ -103,6 +104,36 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       end
     end
+    # Override helper to add `relative` opt-out.
+    def stylesheet_link_tag(*sources)
+      options = {
+        rel: 'stylesheet'
+      }.update(sources.extract_options!.symbolize_keys)
+      path_options = {}
+      path_options[:relative] = options.delete(:relative) if options.key?(:relative)
+      sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all, source|
+        all << tag(:link, {
+          href: asset_path(:css, source, path_options)
+        }.update(options))
+      end
+    end
+    # Override helper to add `relative` opt-out.
+    def javascript_include_tag(*sources)
+      options = sources.extract_options!.symbolize_keys
+      path_options = {}
+      path_options[:relative] = options.delete(:relative) if options.key?(:relative)
+      sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all, source|
+        all << content_tag(:script, nil, {
+          src: asset_path(:js, source, path_options)
+        }.update(options))
+      end
+    end
     # Output a stylesheet link tag based on the current path
     #
     # @param [Symbol] asset_ext The type of asset
@@ -160,16 +191,19 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [Hash] options Data to pass through.
     # @return [String]
     def asset_path(kind, source, options={})
-      ::Middleman::Util.asset_path(app, kind, source, options)
+      options_with_resource = options.merge(current_resource: current_resource)
+      ::Middleman::Util.asset_path(app, kind, source, options_with_resource)
     end
     # Get the URL of an asset given a type/prefix
     #
     # @param [String] path The path (such as "photo.jpg")
     # @param [String] prefix The type prefix (such as "images")
+    # @param [Hash] options Additional options.
     # @return [String] The fully qualified asset url
     def asset_url(_path, prefix='', options={})
-      ::Middleman::Util.asset_url(app, prefix, options)
+      options_with_resource = options.merge(current_resource: current_resource)
+      ::Middleman::Util.asset_url(app, prefix, options_with_resource)
     end
     # Given a source path (referenced either absolutely or relatively)