middleman-core 4.3.0.rc.4 → 4.3.0

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

@@ -88,7 +88,7 @@ module Middleman
       end
 
       Contract Symbol, RespondTo[:manipulate_resource_list], Maybe[Or[Num, ArrayOf[Num]]], Maybe[Symbol] => Any
-      def register_resource_list_manipulators(name, manipulator, priority = 50, custom_name = nil)
+      def register_resource_list_manipulators(name, manipulator, priority=50, custom_name=nil)
         Array(priority || 50).each do |p|
           register_resource_list_manipulator(name, manipulator, p, custom_name)
         end
@@ -103,7 +103,7 @@ module Middleman
       # @param [Symbol] custom_name The method name to execute.
       # @return [void]
       Contract Symbol, RespondTo[:manipulate_resource_list], Maybe[Num, Bool], Maybe[Symbol] => Any
-      def register_resource_list_manipulator(name, manipulator, priority = 50, custom_name = nil)
+      def register_resource_list_manipulator(name, manipulator, priority=50, custom_name=nil)
         # The third argument used to be a boolean - handle those who still pass one
         priority = 50 unless priority.is_a? Numeric
         @resource_list_manipulators = @resource_list_manipulators.push(
@@ -121,7 +121,7 @@ module Middleman
         rebuild_resource_list!(:"registered_new_manipulator_#{name}")
       end
 
-      # Rebuild the list of resources from scratch, using registered manipulators
+      # Rebuild the list of resources from scratch, using registed manipulators
       # @return [void]
       Contract Symbol => Any
       def rebuild_resource_list!(name)
@@ -171,7 +171,7 @@ module Middleman
       # @param [Boolean] include_ignored Whether to include ignored resources
       # @return [Array<Middleman::Sitemap::Resource>]
       Contract Bool => ResourceList
-      def resources(include_ignored = false)
+      def resources(include_ignored=false)
         @lock.synchronize do
           ensure_resource_list_updated!
           if include_ignored
@@ -238,11 +238,11 @@ module Middleman
 
                 # Rebuild cache
                 @resources.each do |resource|
-                  @_lookup_by_path[::Middleman::Util.normalize_path(resource.path)] = resource
+                  @_lookup_by_path[resource.path] = resource
                 end
 
                 @resources.each do |resource|
-                  @_lookup_by_destination_path[::Middleman::Util.normalize_path(resource.destination_path)] = resource
+                  @_lookup_by_destination_path[resource.destination_path] = resource
                 end
 
                 # NB: This needs to be done after the previous two steps,

data/lib/middleman-core/sources/source_watcher.rb

@@ -15,7 +15,7 @@ module Listen
       #   return true unless only_patterns.any? { |pattern| path =~ pattern }
       # end
 
-      return only_patterns.none? { |pattern| path =~ pattern } if only_patterns
+      return !only_patterns.any? { |pattern| path =~ pattern } if only_patterns
 
       ignore_patterns.any? { |pattern| path =~ pattern }
     end
@@ -50,7 +50,7 @@ module Middleman
     # Reference to lower level listener
     attr_reader :listener
 
-    IGNORED_DIRECTORIES = Set.new(%w[.git node_modules .sass-cache vendor/bundle .bundle])
+    IGNORED_DIRECTORIES = Set.new(%w(.git node_modules .sass-cache vendor/bundle .bundle))
 
     # Construct a new SourceWatcher
     #
@@ -59,7 +59,7 @@ module Middleman
     # @param [String] directory The on-disk path to watch.
     # @param [Hash] options Configuration options.
     Contract IsA['Middleman::Sources'], Symbol, String, Hash => Any
-    def initialize(parent, type, directory, options = {})
+    def initialize(parent, type, directory, options={})
       @parent = parent
       @options = options
 
@@ -103,7 +103,7 @@ module Middleman
       poll_once!
     end
 
-    def update_config(options = {})
+    def update_config(options={})
       without_listener_running do
         @disable_watcher = options.fetch(:disable_watcher, false)
         @force_polling = options.fetch(:force_polling, false)
@@ -134,19 +134,13 @@ module Middleman
     # @param [Boolean] glob If the path contains wildcard characters.
     # @return [Middleman::SourceFile, nil]
     Contract Or[String, Pathname], Maybe[Bool] => Maybe[IsA['Middleman::SourceFile']]
-    def find(path, glob = false)
+    def find(path, glob=false)
       path = path.to_s.encode!('UTF-8', 'UTF-8-MAC') if RUBY_PLATFORM =~ /darwin/
 
       p = Pathname(path)
 
       return nil if p.absolute? && !p.to_s.start_with?(@directory.to_s)
 
-      destination_dir = @options[:destination_dir]
-      if destination_dir.present? && p.to_s.start_with?(destination_dir)
-        path_without_destination_dir = p.to_s[destination_dir.to_s.length + 1..-1]
-        p = Pathname(path_without_destination_dir)
-      end
-
       p = @directory + p if p.relative?
 
       if glob
@@ -301,7 +295,7 @@ module Middleman
       [valid_updates, valid_removes]
     end
 
-    # Convert a path to a file representation.
+    # Convert a path to a file resprentation.
     #
     # @param [Pathname] path The path.
     # @return [Middleman::SourceFile]
@@ -363,16 +357,16 @@ module Middleman
     private
 
     def without_listener_running
-      listener_running = @listener&.processing?
+      listener_running = @listener && @listener.processing?
 
       stop_listener! if listener_running
 
       yield
 
-      return unless listener_running
-
-      poll_once!
-      listen!
+      if listener_running
+        poll_once!
+        listen!
+      end
     end
   end
 end

data/lib/middleman-core/sources.rb

@@ -24,7 +24,7 @@ module Middleman
     include Contracts
 
     # Types which could cause output to change.
-    OUTPUT_TYPES = %i[source locales data].freeze
+    OUTPUT_TYPES = [:source, :locales, :data].freeze
 
     # Types which require a reload to eval ruby
     CODE_TYPES = [:reload].freeze
@@ -56,7 +56,7 @@ module Middleman
     # @param [Hash] options Global options.
     # @param [Array] watchers Default watchers.
     Contract IsA['Middleman::Application'], Maybe[Hash], Maybe[Array] => Any
-    def initialize(app, _options = {}, watchers = [])
+    def initialize(app, _options={}, watchers=[])
       @app = app
       @watchers = watchers
       @sorted_watchers = @watchers.dup.freeze
@@ -88,7 +88,7 @@ module Middleman
     # @param [Proc] block Ignore by block evaluation.
     # @return [void]
     Contract Symbol, Symbol, Or[Regexp, Proc] => Any
-    def ignore(name, type, regex = nil, &block)
+    def ignore(name, type, regex=nil, &block)
       @ignores = @ignores.put(name, type: type,
                                     validator: (block_given? ? block : regex))
 
@@ -116,13 +116,13 @@ module Middleman
     # @param [Hash] options The watcher options.
     # @return [#changed, #deleted]
     Contract Or[Symbol, HANDLER], Maybe[Hash] => HANDLER
-    def watch(type_or_handler, options = {})
+    def watch(type_or_handler, options={})
       handler = if type_or_handler.is_a? Symbol
-                  path = File.expand_path(options.delete(:path), app.root)
-                  SourceWatcher.new(self, type_or_handler, path, options)
-                else
-                  type_or_handler
-                end
+        path = File.expand_path(options.delete(:path), app.root)
+        SourceWatcher.new(self, type_or_handler, path, options)
+      else
+        type_or_handler
+      end
 
       @watchers << handler
 
@@ -188,7 +188,7 @@ module Middleman
     # @param [Boolean] glob If the path contains wildcard or glob characters.
     # @return [Middleman::SourceFile, nil]
     Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], Or[Pathname, String], Maybe[Bool] => Maybe[SourceFile]
-    def find(types, path, glob = false)
+    def find(types, path, glob=false)
       array_of_types = Array(types)
 
       watchers
@@ -277,7 +277,7 @@ module Middleman
     #
     # @param [nil,Regexp] matcher A Regexp to match the change path against
     Contract Maybe[Matcher] => Any
-    def changed(matcher = nil, &_block)
+    def changed(matcher=nil, &_block)
       on_change OUTPUT_TYPES do |updated, _removed|
         updated
           .select { |f| matcher.nil? ? true : matches?(matcher, f) }
@@ -289,7 +289,7 @@ module Middleman
     #
     # @param [nil,Regexp] matcher A Regexp to match the change path against
     Contract Maybe[Matcher] => Any
-    def deleted(matcher = nil, &_block)
+    def deleted(matcher=nil, &_block)
       on_change OUTPUT_TYPES do |_updated, removed|
         removed
           .select { |f| matcher.nil? ? true : matches?(matcher, f) }

data/lib/middleman-core/step_definitions/builder_steps.rb

@@ -1,57 +1,31 @@
 require 'fileutils'
 
 Before do
-  @modification_times = {}
+  @modification_times = Hash.new
 end
 
 Given /^a built app at "([^\"]*)"$/ do |path|
-  step %(a fixture app "#{path}")
-
-  cwd = File.expand_path(aruba.current_directory)
-  step %(I set the environment variable "MM_ROOT" to "#{cwd}")
-
-  step %(I run `middleman build --verbose`)
+  step %Q{a fixture app "#{path}"}
+  step %Q{I run `middleman build --verbose`}
 end
 
 Given /^was successfully built$/ do
-  step %(the output should contain "Project built successfully.")
-  step %(the exit status should be 0)
-  step %(a directory named "build" should exist)
-end
-
-Given /^was not successfully built$/ do
-  step %(the output should not contain "Project built successfully.")
-  step %(the exit status should be 1)
-  step %(a directory named "build" should not exist)
+  step %Q{the output should contain "Project built successfully."}
+  step %Q{the exit status should be 0}
+  step %Q{a directory named "build" should exist}
 end
 
 Given /^a successfully built app at "([^\"]*)"$/ do |path|
-  step %(a built app at "#{path}")
-  step %(was successfully built)
+  step %Q{a built app at "#{path}"}
+  step %Q{was successfully built}
 end
 
 Given /^a built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, flags|
-  step %(a fixture app "#{path}")
-
-  cwd = File.expand_path(aruba.current_directory)
-  step %(I set the environment variable "MM_ROOT" to "#{cwd}")
-
-  step %(I run `middleman build #{flags}`)
+  step %Q{a fixture app "#{path}"}
+  step %Q{I run `middleman build #{flags}`}
 end
 
 Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, flags|
-  step %(a built app at "#{path}" with flags "#{flags}")
-  step %(was successfully built)
-end
-
-Given /^I run the interactive middleman console$/ do
-  cwd = File.expand_path(aruba.current_directory)
-  step %(I set the environment variable "MM_ROOT" to "#{cwd}")
-  step %(I run `middleman console` interactively)
-end
-
-Given /^I run the interactive middleman server$/ do
-  cwd = File.expand_path(aruba.current_directory)
-  step %(I set the environment variable "MM_ROOT" to "#{cwd}")
-  step %(I run `middleman server` interactively)
+  step %Q{a built app at "#{path}" with flags "#{flags}"}
+  step %Q{was successfully built}
 end

data/lib/middleman-core/step_definitions/commandline_steps.rb

@@ -1,11 +1,11 @@
-When /^I stop (?:middleman|all commands) if the output( of the last command)? contains:$/ do |_last_command, expected|
+When /^I stop (?:middleman|all commands) if the output( of the last command)? contains:$/ do |last_command, expected|
   begin
-    Timeout.timeout(aruba.config.exit_timeout) do
+    Timeout.timeout(exit_timeout) do
       loop do
-        raise 'You need to start middleman interactively first.' unless @interactive
+        fail "You need to start middleman interactively first." unless @interactive
 
-        if sanitize_text(@interactive.output)&.match?(Regexp.new(sanitize_text(expected)))
-          all_commands.each(&:terminate)
+        if unescape(@interactive.output) =~ Regexp.new(unescape(expected))
+          only_processes.each { |p| p.terminate }
           break
         end
 
@@ -80,7 +80,7 @@ end
 
 # Make sure each and every process is really dead
 After do
-  all_commands.each(&:terminate)
+  only_processes.each { |p| p.terminate }
 end
 
 Before '@ruby-2.1' do

data/lib/middleman-core/step_definitions/middleman_steps.rb

@@ -1,14 +1,15 @@
 require 'fileutils'
 
-Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |_path, config_name|
-  config_path = File.join(expand_path('.'), "config-#{config_name}.rb")
-  config_dest = File.join(expand_path('.'), 'config.rb')
+Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name|
+  target = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
+  config_path = File.join(expand_path("."), "config-#{config_name}.rb")
+  config_dest = File.join(expand_path("."), 'config.rb')
   FileUtils.cp(config_path, config_dest)
 end
 
 Given /^an empty app$/ do
-  step %(a directory named "empty_app")
-  step %(I cd to "empty_app")
+  step %Q{a directory named "empty_app"}
+  step %Q{I cd to "empty_app"}
   ENV['MM_ROOT'] = nil
 end
 
@@ -17,14 +18,14 @@ Given /^a fixture app "([^\"]*)"$/ do |path|
 
   # This step can be reentered from several places but we don't want
   # to keep re-copying and re-cd-ing into ever-deeper directories
-  next if File.basename(expand_path('.')) == path
+  next if File.basename(expand_path(".")) == path
 
-  step %(a directory named "#{path}")
+  step %Q{a directory named "#{path}"}
 
   target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
-  FileUtils.cp_r(target_path, expand_path('.'))
+  FileUtils.cp_r(target_path, expand_path("."))
 
-  step %(I cd to "#{path}")
+  step %Q{I cd to "#{path}"}
 end
 
 Then /^the file "([^\"]*)" has the contents$/ do |path, contents|
@@ -34,18 +35,18 @@ Then /^the file "([^\"]*)" has the contents$/ do |path, contents|
 end
 
 Then /^the file "([^\"]*)" is removed$/ do |path|
-  step %(I remove the file "#{path}")
+  step %Q{I remove the file "#{path}"}
 
   @server_inst.files.poll_once!
 end
 
 Given /^a modification time for a file named "([^\"]*)"$/ do |file|
-  target = File.join(expand_path('.'), file)
+  target = File.join(expand_path("."), file)
   @modification_times[target] = File.mtime(target)
 end
 
 Then /^the file "([^\"]*)" should not have been updated$/ do |file|
-  target = File.join(expand_path('.'), file)
+  target = File.join(expand_path("."), file)
   expect(File.mtime(target)).to eq(@modification_times[target])
 end
 
@@ -55,5 +56,5 @@ Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
 end
 
 And /the file "(.*)" should be gzipped/ do |file|
-  expect(File.binread(File.join(expand_path('.'), file), 2)).to eq(['1F8B'].pack('H*'))
+  expect(File.binread(File.join(expand_path("."), file), 2)).to eq(['1F8B'].pack('H*'))
 end

data/lib/middleman-core/step_definitions/server_steps.rb

@@ -10,7 +10,9 @@ end
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
   @activation_commands ||= []
 
-  @activation_commands << -> { activate(feature.to_sym) } if state == 'enabled'
+  if state == 'enabled'
+    @activation_commands << lambda { activate(feature.to_sym) }
+  end
 end
 
 Given /^"([^\"]*)" feature is "enabled" with "([^\"]*)"$/ do |feature, options_str|
@@ -18,7 +20,7 @@ Given /^"([^\"]*)" feature is "enabled" with "([^\"]*)"$/ do |feature, options_s
 
   options = eval("{#{options_str}}")
 
-  @activation_commands << -> { activate(feature.to_sym, options) }
+  @activation_commands << lambda { activate(feature.to_sym, options) }
 end
 
 Given /^"([^\"]*)" is set to "([^\"]*)"$/ do |variable, value|
@@ -29,13 +31,13 @@ Given /^"([^\"]*)" is set to "([^\"]*)"$/ do |variable, value|
 end
 
 Given /^the Server is running$/ do
-  root_dir = File.expand_path(expand_path('.'))
+  root_dir = File.expand_path(expand_path("."))
 
-  ENV['MM_SOURCE'] = if File.exist?(File.join(root_dir, 'source'))
-                       'source'
-                     else
-                       ''
-                     end
+  if File.exists?(File.join(root_dir, 'source'))
+    ENV['MM_SOURCE'] = 'source'
+  else
+    ENV['MM_SOURCE'] = ''
+  end
 
   ENV['MM_ROOT'] = root_dir
 
@@ -52,7 +54,7 @@ Given /^the Server is running$/ do
 
     app.after_configuration_eval do
       activation_commands.each do |p|
-        instance_exec(&p)
+        config_context.instance_exec(&p)
       end
     end
   end
@@ -61,16 +63,12 @@ Given /^the Server is running$/ do
 end
 
 Given /^the Server is running at "([^\"]*)"$/ do |app_path|
-  step %(a fixture app "#{app_path}")
-  step %(the Server is running)
-end
-
-When /^the Server is reloaded$/ do
-  step %(the Server is running)
+  step %Q{a fixture app "#{app_path}"}
+  step %Q{the Server is running}
 end
 
 Given /^a template named "([^\"]*)" with:$/ do |name, string|
-  step %(a file named "source/#{name}" with:), string
+  step %Q{a file named "source/#{name}" with:}, string
 end
 
 When /^I go to "([^\"]*)"$/ do |url|
@@ -78,7 +76,7 @@ When /^I go to "([^\"]*)"$/ do |url|
 end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
-  expect { visit(URI.encode(url).to_s) }.to_not raise_exception
+  expect{ visit(URI.encode(url).to_s) }.to_not raise_exception
 end
 
 Then /^the content type should be "([^\"]*)"$/ do |expected|
@@ -122,5 +120,5 @@ Then /^the status code should be "([^\"]*)"$/ do |expected|
 end
 
 Then /^I should see "([^\"]*)" lines$/ do |lines|
-  expect(page.body.chomp.split($INPUT_RECORD_SEPARATOR).length).to eq lines.to_i
+  expect(page.body.chomp.split($/).length).to eq lines.to_i
 end

data/lib/middleman-core/template_context.rb

@@ -30,7 +30,7 @@ module Middleman
     # @param [Middleman::Application] app
     # @param [Hash] locs
     # @param [Hash] opts
-    def initialize(app, locs = {}, opts = {})
+    def initialize(app, locs={}, opts={})
       @app = app
       @locs = locs
       @opts = opts
@@ -42,8 +42,7 @@ module Middleman
     # @api private
     # @return [String] The old buffer.
     def save_buffer
-      buf_was = @_out_buf
-      @_out_buf = ''
+      @_out_buf, buf_was = '', @_out_buf
       buf_was
     end
 
@@ -101,7 +100,7 @@ module Middleman
     # @param [Proc] block A block will be evaluated to return internal contents.
     # @return [String]
     Contract Any, Or[Symbol, String], Hash => String, Maybe[Proc] => String
-    def render(_, name, options = {}, &block)
+    def render(_, name, options={}, &block)
       name = name.to_s
 
       partial_file = locate_partial(name, false) || locate_partial(name, true)
@@ -127,35 +126,30 @@ module Middleman
     # @param [String] partial_path
     # @return [String]
     Contract String, Maybe[Bool] => Maybe[IsA['Middleman::SourceFile']]
-    def locate_partial(partial_path, try_static = true)
+    def locate_partial(partial_path, try_static=true)
       partial_file = nil
       lookup_stack = []
       non_root     = partial_path.to_s.sub(/^\//, '')
       non_root_no_underscore = non_root.sub(/^_/, '').sub(/\/_/, '/')
 
-      if current_resource
-        resource = current_resource
+      if resource = current_resource
         current_dir  = resource.file_descriptor[:relative_path].dirname
         relative_dir = current_dir + Pathname(non_root)
         relative_dir_no_underscore = current_dir + Pathname(non_root_no_underscore)
-
-        if relative_dir
-          lookup_stack.push [relative_dir.to_s,
-                             { preferred_engine: resource.file_descriptor[:relative_path]
-                                                         .extname[1..-1].to_sym }]
-        end
       end
 
+      if relative_dir
+        lookup_stack.push [relative_dir.to_s,
+                           { preferred_engine: resource.file_descriptor[:relative_path]
+                             .extname[1..-1].to_sym }]
+      end
       lookup_stack.push [non_root]
-
       lookup_stack.push [non_root,
                          { try_static: try_static }]
-
       if relative_dir_no_underscore
         lookup_stack.push [relative_dir_no_underscore.to_s,
                            { try_static: try_static }]
       end
-
       lookup_stack.push [non_root_no_underscore,
                          { try_static: try_static }]
 
@@ -175,7 +169,6 @@ module Middleman
     # @return [Middleman::Sitemap::Resource]
     def current_resource
       return nil unless current_path
-
       sitemap.find_resource_by_destination_path(current_path)
     end
     alias current_page current_resource