middleman-core 3.3.2 → 3.3.3

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

@@ -17,30 +17,27 @@ end
 
 module Middleman
   module Renderers
-
     # Slim renderer
     module Slim
-
       # Setup extension
       class << self
-
         # Once registered
         def registered(app)
           app.before_configuration do
-            template_extensions :slim => :html
+            template_extensions slim: :html
           end
 
           # Setup Slim options to work with partials
           ::Slim::Engine.set_default_options(
-            :buffer    => '@_out_buf',
-            :use_html_safe => true,
-            :generator => ::Temple::Generators::RailsOutputBuffer,
-            :disable_escape => true
+            buffer: '@_out_buf',
+            use_html_safe: true,
+            generator: ::Temple::Generators::RailsOutputBuffer,
+            disable_escape: true
           )
 
           app.after_configuration do
             context_hack = {
-              :context => self
+              context: self
             }
 
             ::Slim::Embedded::SassEngine.disable_option_validator!
@@ -50,7 +47,7 @@ module Middleman
           end
         end
 
-        alias :included :registered
+        alias_method :included, :registered
       end
     end
   end

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

@@ -3,26 +3,22 @@ require 'stylus/tilt'
 
 module Middleman
   module Renderers
-
     # Sass renderer
     module Stylus
-
       # Setup extension
       class << self
-
         # Once registered
         def registered(app)
           # Default less options
           app.set :styl, {}
 
           app.before_configuration do
-            template_extensions :styl => :css
+            template_extensions styl: :css
           end
         end
 
-        alias :included :registered
+        alias_method :included, :registered
       end
-
     end
   end
 end

data/lib/middleman-core/sitemap.rb

@@ -9,15 +9,11 @@ require 'middleman-core/sitemap/extensions/ignores'
 
 # Core Sitemap Extensions
 module Middleman
-
   module Sitemap
-
     # Setup Extension
     class << self
-
       # Once registered
       def registered(app)
-
         app.register Middleman::Sitemap::Extensions::RequestEndpoints
         app.register Middleman::Sitemap::Extensions::Proxies
         app.register Middleman::Sitemap::Extensions::Ignores
@@ -29,18 +25,18 @@ module Middleman
         # Setup callbacks which can exclude paths from the sitemap
         app.config.define_setting :ignored_sitemap_matchers, {
           # dotfiles and folders in the root
-          :root_dotfiles => proc { |file| file.start_with?('.') },
+          root_dotfiles: proc { |file| file.start_with?('.') },
 
           # Files starting with an dot, but not .htaccess
-          :source_dotfiles => proc { |file|
+          source_dotfiles: proc { |file|
             file =~ %r{/\.} && file !~ %r{/\.(htaccess|htpasswd|nojekyll)}
           },
 
           # Files starting with an underscore, but not a double-underscore
-          :partials => proc { |file| file =~ %r{/_[^_]} },
+          partials: proc { |file| file =~ %r{/_[^_]} },
 
-          :layout => proc { |file, app|
-            file.start_with?(File.join(app.config[:source], 'layout.')) || file.start_with?(File.join(app.config[:source], 'layouts/'))
+          layout: proc { |file, sitemap_app|
+            file.start_with?(File.join(sitemap_app.config[:source], 'layout.')) || file.start_with?(File.join(sitemap_app.config[:source], 'layouts/'))
           }
         }, 'Callbacks that can exclude paths from the sitemap'
 
@@ -52,13 +48,11 @@ module Middleman
           sitemap
         end
       end
-      alias :included :registered
-
+      alias_method :included, :registered
     end
 
     # Sitemap instance methods
     module InstanceMethods
-
       # Get the sitemap class instance
       # @return [Middleman::Sitemap::Store]
       def sitemap
@@ -77,7 +71,6 @@ module Middleman
         return nil unless current_path
         sitemap.find_resource_by_destination_path(current_path)
       end
-
     end
   end
 end

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

@@ -1,14 +1,9 @@
 module Middleman
-
   module Sitemap
-
     module Extensions
-
       module Ignores
-
         # Setup extension
         class << self
-
           # Once registered
           def registered(app)
             # Include methods
@@ -17,12 +12,11 @@ module Middleman
             ::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
           end
 
-          alias :included :registered
+          alias_method :included, :registered
         end
 
         # Helpers methods for Resources
         module ResourceInstanceMethods
-
           # Whether the Resource is ignored
           # @return [Boolean]
           def ignored?
@@ -61,15 +55,15 @@ module Middleman
           # @return [void]
           def ignore(path=nil, &block)
             if path.is_a? Regexp
-              @ignored_callbacks << Proc.new {|p| p =~ path }
+              @ignored_callbacks << proc { |p| p =~ path }
             elsif path.is_a? String
               path_clean = ::Middleman::Util.normalize_path(path)
               if path_clean.include?('*') # It's a glob
-                @ignored_callbacks << Proc.new {|p| File.fnmatch(path_clean, p) }
+                @ignored_callbacks << proc { |p| File.fnmatch(path_clean, p) }
               else
                 # Add a specific-path ignore unless that path is already covered
                 return if ignored?(path_clean)
-                @ignored_callbacks << Proc.new {|p| p == path_clean }
+                @ignored_callbacks << proc { |p| p == path_clean }
               end
             elsif block_given?
               @ignored_callbacks << block

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

@@ -1,13 +1,9 @@
 require 'set'
 
 module Middleman
-
   module Sitemap
-
     module Extensions
-
       class OnDisk
-
         attr_accessor :sitemap
         attr_accessor :waiting_for_ready
 
@@ -39,13 +35,13 @@ module Middleman
         # Update or add an on-disk file path
         # @param [String] file
         # @return [Boolean]
-        def touch_file(file, rebuild=true)
+        def touch_file(file)
           return false if File.directory?(file)
 
           path = @sitemap.file_to_path(file)
           return false unless path
 
-          ignored = @app.config[:ignored_sitemap_matchers].any? do |name, callback|
+          ignored = @app.config[:ignored_sitemap_matchers].any? do |_, callback|
             if callback.arity == 1
               callback.call(file)
             else
@@ -71,7 +67,7 @@ module Middleman
         # Remove a file from the store
         # @param [String] file
         # @return [void]
-        def remove_file(file, rebuild=true)
+        def remove_file(file)
           if @file_paths_on_disk.delete?(file)
             @sitemap.rebuild_resource_list!(:removed_file)
             unless waiting_for_ready || @app.build?

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

@@ -1,14 +1,9 @@
 module Middleman
-
   module Sitemap
-
     module Extensions
-
       module Proxies
-
         # Setup extension
         class << self
-
           # Once registered
           def registered(app)
             ::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
@@ -17,14 +12,15 @@ module Middleman
             app.send :include, InstanceMethods
           end
 
-          alias :included :registered
+          alias_method :included, :registered
         end
 
         module ResourceInstanceMethods
           # Whether this page is a proxy
+          # rubocop:disable TrivialAccessors
           # @return [Boolean]
           def proxy?
-            !!@proxied_to
+            @proxied_to
           end
 
           # Set this page to proxy to a target path
@@ -38,9 +34,7 @@ module Middleman
 
           # The path of the page this page is proxied to, or nil if it's not proxied.
           # @return [String]
-          def proxied_to
-            @proxied_to
-          end
+          attr_reader :proxied_to
 
           # The resource for the page this page is proxied to. Throws an exception
           # if there is no resource.
@@ -59,6 +53,7 @@ module Middleman
             proxy_resource
           end
 
+          # rubocop:disable AccessorMethodName
           def get_source_file
             if proxy?
               proxied_to_resource.source_file
@@ -104,14 +99,14 @@ module Middleman
           #               :locals, :ignore to hide the proxy target, :layout, and :directory_indexes.
           # @return [void]
           def proxy(path, target, opts={}, &block)
-            metadata = { :options => {}, :locals => {}, :blocks => [] }
+            metadata = { options: {}, locals: {}, blocks: [] }
             metadata[:blocks] << block if block_given?
             metadata[:locals] = opts.delete(:locals) || {}
 
             @app.ignore(target) if opts.delete(:ignore)
             metadata[:options] = opts
 
-            @proxy_configs << ProxyConfiguration.new(:path => path, :target => target, :metadata => metadata)
+            @proxy_configs << ProxyConfiguration.new(path: path, target: target, metadata: metadata)
 
             @app.sitemap.rebuild_resource_list!(:added_proxy)
           end

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

@@ -1,21 +1,16 @@
 module Middleman
-
   module Sitemap
-
     module Extensions
-
       module Redirects
-
         # Setup extension
         class << self
-
           # Once registered
           def registered(app)
             # Include methods
             app.send :include, InstanceMethods
           end
 
-          alias :included :registered
+          alias_method :included, :registered
         end
 
         module InstanceMethods
@@ -40,9 +35,7 @@ module Middleman
           # @param [String] path
           # @param [Hash] opts The :to value gives a target path
           def create_redirect(path, opts={}, &block)
-            if block_given?
-              opts[:template] = block
-            end
+            opts[:template] = block if block_given?
 
             @redirects[path] = opts
 
@@ -77,11 +70,11 @@ module Middleman
             true
           end
 
-          def render(*args, &block)
-            url = ::Middleman::Util.url_for(store.app, @request_path, {
-              :relative => false,
-              :find_resource => true
-            })
+          def render(*)
+            url = ::Middleman::Util.url_for(store.app, @request_path,
+                                            relative: false,
+                                            find_resource: true
+            )
 
             if output
               output.call(path, url)
@@ -119,7 +112,6 @@ module Middleman
           def metadata
             @local_metadata.dup
           end
-
         end
       end
     end

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

@@ -1,21 +1,16 @@
 module Middleman
-
   module Sitemap
-
     module Extensions
-
       module RequestEndpoints
-
         # Setup extension
         class << self
-
           # Once registered
           def registered(app)
             # Include methods
             app.send :include, InstanceMethods
           end
 
-          alias :included :registered
+          alias_method :included, :registered
         end
 
         module InstanceMethods
@@ -42,13 +37,13 @@ module Middleman
           # differs from the output path
           def create_endpoint(path, opts={}, &block)
             endpoint = {
-              :request_path => path
+              request_path: path
             }
 
             if block_given?
               endpoint[:output] = block
             else
-              endpoint[:request_path] = opts[:path] if opts.has_key?(:path)
+              endpoint[:request_path] = opts[:path] if opts.key?(:path)
             end
 
             @endpoints[path] = endpoint
@@ -65,7 +60,7 @@ module Middleman
                 path,
                 config[:request_path]
               )
-              r.output = config[:output] if config.has_key?(:output)
+              r.output = config[:output] if config.key?(:output)
               r
             end
           end
@@ -84,13 +79,11 @@ module Middleman
             true
           end
 
-          def render(*args, &block)
-            return self.output.call if self.output
+          def render(*)
+            return output.call if output
           end
 
-          def request_path
-            @request_path
-          end
+          attr_reader :request_path
 
           def binary?
             false
@@ -107,7 +100,6 @@ module Middleman
           def metadata
             @local_metadata.dup
           end
-
         end
       end
     end

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

@@ -1,9 +1,6 @@
 module Middleman
-
   module Sitemap
-
     module Extensions
-
       module Traversal
         # This resource's parent resource
         # @return [Middleman::Sitemap::Resource, nil]
@@ -28,14 +25,14 @@ module Middleman
 
           if eponymous_directory?
             base_path = eponymous_directory_path
-            prefix    = %r|^#{base_path.sub("/", "\\/")}|
+            prefix    = %r{^#{base_path.sub("/", "\\/")}}
           else
             base_path = path.sub("#{app.index_file}", '')
-            prefix    = %r|^#{base_path.sub("/", "\\/")}|
+            prefix    = %r{^#{base_path.sub("/", "\\/")}}
           end
 
           store.resources.select do |sub_resource|
-            if sub_resource.path == self.path || sub_resource.path !~ prefix
+            if sub_resource.path == path || sub_resource.path !~ prefix
               false
             else
               inner_path = sub_resource.path.sub(prefix, '')
@@ -72,7 +69,7 @@ module Middleman
             return true
           end
           full_path = File.join(app.source_dir, eponymous_directory_path)
-          !!(File.exists?(full_path) && File.directory?(full_path))
+          File.exist?(full_path) && File.directory?(full_path)
         end
 
         # The path for this resource if it were a directory, and not a file