middleman-core 4.1.14 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be41baeb5666c509a112558e6e10b3108869e01d
-  data.tar.gz: 016576ba5698a66833f75ddacdfdfb80c34bcb2f
+  metadata.gz: c98aa3f3ea938c35613c890737221cfb932ad93a
+  data.tar.gz: 851399237191cee4648d04b50a6ec8fff58a4890
 SHA512:
-  metadata.gz: f87245bfd9285edb25c299f2a3c901a297b4701e94c6bd8407055a1ab91935c3a99ef5bad142f9735f1fd312a57f4c41d3fb61ee6924253e7b669d08f6ebd9cd
-  data.tar.gz: 39096c09155127dfb41f828bc75bfb02a2bd87b7478afbbb26738ca1a4b07a917f47329f54d1c4e094b13194d47fc548858683cf9c4297df1a9c5dbf6dec36c4
+  metadata.gz: 58499fb20b57b91998a538bbd6a4e178d8d2ac198ba85f224a11fa0812be3b4f36e0be04d6cd80cda9bb02caee1ca878427f08807ebe8f66311f43570a7a958b
+  data.tar.gz: 0b7a32895d0a851872b4fa3aff690621cc1b7ffcafb69208181e091419233687ac27c55263d8d95e83c9ccd9fef7f51175a51062abbafa6c40650163d5d5f742

data/lib/middleman-core/builder.rb

@@ -73,12 +73,14 @@ module Middleman
 
       ::Middleman::Profiling.report('build')
 
-      ::Middleman::Util.instrument 'builder.clean' do
-        clean! if @cleaning
-      end
+      unless @has_error
+        ::Middleman::Util.instrument 'builder.clean' do
+          clean! if @cleaning
+        end
 
-      ::Middleman::Util.instrument 'builder.after' do
-        @app.execute_callbacks(:after_build, [self])
+        ::Middleman::Util.instrument 'builder.after' do
+          @app.execute_callbacks(:after_build, [self])
+        end
       end
 
       !@has_error
@@ -183,7 +185,7 @@ module Middleman
       file.binmode
       file.write(contents)
       file.close
-      File.chmod(0644, file)
+      File.chmod(0o644, file)
       file
     end
 

data/lib/middleman-core/contracts.rb

@@ -28,8 +28,7 @@ else
     end
 
     # rubocop:disable MethodName
-    def Contract(*)
-    end
+    def Contract(*); end
 
     class Callable
       def self.[](*)

data/lib/middleman-core/core_extensions/collections/lazy_step.rb

@@ -24,13 +24,15 @@ module Middleman
 
           original_block = @block
 
-          b = if ctx
-            ::Proc.new do |*args|
-              ctx.instance_exec(*args, &original_block)
+          if original_block
+            b = if ctx
+              ::Proc.new do |*args|
+                ctx.instance_exec(*args, &original_block)
+              end
+            else
+              original_block
             end
-          else
-            original_block
-          end if original_block
+          end
 
           data.send(@name, *@args.deep_dup, &b)
         end

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

@@ -29,10 +29,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     # don't completely reload middleman, I18n.load_path can get
     # polluted with paths from other test app directories that don't
     # exist anymore.
-    app.after_configuration_eval do
-      ::I18n.load_path.delete_if { |path| path =~ %r{tmp/aruba} }
-      ::I18n.reload!
-    end if ENV['TEST']
+    if ENV['TEST']
+      app.after_configuration_eval do
+        ::I18n.load_path.delete_if { |path| path =~ %r{tmp/aruba} }
+        ::I18n.reload!
+      end
+    end
   end
 
   def after_configuration

data/lib/middleman-core/profiling.rb

@@ -20,11 +20,9 @@ module Middleman
 
     # A profiler that does nothing. The default.
     class NullProfiler
-      def start
-      end
+      def start; end
 
-      def report(_)
-      end
+      def report(_); end
     end
 
     # A profiler that uses ruby-prof

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

@@ -26,8 +26,7 @@ module Middleman
         @context = @options[:context] if @options.key?(:context)
       end
 
-      def prepare
-      end
+      def prepare; end
 
       def evaluate(scope, locals, &block)
         options = {}.merge!(@options).merge!(filename: eval_file, line: line, context: @context || scope)

data/lib/middleman-core/sitemap/extensions/ignores.rb

@@ -47,7 +47,7 @@ module Middleman
             end
           end
 
-          def ignored?(match_path)
+          def ignored?(_match_path)
             raise NotImplementedError
           end
         end
@@ -79,7 +79,6 @@ module Middleman
             block.call(match_path)
           end
         end
-
       end
     end
   end

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

@@ -85,7 +85,7 @@ module Middleman
         file_descriptor && file_descriptor[:full_path].to_s
       end
 
-      Contract Or[Symbol, String, Fixnum]
+      Contract Or[Symbol, String, Integer]
       def page_id
         metadata[:page][:id] || make_implicit_page_id(destination_path)
       end
@@ -222,10 +222,10 @@ module Middleman
             return prok.call(path)
           end
 
-          basename = if ext == ".html"
-                       File.basename(path, ext)
-                     else
-                       File.basename(path)
+          basename = if ext == '.html'
+            File.basename(path, ext)
+          else
+            File.basename(path)
                      end
 
           # Remove leading dot or slash if present

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

@@ -167,7 +167,7 @@ module Middleman
       return if @disable_watcher || @listener || @waiting_for_existence
 
       config = {
-        force_polling: @force_polling,
+        force_polling: @force_polling
       }
 
       config[:wait_for_delay] = @wait_for_delay.try(:to_f) || 0.5
@@ -284,11 +284,13 @@ module Middleman
                         logger.debug "== Deletion (#{f[:types].inspect}): #{f[:relative_path]}"
                       end
 
-      execute_callbacks(:on_change, [
-                          valid_updates,
-                          valid_removes,
-                          self
-                        ]) unless valid_updates.empty? && valid_removes.empty?
+      unless valid_updates.empty? && valid_removes.empty?
+        execute_callbacks(:on_change, [
+                            valid_updates,
+                            valid_removes,
+                            self
+                          ])
+      end
 
       [valid_updates, valid_removes]
     end

data/lib/middleman-core/template_context.rb

@@ -138,14 +138,18 @@ module Middleman
         relative_dir_no_underscore = current_dir + Pathname(non_root_no_underscore)
       end
 
-      lookup_stack.push [relative_dir.to_s,
-                         { preferred_engine: resource.file_descriptor[:relative_path]
-                           .extname[1..-1].to_sym }] if relative_dir
+      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 }]
-      lookup_stack.push [relative_dir_no_underscore.to_s,
-                         { try_static: try_static }] if relative_dir_no_underscore
+      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 }]
 

data/lib/middleman-core/util.rb

@@ -17,7 +17,7 @@ module Middleman
 
     # Facade for ActiveSupport/Notification
     def instrument(name, payload={}, &block)
-      suffixed_name = (name =~ /\.middleman$/) ? name.dup : "#{name}.middleman"
+      suffixed_name = name =~ /\.middleman$/ ? name.dup : "#{name}.middleman"
       ::ActiveSupport::Notifications.instrument(suffixed_name, payload, &block)
     end
   end

data/lib/middleman-core/util/binary.rb

@@ -30,7 +30,7 @@ module Middleman
         elsif ::Tilt.registered?(ext.sub('.', ''))
           false
         else
-          dot_ext = (ext.to_s[0] == '.') ? ext.dup : ".#{ext}"
+          dot_ext = ext.to_s[0] == '.' ? ext.dup : ".#{ext}"
 
           if mime = ::Rack::Mime.mime_type(dot_ext, nil)
             !nonbinary_mime?(mime)

data/lib/middleman-core/util/paths.rb

@@ -32,9 +32,9 @@ module Middleman
     # @return [String]
     Contract String => String
     def normalize_path(path)
-     # The tr call works around a bug in Ruby's Unicode handling
+      # The tr call works around a bug in Ruby's Unicode handling
       ::URI.decode(path).sub(%r{^/}, '').tr('', '')
-     end
+    end
     memoize :normalize_path
 
     # This is a separate method from normalize_path in case we

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.14'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.2.0'.freeze unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.1.14
+  version: 4.2.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler