middleman-core 3.2.1 → 3.2.2

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

@@ -1,7 +1,7 @@
 # Used for merging results of metadata callbacks
-require "active_support/core_ext/hash/deep_merge"
+require 'active_support/core_ext/hash/deep_merge'
 require 'monitor'
-require "middleman-core/sitemap/queryable"
+require 'middleman-core/sitemap/queryable'
 
 module Middleman
 
@@ -24,7 +24,7 @@ module Middleman
       # Initialize with parent app
       # @param [Middleman::Application] app
       def initialize(app)
-        @app   = app
+        @app = app
         @resources = []
         @_cached_metadata = {}
         @resource_list_manipulators = []
@@ -161,7 +161,7 @@ module Middleman
           when Regexp
             next result unless request_path =~ matcher
           when String
-            next result unless File.fnmatch("/" + Util.strip_leading_slash(matcher), "/#{request_path}")
+            next result unless File.fnmatch('/' + Util.strip_leading_slash(matcher), "/#{request_path}")
           end
 
           metadata = callback.call(request_path).dup
@@ -178,14 +178,14 @@ module Middleman
       def file_to_path(file)
         file = File.join(@app.root, file)
 
-        prefix = @app.source_dir.sub(/\/$/, "") + "/"
+        prefix = @app.source_dir.sub(/\/$/, '') + '/'
         return false unless file.start_with?(prefix)
 
-        path = file.sub(prefix, "")
+        path = file.sub(prefix, '')
 
         # Replace a file name containing automatic_directory_matcher with a folder
         unless @app.config[:automatic_directory_matcher].nil?
-          path = path.gsub(@app.config[:automatic_directory_matcher], "/")
+          path = path.gsub(@app.config[:automatic_directory_matcher], '/')
         end
 
         extensionless_path(path)
@@ -211,7 +211,7 @@ module Middleman
           return unless @needs_sitemap_rebuild
           @needs_sitemap_rebuild = false
 
-          @app.logger.debug "== Rebuilding resource list"
+          @app.logger.debug '== Rebuilding resource list'
 
           @resources = @resource_list_manipulators.inject([]) do |result, (_, inst)|
             newres = inst.manipulate_resource_list(result)
@@ -244,7 +244,7 @@ module Middleman
       # @return [String]
       def remove_templating_extensions(path)
         # Strip templating extensions as long as Tilt knows them
-        path = path.sub(File.extname(path), "") while ::Tilt[path]
+        path = path.sub(File.extname(path), '') while ::Tilt[path]
         path
       end
 
@@ -252,10 +252,10 @@ module Middleman
       # @param [String] path
       # @return [String]
       def strip_away_locale(path)
-        if app.respond_to? :langs
+        if @app.respond_to? :langs
           path_bits = path.split('.')
           lang = path_bits.last
-          if app.langs.include?(lang.to_sym)
+          if @app.langs.include?(lang.to_sym)
             return path_bits[0..-2].join('.')
           end
         end
@@ -270,7 +270,7 @@ module Middleman
         input_ext = File.extname(file)
 
         if !input_ext.empty?
-          input_ext = input_ext.split(".").last.to_sym
+          input_ext = input_ext.split('.').last.to_sym
           if @app.template_extensions.has_key?(input_ext)
             path << ".#{@app.template_extensions[input_ext]}"
           end

data/lib/middleman-core/step_definitions.rb

@@ -1,11 +1,11 @@
 MIDDLEMAN_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-MIDDLEMAN_BIN_PATH  = File.join(MIDDLEMAN_ROOT_PATH, "bin")
+MIDDLEMAN_BIN_PATH  = File.join(MIDDLEMAN_ROOT_PATH, 'bin')
 ENV['PATH'] = "#{MIDDLEMAN_BIN_PATH}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
-require "aruba/cucumber"
-require "middleman-core/step_definitions/middleman_steps"
-require "middleman-core/step_definitions/builder_steps"
-require "middleman-core/step_definitions/server_steps"
+require 'aruba/cucumber'
+require 'middleman-core/step_definitions/middleman_steps'
+require 'middleman-core/step_definitions/builder_steps'
+require 'middleman-core/step_definitions/server_steps'
 
 Before do
   @aruba_timeout_seconds = 30

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

@@ -5,20 +5,20 @@ Before do
 end
 
 Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", path)
+  target = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
   config_path = File.join(current_dir, "config-#{config_name}.rb")
-  config_dest = File.join(current_dir, "config.rb")
+  config_dest = File.join(current_dir, 'config.rb')
   FileUtils.cp(config_path, config_dest)
 end
 
 Given /^an empty app$/ do
   step %Q{a directory named "empty_app"}
   step %Q{I cd to "empty_app"}
-  ENV["MM_ROOT"] = nil
+  ENV['MM_ROOT'] = nil
 end
 
 Given /^a fixture app "([^\"]*)"$/ do |path|
-  ENV["MM_ROOT"] = nil
+  ENV['MM_ROOT'] = nil
 
   # 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
@@ -26,7 +26,7 @@ Given /^a fixture app "([^\"]*)"$/ do |path|
 
   step %Q{a directory named "#{path}"}
 
-  target_path = File.join(PROJECT_ROOT_PATH, "fixtures", path)
+  target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
   FileUtils.cp_r(target_path, current_dir)
 
   step %Q{I cd to "#{path}"}

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

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require "rack/test"
+require 'rack/test'
 
 Given /^a clean server$/ do
   @initialize_commands = []
@@ -9,7 +9,7 @@ end
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
   @initialize_commands ||= []
 
-  if state == "enabled"
+  if state == 'enabled'
     @initialize_commands << lambda { activate(feature.to_sym) }
   end
 end
@@ -34,13 +34,13 @@ end
 Given /^the Server is running$/ do
   root_dir = File.expand_path(current_dir)
 
-  if File.exists?(File.join(root_dir, "source"))
-    ENV["MM_SOURCE"] = "source"
+  if File.exists?(File.join(root_dir, 'source'))
+    ENV['MM_SOURCE'] = 'source'
   else
-    ENV["MM_SOURCE"] = ""
+    ENV['MM_SOURCE'] = ''
   end
 
-  ENV["MM_ROOT"] = root_dir
+  ENV['MM_ROOT'] = root_dir
 
   initialize_commands = @initialize_commands || []
   initialize_commands.unshift lambda {

data/lib/middleman-core/templates.rb

@@ -1,6 +1,6 @@
 # Use thor for template generation
-require "thor"
-require "thor/group"
+require 'thor'
+require 'thor/group'
 
 # Templates namespace
 module Middleman::Templates
@@ -37,14 +37,14 @@ module Middleman::Templates
     # The gemfile template to use. Individual templates can define this class
     # method to override the template path.
     def self.gemfile_template
-      "shared/Gemfile.tt"
+      'shared/Gemfile.tt'
     end
 
     # Required path for the new project to be generated
     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
@@ -53,7 +53,7 @@ module Middleman::Templates
     # @return [void]
     def generate_rack!
       return unless options[:rack]
-      template "shared/config.ru", File.join(location, "config.ru")
+      template 'shared/config.ru', File.join(location, 'config.ru')
     end
 
     class_option :'skip-bundle', :type => :boolean, :default => false
@@ -63,12 +63,12 @@ module Middleman::Templates
     # @return [void]
     def generate_bundler!
       return if options[:'skip-gemfile']
-      template self.class.gemfile_template, File.join(location, "Gemfile")
+      template self.class.gemfile_template, File.join(location, 'Gemfile')
 
       return if options[:'skip-bundle']
       inside(location) do
         ::Middleman::Cli::Bundle.new.invoke(:bundle)
-      end unless ENV["TEST"]
+      end unless ENV['TEST']
     end
 
     # Output a .gitignore file
@@ -78,25 +78,25 @@ module Middleman::Templates
     # @return [void]
     def generate_gitignore!
       return if options[:'skip-git']
-      copy_file "shared/gitignore", File.join(location, ".gitignore")
+      copy_file 'shared/gitignore', File.join(location, '.gitignore')
     end
   end
 end
 
 # Default template
-require "middleman-core/templates/default"
+require 'middleman-core/templates/default'
 
 # HTML5 template
-require "middleman-core/templates/html5"
+require 'middleman-core/templates/html5'
 
 # HTML5 Mobile template
-require "middleman-core/templates/mobile"
+require 'middleman-core/templates/mobile'
 
 # SMACSS templates
-require "middleman-more/templates/smacss"
+require 'middleman-more/templates/smacss'
 
 # Local templates
-require "middleman-core/templates/local"
+require 'middleman-core/templates/local'
 
 # Barebones template
-require "middleman-core/templates/empty"
+require 'middleman-core/templates/empty'

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

@@ -1,14 +1,14 @@
 # Default Middleman template
 class Middleman::Templates::Default < Middleman::Templates::Base
 
-  class_option "css_dir",
-    :default => "stylesheets",
+  class_option 'css_dir',
+    :default => 'stylesheets',
     :desc    => 'The path to the css files'
-  class_option "js_dir",
-    :default => "javascripts",
+  class_option 'js_dir',
+    :default => 'javascripts',
     :desc    => 'The path to the javascript files'
-  class_option "images_dir",
-    :default => "images",
+  class_option 'images_dir',
+    :default => 'images',
     :desc    => 'The path to the image files'
 
   # Template files are relative to this file
@@ -20,17 +20,17 @@ class Middleman::Templates::Default < Middleman::Templates::Base
   # Actually output the files
   # @return [void]
   def build_scaffold!
-    template "shared/config.tt", File.join(location, "config.rb")
-    copy_file "default/source/index.html.erb", File.join(location, "source/index.html.erb")
-    copy_file "default/source/layouts/layout.erb", File.join(location, "source/layouts/layout.erb")
-    empty_directory File.join(location, "source", options[:css_dir])
-    copy_file "default/source/stylesheets/all.css", File.join(location, "source", options[:css_dir], "all.css")
-    copy_file "default/source/stylesheets/normalize.css", File.join(location, "source", options[:css_dir], "normalize.css")
-    empty_directory File.join(location, "source", options[:js_dir])
-    copy_file "default/source/javascripts/all.js", File.join(location, "source", options[:js_dir], "all.js")
-    empty_directory File.join(location, "source", options[:images_dir])
-    copy_file "default/source/images/background.png", File.join(location, "source", options[:images_dir], "background.png")
-    copy_file "default/source/images/middleman.png", File.join(location, "source", options[:images_dir], "middleman.png")
+    template 'shared/config.tt', File.join(location, 'config.rb')
+    copy_file 'default/source/index.html.erb', File.join(location, 'source/index.html.erb')
+    copy_file 'default/source/layouts/layout.erb', File.join(location, 'source/layouts/layout.erb')
+    empty_directory File.join(location, 'source', options[:css_dir])
+    copy_file 'default/source/stylesheets/all.css', File.join(location, 'source', options[:css_dir], 'all.css')
+    copy_file 'default/source/stylesheets/normalize.css', File.join(location, 'source', options[:css_dir], 'normalize.css')
+    empty_directory File.join(location, 'source', options[:js_dir])
+    copy_file 'default/source/javascripts/all.js', File.join(location, 'source', options[:js_dir], 'all.js')
+    empty_directory File.join(location, 'source', options[:images_dir])
+    copy_file 'default/source/images/background.png', File.join(location, 'source', options[:images_dir], 'background.png')
+    copy_file 'default/source/images/middleman.png', File.join(location, 'source', options[:images_dir], 'middleman.png')
   end
 end
 

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

@@ -8,14 +8,14 @@ class Middleman::Templates::Empty < Middleman::Templates::Base
   end
 
   def self.gemfile_template
-    "empty/Gemfile.tt"
+    'empty/Gemfile.tt'
   end
 
   # Actually output the files
   # @return [void]
   def build_scaffold!
-    create_file File.join(location, "config.rb"), "\n"
-    empty_directory File.join(location, "source")
+    create_file File.join(location, 'config.rb'), "\n"
+    empty_directory File.join(location, 'source')
   end
 end
 

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

@@ -6,14 +6,14 @@ source 'http://rubygems.org'
 gemspec
 
 group :development do
-  gem "rake"
-  gem "rdoc"
-  gem "yard"
+  gem 'rake'
+  gem 'rdoc'
+  gem 'yard'
 end
 
 group :test do
-  gem "cucumber"
-  gem "fivemat"
-  gem "aruba"
-  gem "rspec"
+  gem 'cucumber'
+  gem 'fivemat'
+  gem 'aruba'
+  gem 'rspec'
 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

data/lib/middleman-core/templates/extension/features/support/env.rb

@@ -1,4 +1,4 @@
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-require "middleman-core"
-require "middleman-core/step_definitions"
+require 'middleman-core'
+require 'middleman-core/step_definitions'
 require File.join(PROJECT_ROOT_PATH, 'lib', '<%= name %>')

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

@@ -1,9 +1,9 @@
 # Require core library
-require "middleman-core"
+require 'middleman-core'
 
 # Extension namespace
 class MyExtension < ::Middleman::Extension
-  option :my_option, "default", "An example option"
+  option :my_option, 'default', 'An example option'
 
   def initialize(app, options_hash={}, &block)
     # Call super to build options from the options_hash

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

@@ -1 +1 @@
-require "<%= name %>"
+require '<%= name %>'

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

@@ -1,14 +1,14 @@
 # HTML5 Boilerplate template
 class Middleman::Templates::Html5 < Middleman::Templates::Base
 
-  class_option "css_dir",
-    :default => "css",
+  class_option 'css_dir',
+    :default => 'css',
     :desc    => 'The path to the css files'
-  class_option "js_dir",
-    :default => "js",
+  class_option 'js_dir',
+    :default => 'js',
     :desc    => 'The path to the javascript files'
-  class_option "images_dir",
-    :default => "img",
+  class_option 'images_dir',
+    :default => 'img',
     :desc    => 'The path to the image files'
 
   # Templates are relative to this file
@@ -20,9 +20,9 @@ class Middleman::Templates::Html5 < Middleman::Templates::Base
   # Output the files
   # @return [void]
   def build_scaffold!
-    template "shared/config.tt", File.join(location, "config.rb")
-    directory "html5/source", File.join(location, "source")
-    empty_directory File.join(location, "source")
+    template 'shared/config.tt', File.join(location, 'config.rb')
+    directory 'html5/source', File.join(location, 'source')
+    empty_directory File.join(location, 'source')
   end
 end
 

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

@@ -4,7 +4,7 @@ class Middleman::Templates::Local < Middleman::Templates::Base
   # Look for templates in ~/.middleman
   # @return [String]
   def self.source_root
-    File.join(File.expand_path("~/"), ".middleman")
+    File.join(File.expand_path('~/'), '.middleman')
   end
 
   # Just copy from the template path
@@ -15,10 +15,10 @@ class Middleman::Templates::Local < Middleman::Templates::Base
 end
 
 # Iterate over the directories in the templates path and register each one.
-Dir[File.join(Middleman::Templates::Local.source_root, "*")].each do |dir|
+Dir[File.join(Middleman::Templates::Local.source_root, '*')].each do |dir|
   next unless File.directory?(dir)
 
-  template_file = File.join(dir, "template.rb")
+  template_file = File.join(dir, 'template.rb')
 
   if File.exists?(template_file)
     require template_file

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

@@ -2,9 +2,9 @@
 class Middleman::Templates::Mobile < Middleman::Templates::Base
 
   # Slightly different paths
-  class_option :css_dir, :default => "css"
-  class_option :js_dir, :default => "js"
-  class_option :images_dir, :default => "img"
+  class_option :css_dir, :default => 'css'
+  class_option :js_dir, :default => 'js'
+  class_option :images_dir, :default => 'img'
 
   # Template files are relative to this file
   # @return [String]
@@ -15,9 +15,9 @@ class Middleman::Templates::Mobile < Middleman::Templates::Base
   # Output the files
   # @return [void]
   def build_scaffold!
-    template "shared/config.tt", File.join(location, "config.rb")
-    directory "mobile/source", File.join(location, "source")
-    empty_directory File.join(location, "source")
+    template 'shared/config.tt', File.join(location, 'config.rb')
+    directory 'mobile/source', File.join(location, 'source')
+    empty_directory File.join(location, 'source')
   end
 end