middleman-core 3.3.2 → 3.3.3

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

@@ -2,7 +2,6 @@ require 'active_support/core_ext/object/inclusion'
 
 module Middleman
   module Sitemap
-
     # Code adapted from https://github.com/ralph/document_mapper/
     module Queryable
       OPERATOR_MAPPING = {
@@ -21,11 +20,11 @@ module Middleman
       OperatorNotSupportedError = Class.new StandardError
 
       module API
-        def select(options = {})
+        def select(options={})
           documents = resources.select { |r| !r.raw_data.empty? }
           options[:where].each do |selector, selector_value|
             documents = documents.select do |document|
-              next unless document.raw_data.has_key? selector.attribute
+              next unless document.raw_data.key? selector.attribute
               document_value = document.raw_data[selector.attribute]
               operator = OPERATOR_MAPPING[selector.operator]
               document_value.send operator, selector_value
@@ -74,51 +73,47 @@ module Middleman
         end
 
         def where(constraints_hash)
-          selector_hash = constraints_hash.reject { |key, value| !key.is_a? Selector }
-          symbol_hash = constraints_hash.reject { |key, value| key.is_a? Selector }
+          selector_hash = constraints_hash.reject { |key, _| !key.is_a? Selector }
+          symbol_hash = constraints_hash.reject { |key, _| key.is_a? Selector }
           symbol_hash.each do |attribute, value|
-            selector = Selector.new(:attribute => attribute, :operator => 'equal')
-            selector_hash.update({ selector => value })
+            selector = Selector.new(attribute: attribute, operator: 'equal')
+            selector_hash.update(selector => value)
           end
-          Query.new @model, opts(:where => @where.merge(selector_hash))
+          Query.new @model, opts(where: @where.merge(selector_hash))
         end
 
-        def opts new_opts
-          { :where => {}.merge(@where),
-            :order_by => @order_by,
-            :offset => @offset,
-            :limit => @limit
+        def opts(new_opts)
+          { where: {}.merge(@where),
+            order_by: @order_by,
+            offset: @offset,
+            limit: @limit
           }.merge(new_opts)
         end
 
         def order_by(field)
-          Query.new @model, opts(:order_by => field.is_a?(Symbol) ? {field => :asc} : field)
+          Query.new @model, opts(order_by: field.is_a?(Symbol) ? { field => :asc } : field)
         end
 
         def offset(number)
-          Query.new @model, opts(:offset => number)
+          Query.new @model, opts(offset: number)
         end
 
         def limit(number)
-          Query.new @model, opts(:limit => number)
+          Query.new @model, opts(limit: number)
         end
 
         def first
-          self.all.first
+          all.first
         end
 
         def last
-          self.all.last
+          all.last
         end
 
         def all
-          result = @model.select(:where => @where, :order_by => @order_by)
-          if @offset.present?
-            result = result.last([result.size - @offset, 0].max)
-          end
-          if @limit.present?
-            result = result.first(@limit)
-          end
+          result = @model.select(where: @where, order_by: @order_by)
+          result = result.last([result.size - @offset, 0].max) if @offset.present?
+          result = result.first(@limit) if @limit.present?
           result
         end
       end
@@ -126,7 +121,7 @@ module Middleman
       class Selector
         attr_reader :attribute, :operator
 
-        def initialize(opts = {})
+        def initialize(opts={})
           unless VALID_OPERATORS.include? opts[:operator]
             raise OperatorNotSupportedError
           end
@@ -149,7 +144,7 @@ class Symbol
 
   unless method_defined?(:"<=>")
     def <=>(other)
-      self.to_s <=> other.to_s
+      to_s <=> other.to_s
     end
   end
 end

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

@@ -2,10 +2,8 @@ require 'middleman-core/sitemap/extensions/traversal'
 require 'middleman-core/sitemap/extensions/content_type'
 
 module Middleman
-
   # Sitemap namespace
   module Sitemap
-
     # Sitemap Resource class
     class Resource
       include Middleman::Sitemap::Extensions::Traversal
@@ -13,7 +11,7 @@ module Middleman
 
       # @return [Middleman::Application]
       attr_reader :app
-      delegate :logger, :instrument, :to => :app
+      delegate :logger, :instrument, to: :app
 
       # @return [Middleman::Sitemap::Store]
       attr_reader :store
@@ -46,7 +44,7 @@ module Middleman
         @source_file = source_file
         @destination_path = @path
 
-        @local_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
+        @local_metadata = { options: {}, locals: {}, page: {}, blocks: [] }
       end
 
       # Whether this resource has a template file
@@ -62,15 +60,11 @@ module Middleman
         result = store.metadata_for_path(path).dup
 
         file_meta = store.metadata_for_file(source_file).dup
-        if file_meta.has_key?(:blocks)
-          result[:blocks] += file_meta.delete(:blocks)
-        end
+        result[:blocks] += file_meta.delete(:blocks) if file_meta.key?(:blocks)
         result.deep_merge!(file_meta)
 
         local_meta = @local_metadata.dup
-        if local_meta.has_key?(:blocks)
-          result[:blocks] += local_meta.delete(:blocks)
-        end
+        result[:blocks] += local_meta.delete(:blocks) if local_meta.key?(:blocks)
         result.deep_merge!(local_meta)
 
         result[:blocks] = result[:blocks].flatten.compact
@@ -81,11 +75,9 @@ module Middleman
       # @param [Hash] metadata A metadata block like provides_metadata_for_path takes
       def add_metadata(metadata={}, &block)
         metadata = metadata.dup
-        if metadata.has_key?(:blocks)
-          @local_metadata[:blocks] += metadata.delete(:blocks)
-        end
+        @local_metadata[:blocks] += metadata.delete(:blocks) if metadata.key?(:blocks)
         @local_metadata.deep_merge!(metadata)
-        @local_metadata[:blocks] += [ block ] if block_given?
+        @local_metadata[:blocks] += [block] if block_given?
       end
 
       # The output/preview URL for this resource
@@ -99,19 +91,17 @@ module Middleman
       end
 
       def request_path
-        self.destination_path
+        destination_path
       end
 
       # Render this resource
       # @return [String]
       def render(opts={}, locs={}, &block)
-        if !template?
-          return app.template_data_for_file(source_file)
-        end
+        return app.template_data_for_file(source_file) unless template?
 
         relative_source = Pathname(source_file).relative_path_from(Pathname(app.root))
 
-        instrument 'render.resource', :path => relative_source, :destination_path => destination_path  do
+        instrument 'render.resource', path: relative_source, destination_path: destination_path  do
           md   = metadata.dup
           opts = md[:options].deep_merge(opts)
 
@@ -126,18 +116,16 @@ module Middleman
           locs = md[:locals].deep_merge(locs)
 
           # Forward remaining data to helpers
-          if md.has_key?(:page)
-            app.data.store('page', md[:page])
-          end
+          app.data.store('page', md[:page]) if md.key?(:page)
 
           blocks = Array(md[:blocks]).dup
           blocks << block if block_given?
 
-          app.current_path ||= self.destination_path
+          app.current_path ||= destination_path
 
           # Certain output file types don't use layouts
-          if !opts.has_key?(:layout)
-            opts[:layout] = false if %w(.js .json .css .txt).include?(self.ext)
+          unless opts.key?(:layout)
+            opts[:layout] = false if %w(.js .json .css .txt).include?(ext)
           end
 
           app.render_template(source_file, locs, opts, blocks)

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

@@ -4,10 +4,8 @@ require 'monitor'
 require 'middleman-core/sitemap/queryable'
 
 module Middleman
-
   # Sitemap namespace
   module Sitemap
-
     # The Store class
     #
     # The Store manages a collection of Resource objects, which represent
@@ -15,7 +13,6 @@ module Middleman
     # which is the path relative to the source directory, minus any template
     # extensions. All "path" parameters used in this class are source paths.
     class Store
-
       # @return [Middleman::Application]
       attr_accessor :app
 
@@ -52,12 +49,13 @@ module Middleman
       # @param [Symbol] name Name of the manipulator for debugging
       # @param [Class, Module] inst Abstract namespace which can update the resource list
       # @return [void]
-      def register_resource_list_manipulator(name, inst, unused=true)
+      def register_resource_list_manipulator(name, inst, *)
         @resource_list_manipulators << [name, inst]
         rebuild_resource_list!(:registered_new)
       end
 
       # Rebuild the list of resources from scratch, using registed manipulators
+      # rubocop:disable UnusedMethodArgument
       # @return [void]
       def rebuild_resource_list!(reason=nil)
         @lock.synchronize do
@@ -120,14 +118,14 @@ module Middleman
       # @param [String] source_file
       # @return [Hash]
       def metadata_for_file(source_file)
-        blank_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
+        blank_metadata = { options: {}, locals: {}, page: {}, blocks: [] }
 
-        provides_metadata.inject(blank_metadata) do |result, (callback, matcher)|
+        provides_metadata.reduce(blank_metadata) do |result, (callback, matcher)|
           next result if matcher && !source_file.match(matcher)
 
           metadata = callback.call(source_file).dup
 
-          if metadata.has_key?(:blocks)
+          if metadata.key?(:blocks)
             result[:blocks] << metadata[:blocks]
             metadata.delete(:blocks)
           end
@@ -154,9 +152,9 @@ module Middleman
       def metadata_for_path(request_path)
         return @_cached_metadata[request_path] if @_cached_metadata[request_path]
 
-        blank_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
+        blank_metadata = { options: {}, locals: {}, page: {}, blocks: [] }
 
-        @_cached_metadata[request_path] = provides_metadata_for_path.inject(blank_metadata) do |result, (callback, matcher)|
+        @_cached_metadata[request_path] = provides_metadata_for_path.reduce(blank_metadata) do |result, (callback, matcher)|
           case matcher
           when Regexp
             next result unless request_path =~ matcher
@@ -213,7 +211,7 @@ module Middleman
 
           @app.logger.debug '== Rebuilding resource list'
 
-          @resources = @resource_list_manipulators.inject([]) do |result, (_, inst)|
+          @resources = @resource_list_manipulators.reduce([]) do |result, (_, inst)|
             newres = inst.manipulate_resource_list(result)
 
             # Reset lookup cache
@@ -255,9 +253,7 @@ module Middleman
         if @app.respond_to? :langs
           path_bits = path.split('.')
           lang = path_bits.last
-          if @app.langs.include?(lang.to_sym)
-            return path_bits[0..-2].join('.')
-          end
+          return path_bits[0..-2].join('.') if @app.langs.include?(lang.to_sym)
         end
 
         path
@@ -269,9 +265,9 @@ module Middleman
       def find_extension(path, file)
         input_ext = File.extname(file)
 
-        if !input_ext.empty?
+        unless input_ext.empty?
           input_ext = input_ext.split('.').last.to_sym
-          if @app.template_extensions.has_key?(input_ext)
+          if @app.template_extensions.key?(input_ext)
             path << ".#{@app.template_extensions[input_ext]}"
           end
         end

data/lib/middleman-core/templates.rb

@@ -4,10 +4,8 @@ require 'thor/group'
 
 # Templates namespace
 module Middleman::Templates
-
   # Static methods
   class << self
-
     # Get list of registered templates and add new ones
     #
     #     Middleman::Templates.register(:ext_name, klass)
@@ -22,7 +20,7 @@ module Middleman::Templates
     end
 
     # Middleman::Templates.register(name, klass)
-    alias :registered :register
+    alias_method :registered, :register
   end
 
   # Base Template class. Handles basic options and paths.
@@ -41,13 +39,13 @@ module Middleman::Templates
     end
 
     # Required path for the new project to be generated
-    argument :location, :type => :string
+    argument :location, type: :string
 
     # Name of the template being used to generate the project.
-    class_option :template, :default => 'default'
+    class_option :template, default: 'default'
 
     # Output a config.ru file for Rack if --rack is passed
-    class_option :rack, :type => :boolean, :default => false
+    class_option :rack, type: :boolean, default: false
 
     # Write a Rack config.ru file for project
     # @return [void]
@@ -56,8 +54,8 @@ module Middleman::Templates
       template 'shared/config.ru', File.join(location, 'config.ru')
     end
 
-    class_option :'skip-bundle', :type => :boolean, :default => false
-    class_option :'skip-gemfile', :type => :boolean, :default => false
+    class_option :'skip-bundle', type: :boolean, default: false
+    class_option :'skip-gemfile', type: :boolean, default: false
 
     # Write a Bundler Gemfile file for project
     # @return [void]
@@ -72,7 +70,7 @@ module Middleman::Templates
     end
 
     # Output a .gitignore file
-    class_option :'skip-git', :type => :boolean, :default => false
+    class_option :'skip-git', type: :boolean, default: false
 
     # Write a .gitignore file for project
     # @return [void]
@@ -96,9 +94,8 @@ require 'middleman-core/templates/mobile'
 require 'middleman-more/templates/smacss'
 
 # Local templates
-if ENV['HOME'] # Sometimes HOME doesn't exist, in which case there's no point to local templates
-  require 'middleman-core/templates/local'
-end
+# Sometimes HOME doesn't exist, in which case there's no point to local templates
+require 'middleman-core/templates/local' if ENV['HOME']
 
 # Barebones template
 require 'middleman-core/templates/empty'

data/lib/middleman-core/templates/default.rb

@@ -1,15 +1,14 @@
 # Default Middleman template
 class Middleman::Templates::Default < Middleman::Templates::Base
-
   class_option 'css_dir',
-    :default => 'stylesheets',
-    :desc    => 'The path to the css files'
+               default: 'stylesheets',
+               desc: 'The path to the css files'
   class_option 'js_dir',
-    :default => 'javascripts',
-    :desc    => 'The path to the javascript files'
+               default: 'javascripts',
+               desc: 'The path to the javascript files'
   class_option 'images_dir',
-    :default => 'images',
-    :desc    => 'The path to the image files'
+               default: 'images',
+               desc: 'The path to the image files'
 
   # Template files are relative to this file
   # @return [String]

data/lib/middleman-core/templates/empty.rb

@@ -1,6 +1,5 @@
 # A barebones template with nothing much in it
 class Middleman::Templates::Empty < Middleman::Templates::Base
-
   # Template files are relative to this file
   # @return [String]
   def self.source_root

data/lib/middleman-core/templates/extension/Gemfile

@@ -16,4 +16,4 @@ group :test do
   gem 'fivemat'
   gem 'aruba'
   gem 'rspec'
-end
+end

data/lib/middleman-core/templates/extension/Rakefile

@@ -9,6 +9,6 @@ end
 
 require 'rake/clean'
 
-task :test => ['cucumber']
+task test: ['cucumber']
 
-task :default => :test
+task default: :test

data/lib/middleman-core/templates/extension/lib/lib.rb

@@ -28,7 +28,6 @@ class MyExtension < ::Middleman::Extension
   #   def a_helper
   #   end
   # end
-
 end
 
 # Register extensions which can be activated

data/lib/middleman-core/templates/html5.rb

@@ -1,15 +1,14 @@
 # HTML5 Boilerplate template
 class Middleman::Templates::Html5 < Middleman::Templates::Base
-
   class_option 'css_dir',
-    :default => 'css',
-    :desc    => 'The path to the css files'
+               default: 'css',
+               desc: 'The path to the css files'
   class_option 'js_dir',
-    :default => 'js',
-    :desc    => 'The path to the javascript files'
+               default: 'js',
+               desc: 'The path to the javascript files'
   class_option 'images_dir',
-    :default => 'img',
-    :desc    => 'The path to the image files'
+               default: 'img',
+               desc: 'The path to the image files'
 
   # Templates are relative to this file
   # @return [String]