middleman-core 3.2.1 → 3.2.2

data/lib/middleman-core/cli/bundler.rb

@@ -8,7 +8,7 @@ module Middleman::Cli
 
     namespace :bundle
 
-    desc "bundle", "Setup initial bundle", :hide => true
+    desc 'bundle', 'Setup initial bundle', :hide => true
 
     # The setup task
     def bundle
@@ -23,11 +23,11 @@ module Middleman::Cli
 
     namespace :upgrade
 
-    desc "upgrade", "Upgrade installed bundle"
+    desc 'upgrade', 'Upgrade installed bundle'
 
     # The upgrade task
     def upgrade
-      inside(ENV["MM_ROOT"]) do
+      inside(ENV['MM_ROOT']) do
         run('bundle update')#, :capture => true)
       end
     end
@@ -35,6 +35,6 @@ module Middleman::Cli
 
   # Map "u" to "upgrade"
   Base.map({
-    "u" => "upgrade"
+    'u' => 'upgrade'
   })
 end

data/lib/middleman-core/cli/console.rb

@@ -8,19 +8,19 @@ module Middleman::Cli
     check_unknown_options!
 
     namespace :console
-    
-    desc "console [options]", "Start an interactive console in the context of your Middleman application"
+
+    desc 'console [options]', 'Start an interactive console in the context of your Middleman application'
     method_option :environment,
-      :aliases => "-e",
+      :aliases => '-e',
       :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
-      :desc    => "The environment Middleman will run under"
+      :desc    => 'The environment Middleman will run under'
     method_option :verbose,
       :type    => :boolean,
       :default => false,
       :desc    => 'Print debug messages'
     def console
-      require "middleman-core"
-      require "irb"
+      require 'middleman-core'
+      require 'irb'
 
       opts = {
         :environment => options['environment'],

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

@@ -11,26 +11,26 @@ module Middleman::Cli
 
     # Required path for the new project to be generated
     argument :name, :type => :string
-    
+
     # Template files are relative to this file
     # @return [String]
     def self.source_root
-      File.join(File.dirname(__FILE__), "..", "templates", "extension")
+      File.join(File.dirname(__FILE__), '..', 'templates', 'extension')
     end
-    
-    desc "extension [options]", "Create Middleman extension scaffold NAME"
+
+    desc 'extension [options]', 'Create Middleman extension scaffold NAME'
 
     # The extension task
     # @param [String] name
     def extension
       generate_gitignore!
-      template "Rakefile", File.join(name, "Rakefile")
-      template "gemspec", File.join(name, "#{name}.gemspec")
-      template "Gemfile", File.join(name, "Gemfile")
-      template "lib/middleman_extension.rb", File.join(name, "lib", "middleman_extension.rb")
-      template "lib/lib.rb", File.join(name, "lib", "#{name}.rb")
-      template "features/support/env.rb", File.join(name, "features", "support", "env.rb")
-      empty_directory File.join(name, "fixtures")
+      template 'Rakefile', File.join(name, 'Rakefile')
+      template 'gemspec', File.join(name, "#{name}.gemspec")
+      template 'Gemfile', File.join(name, 'Gemfile')
+      template 'lib/middleman_extension.rb', File.join(name, 'lib', 'middleman_extension.rb')
+      template 'lib/lib.rb', File.join(name, 'lib', "#{name}.rb")
+      template 'features/support/env.rb', File.join(name, 'features', 'support', 'env.rb')
+      empty_directory File.join(name, 'fixtures')
     end
 
     # Output a .gitignore file
@@ -41,7 +41,7 @@ module Middleman::Cli
       # @return [void]
       def generate_gitignore!
         return unless options[:git]
-        copy_file "gitignore", File.join(name, ".gitignore")
+        copy_file 'gitignore', File.join(name, '.gitignore')
       end
     }
 

data/lib/middleman-core/cli/init.rb

@@ -1,4 +1,4 @@
-require "middleman-core/templates"
+require 'middleman-core/templates'
 
 # CLI Module
 module Middleman::Cli
@@ -9,35 +9,35 @@ module Middleman::Cli
 
     namespace :init
 
-    desc "init NAME [options]", "Create new project NAME"
-    available_templates = ::Middleman::Templates.registered.keys.join(", ")
-    method_option "template",
-      :aliases => "-T",
-      :default => "default",
+    desc 'init NAME [options]', 'Create new project NAME'
+    available_templates = ::Middleman::Templates.registered.keys.join(', ')
+    method_option 'template',
+      :aliases => '-T',
+      :default => 'default',
       :desc    => "Use a project template: #{available_templates}"
-    method_option "css_dir",
+    method_option 'css_dir',
       # :default => "stylesheets",
       :desc    => 'The path to the css files'
-    method_option "js_dir",
+    method_option 'js_dir',
       # :default => "javascripts",
       :desc    => 'The path to the javascript files'
-    method_option "images_dir",
+    method_option 'images_dir',
       # :default => "images",
       :desc    => 'The path to the image files'
-    method_option "rack",
+    method_option 'rack',
       :type    => :boolean,
       :default => false,
       :desc    => 'Include a config.ru file'
-    method_option "skip-gemfile",
+    method_option 'skip-gemfile',
       :type    => :boolean,
       :default => false,
       :desc    => "Don't create a Gemfile"
-    method_option "skip-bundle",
+    method_option 'skip-bundle',
       :type    => :boolean,
-      :aliases => "-B",
+      :aliases => '-B',
       :default => false,
       :desc    => "Don't run bundle install"
-    method_option "skip-git",
+    method_option 'skip-git',
       :type    => :boolean,
       :default => false,
       :desc    => 'Skip Git ignores and keeps'
@@ -60,8 +60,8 @@ module Middleman::Cli
 
   # Map "i", "new" and "n" to "init"
   Base.map({
-    "i"   => "init",
-    "new" => "init",
-    "n"   => "init"
+    'i'   => 'init',
+    'new' => 'init',
+    'n'   => 'init'
   })
 end

data/lib/middleman-core/cli/server.rb

@@ -7,20 +7,20 @@ module Middleman::Cli
 
     namespace :server
 
-    desc "server [options]", "Start the preview server"
+    desc 'server [options]', 'Start the preview server'
     method_option :environment,
-      :aliases => "-e",
+      :aliases => '-e',
       :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
-      :desc    => "The environment Middleman will run under"
+      :desc    => 'The environment Middleman will run under'
     method_option :host,
       :type    => :string,
-      :aliases => "-h",
-      :default => "0.0.0.0",
-      :desc    => "Bind to HOST address"
+      :aliases => '-h',
+      :default => '0.0.0.0',
+      :desc    => 'Bind to HOST address'
     method_option :port,
-      :aliases => "-p",
-      :default => "4567",
-      :desc    => "The port Middleman will listen on"
+      :aliases => '-p',
+      :default => '4567',
+      :desc    => 'The port Middleman will listen on'
     method_option :verbose,
       :type    => :boolean,
       :default => false,
@@ -47,35 +47,35 @@ module Middleman::Cli
       :desc    => 'Force file watcher into polling mode'
     method_option :latency,
       :type    => :numeric,
-      :aliases => "-l",
+      :aliases => '-l',
       :default => 0.25,
       :desc    => 'Set file watcher latency, in seconds'
 
     # Start the server
     def server
-      require "middleman-core"
-      require "middleman-core/preview_server"
+      require 'middleman-core'
+      require 'middleman-core/preview_server'
 
-      if !ENV["MM_ROOT"]
-        puts "== Could not find a Middleman project config.rb"
-        puts "== Treating directory as a static site to be served"
-        ENV["MM_ROOT"] = Dir.pwd
-        ENV["MM_SOURCE"] = ""
+      if !ENV['MM_ROOT']
+        puts '== Could not find a Middleman project config.rb'
+        puts '== Treating directory as a static site to be served'
+        ENV['MM_ROOT'] = Dir.pwd
+        ENV['MM_SOURCE'] = ''
       end
 
       params = {
-        :port              => options["port"],
-        :host              => options["host"],
-        :environment       => options["environment"],
-        :debug             => options["verbose"],
-        :instrumenting     => options["instrument"],
-        :disable_watcher   => options["disable_watcher"],
-        :reload_paths      => options["reload_paths"],
-        :force_polling     => options["force_polling"],
-        :latency           => options["latency"]
+        :port              => options['port'],
+        :host              => options['host'],
+        :environment       => options['environment'],
+        :debug             => options['verbose'],
+        :instrumenting     => options['instrument'],
+        :disable_watcher   => options['disable_watcher'],
+        :reload_paths      => options['reload_paths'],
+        :force_polling     => options['force_polling'],
+        :latency           => options['latency']
       }
 
-      puts "== The Middleman is loading"
+      puts '== The Middleman is loading'
       ::Middleman::PreviewServer.start(params)
     end
   end
@@ -85,5 +85,5 @@ module Middleman::Cli
   end
 
   # Map "s" to "server"
-  Base.map({ "s" => "server" })
+  Base.map({ 's' => 'server' })
 end

data/lib/middleman-core/configuration.rb

@@ -1,6 +1,6 @@
 module Middleman
   module Configuration
-    # Access to a global configuration manager for the whole Middleman project, 
+    # Access to a global configuration manager for the whole Middleman project,
     # plus backwards compatibility mechanisms for older Middleman projects.
     module Global
       def self.included(app)
@@ -156,7 +156,7 @@ module Middleman
       def define_setting(key, default=nil, description=nil)
         raise "Setting #{key} doesn't exist" if @finalized
         raise "Setting #{key} already defined" if @settings.has_key?(key)
-        raise "Setting key must be a Symbol" unless key.is_a? Symbol
+        raise 'Setting key must be a Symbol' unless key.is_a? Symbol
 
         @settings[key] = ConfigSetting.new(key, default, description)
       end

data/lib/middleman-core/core_extensions.rb

@@ -1,39 +1,39 @@
 # Rack Request
-require "middleman-core/core_extensions/request"
+require 'middleman-core/core_extensions/request'
 
 # File Change Notifier
-require "middleman-core/core_extensions/file_watcher"
+require 'middleman-core/core_extensions/file_watcher'
 
 # Custom Feature API
-require "middleman-core/core_extensions/extensions"
+require 'middleman-core/core_extensions/extensions'
 
 # Data looks at the data/ folder for YAML files and makes them available
 # to dynamic requests.
-require "middleman-core/core_extensions/data"
+require 'middleman-core/core_extensions/data'
 
 # Parse YAML from templates
-require "middleman-core/core_extensions/front_matter"
+require 'middleman-core/core_extensions/front_matter'
 
 # External helpers looks in the helpers/ folder for helper modules
-require "middleman-core/core_extensions/external_helpers"
+require 'middleman-core/core_extensions/external_helpers'
 
 # Extended version of Padrino's rendering
-require "middleman-core/core_extensions/rendering"
+require 'middleman-core/core_extensions/rendering'
 
 # Pass custom options to views
-require "middleman-core/core_extensions/routing"
+require 'middleman-core/core_extensions/routing'
 
 # Catch and show exceptions at the Rack level
-require "middleman-core/core_extensions/show_exceptions"
+require 'middleman-core/core_extensions/show_exceptions'
 
 # Setup default helpers
-require "middleman-more/core_extensions/default_helpers"
+require 'middleman-more/core_extensions/default_helpers'
 
-require "middleman-more/core_extensions/i18n"
+require 'middleman-more/core_extensions/i18n'
 
 # Compass framework
 begin
-  require "middleman-more/core_extensions/compass"
+  require 'middleman-more/core_extensions/compass'
 rescue LoadError
   $stderr.puts "Compass not installed: #{$!}"
 end
@@ -44,52 +44,52 @@ end
 
 # CacheBuster adds a query string to assets in dynamic templates to
 # avoid browser caches failing to update to your new content.
-require "middleman-more/extensions/cache_buster"
+require 'middleman-more/extensions/cache_buster'
 Middleman::Extensions::CacheBuster.register
 
 # RelativeAssets allow any asset path in dynamic templates to be either
 # relative to the root of the project or use an absolute URL.
-require "middleman-more/extensions/relative_assets"
+require 'middleman-more/extensions/relative_assets'
 Middleman::Extensions::RelativeAssets.register
 
 # AssetHost allows you to setup multiple domains to host your static
 # assets. Calls to asset paths in dynamic templates will then rotate
 # through each of the asset servers to better spread the load.
-require "middleman-more/extensions/asset_host"
+require 'middleman-more/extensions/asset_host'
 Middleman::Extensions::AssetHost.register
 
 # MinifyCss compresses CSS
-require "middleman-more/extensions/minify_css"
+require 'middleman-more/extensions/minify_css'
 Middleman::Extensions::MinifyCss.register
 
 # MinifyJavascript compresses JS
-require "middleman-more/extensions/minify_javascript"
+require 'middleman-more/extensions/minify_javascript'
 Middleman::Extensions::MinifyJavascript.register
 
 # GZIP assets and pages during build
-require "middleman-more/extensions/gzip"
+require 'middleman-more/extensions/gzip'
 Middleman::Extensions::Gzip.register
 
 # AssetHash appends a hash of the file contents to the assets filename
 # to avoid browser caches failing to update to your new content.
-require "middleman-more/extensions/asset_hash"
+require 'middleman-more/extensions/asset_hash'
 Middleman::Extensions::AssetHash.register
 
 # Provide Apache-style index.html files for directories
-require "middleman-more/extensions/directory_indexes"
+require 'middleman-more/extensions/directory_indexes'
 Middleman::Extensions::DirectoryIndexes.register
 
 # Lorem provides a handful of helpful prototyping methods to generate
 # words, paragraphs, fake images, names and email addresses.
-require "middleman-more/extensions/lorem"
+require 'middleman-more/extensions/lorem'
 
 # AutomaticImageSizes inspects the images used in your dynamic templates
 # and automatically adds width and height attributes to their HTML
 # elements.
-require "middleman-more/extensions/automatic_image_sizes"
+require 'middleman-more/extensions/automatic_image_sizes'
 Middleman::Extensions::AutomaticImageSizes.register
 
 # AutomaticAltTags uses the file name of the `image_tag` to generate
 # a default `:alt` value.
-require "middleman-more/extensions/automatic_alt_tags"
+require 'middleman-more/extensions/automatic_alt_tags'
 Middleman::Extensions::AutomaticAltTags.register

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

@@ -10,10 +10,10 @@ module Middleman
         # @private
         def registered(app)
           # Data formats
-          require "yaml"
-          require "active_support/json"
+          require 'yaml'
+          require 'active_support/json'
 
-          app.config.define_setting :data_dir, "data", "The directory data files are stored in"
+          app.config.define_setting :data_dir, 'data', 'The directory data files are stored in'
           app.send :include, InstanceMethods
         end
         alias :included :registered
@@ -101,7 +101,7 @@ module Middleman
 
           if %w(.yaml .yml).include?(extension)
             data = YAML.load_file(full_path)
-          elsif extension == ".json"
+          elsif extension == '.json'
             data = ActiveSupport::JSON.decode(full_path.read)
           else
             return
@@ -181,7 +181,7 @@ module Middleman
         def respond_to?(method, include_private = false)
           super || has_key?(method)
         end
-        
+
         # Make DataStore act like a hash. Return requested data, or
         # nil if data does not exist
         #

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

@@ -45,7 +45,7 @@ module Middleman
           app.define_hook :development_config
 
           app.config.define_setting :autoload_sprockets, true, 'Automatically load sprockets at startup?'
-          app.config[:autoload_sprockets] = (ENV["AUTOLOAD_SPROCKETS"] == "true") if ENV["AUTOLOAD_SPROCKETS"]
+          app.config[:autoload_sprockets] = (ENV['AUTOLOAD_SPROCKETS'] == 'true') if ENV['AUTOLOAD_SPROCKETS']
 
           app.extend ClassMethods
           app.send :include, InstanceMethods
@@ -147,7 +147,7 @@ module Middleman
 
           if config[:autoload_sprockets]
             begin
-              require "middleman-sprockets"
+              require 'middleman-sprockets'
               activate(:sprockets)
             rescue LoadError
             end
@@ -156,9 +156,9 @@ module Middleman
           run_hook :before_configuration
 
           # Check for and evaluate local configuration
-          local_config = File.join(root, "config.rb")
+          local_config = File.join(root, 'config.rb')
           if File.exists? local_config
-            logger.debug "== Reading:  Local config"
+            logger.debug '== Reading:  Local config'
             instance_eval File.read(local_config), local_config, 1
           end
 
@@ -171,14 +171,14 @@ module Middleman
           # don't completely reload middleman, I18n.load_path can get
           # polluted with paths from other test app directories that don't
           # exist anymore.
-          if ENV["TEST"]
+          if ENV['TEST']
             ::I18n.load_path.delete_if {|path| path =~ %r{tmp/aruba}}
             ::I18n.reload!
           end
 
           run_hook :after_configuration
 
-          logger.debug "Loaded extensions:"
+          logger.debug 'Loaded extensions:'
           self.extensions.each do |ext, klass|
             if ext.is_a?(Hash)
               ext.each do |k,_|