middleman-core 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9136eed750e812964590bf24ce5c278e02030cb4
-  data.tar.gz: 44d32a56dead0c8a459725ffe033f1dcec63ede0
+  metadata.gz: 399878e22fa5885a804711e6492dca948a8b31f6
+  data.tar.gz: 85bfe5dd5d745dc7cfb3dff4f92bdc5fcc0bec2e
 SHA512:
-  metadata.gz: 4b4362a8a7d6d67bc9f5895193bd38b877008ab678e183ef03e719c549f04a5668616a94a4e1091730ecf9f7469c5f32bb1d2f969156f18d2db78e3edad1ee21
-  data.tar.gz: cadb0cb5b71dbbb7c21be2048edb7a60adf05404616680ff5a0442af89bd4f6fa24552a3a31fe7125e33b9273b60c67a10ccbbbe77bc0b53c1157c3020d3b4f0
+  metadata.gz: aecbe3601a5a83dc338598bf3eda63906ebb3ee2f6c22e3d27786763245e0e89b1245d731dda9561c8914c0491482ef4aac432f777722ed62bd14c09cf732aef
+  data.tar.gz: 807a69fdf80e525bda9d44fd08615395a6bd23bca2c846480fc05b095ef38ec729e9fef8ab42397859964fb5e71b8e132c76e4b8459fc2a35c99da4228100ab3

data/Rakefile

@@ -1,7 +1,7 @@
 # coding:utf-8
 RAKE_ROOT = __FILE__
 
-GEM_NAME = ENV["NAME"] || "middleman-core"
+GEM_NAME = ENV['NAME'] || 'middleman-core'
 
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/features/helpers_select_tag.feature

@@ -0,0 +1,19 @@
+Feature: select_tag helper
+
+  Scenario: select_tag produces correct options
+    Given a fixture app "indexable-app"
+    And an empty file named "config.rb"
+    And a file named "source/select_tag.html.erb" with:
+    """
+    options as array: <%= select_tag :colors, options: ["red", "blue", "blorange"], include_blank: "Choose a color" %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/select_tag.html"
+    Then I should see:
+    """
+    <select name="colors"><option value="">Choose a color</option>
+    <option value="red">red</option>
+    <option value="blue">blue</option>
+    <option value="blorange">blorange</option>
+    </select>
+    """

data/lib/middleman-core.rb

@@ -10,7 +10,7 @@ module Middleman
 
 end
 
-require "middleman-core/version"
-require "middleman-core/util"
-require "middleman-core/extensions"
-require "middleman-core/application"
+require 'middleman-core/version'
+require 'middleman-core/util'
+require 'middleman-core/extensions'
+require 'middleman-core/application'

data/lib/middleman-core/application.rb

@@ -1,21 +1,28 @@
 # Using Tilt for templating
-require "tilt"
+require 'tilt'
 
 # i18n Built-in
-require "i18n"
+require 'i18n'
+
+# Don't fail on invalid locale, that's not what our current
+# users expect.
+::I18n.config.enforce_available_locales = false
 
 # Use ActiveSupport JSON
-require "active_support/json"
-require "active_support/core_ext/integer/inflections"
-require "active_support/core_ext/float/rounding"
+require 'active_support/json'
+require 'active_support/core_ext/integer/inflections'
+require 'active_support/core_ext/float/rounding'
 
 # Simple callback library
-require "vendored-middleman-deps/hooks-0.2.0/lib/hooks"
+require 'vendored-middleman-deps/hooks-0.2.0/lib/hooks'
+
+# Our custom logger
+require 'middleman-core/logger'
 
-require "middleman-core/sitemap"
+require 'middleman-core/sitemap'
 
-require "middleman-core/configuration"
-require "middleman-core/core_extensions"
+require 'middleman-core/configuration'
+require 'middleman-core/core_extensions'
 
 # Core Middleman Class
 module Middleman
@@ -47,7 +54,7 @@ module Middleman
     # Root project directory (overwritten in middleman build/server)
     # @return [String]
     def self.root
-      ENV["MM_ROOT"] || Dir.pwd
+      ENV['MM_ROOT'] || Dir.pwd
     end
     delegate :root, :to => :"self.class"
 
@@ -59,7 +66,7 @@ module Middleman
 
     # Name of the source directory
     # @return [String]
-    config.define_setting :source,      "source", 'Name of the source directory'
+    config.define_setting :source,      'source', 'Name of the source directory'
 
     # Middleman environment. Defaults to :development, set to :build by the build process
     # @return [String]
@@ -67,7 +74,7 @@ module Middleman
 
     # Which file should be used for directory indexes
     # @return [String]
-    config.define_setting :index_file,  "index.html", 'Which file should be used for directory indexes'
+    config.define_setting :index_file,  'index.html', 'Which file should be used for directory indexes'
 
     # Whether to strip the index file name off links to directory indexes
     # @return [Boolean]
@@ -79,35 +86,35 @@ module Middleman
 
     # Location of javascripts within source.
     # @return [String]
-    config.define_setting :js_dir,      "javascripts", 'Location of javascripts within source'
+    config.define_setting :js_dir,      'javascripts', 'Location of javascripts within source'
 
     # Location of stylesheets within source. Used by Compass.
     # @return [String]
-    config.define_setting :css_dir,     "stylesheets", 'Location of stylesheets within source'
+    config.define_setting :css_dir,     'stylesheets', 'Location of stylesheets within source'
 
     # Location of images within source. Used by HTML helpers and Compass.
     # @return [String]
-    config.define_setting :images_dir,  "images", 'Location of images within source'
+    config.define_setting :images_dir,  'images', 'Location of images within source'
 
     # Location of fonts within source. Used by Compass.
     # @return [String]
-    config.define_setting :fonts_dir,   "fonts", 'Location of fonts within source'
+    config.define_setting :fonts_dir,   'fonts', 'Location of fonts within source'
 
     # Location of partials within source. Used by renderers.
     # @return [String]
-    config.define_setting :partials_dir,   "", 'Location of partials within source'
+    config.define_setting :partials_dir,   '', 'Location of partials within source'
 
     # Location of layouts within source. Used by renderers.
     # @return [String]
-    config.define_setting :layouts_dir, "layouts", 'Location of layouts within source'
+    config.define_setting :layouts_dir, 'layouts', 'Location of layouts within source'
 
     # Where to build output files
     # @return [String]
-    config.define_setting :build_dir,   "build", 'Where to build output files'
+    config.define_setting :build_dir,   'build', 'Where to build output files'
 
     # Default prefix for building paths. Used by HTML helpers and Compass.
     # @return [String]
-    config.define_setting :http_prefix, "/", 'Default prefix for building paths'
+    config.define_setting :http_prefix, '/', 'Default prefix for building paths'
 
     # Default layout name
     # @return [String, Symbold]
@@ -115,7 +122,7 @@ module Middleman
 
     # Default string encoding for templates and output.
     # @return [String]
-    config.define_setting :encoding, "utf-8", 'Default string encoding for templates and output'
+    config.define_setting :encoding, 'utf-8', 'Default string encoding for templates and output'
 
     # Should Padrino include CRSF tag
     # @return [Boolean]
@@ -152,8 +159,12 @@ module Middleman
     # with_layout and page routing
     include Middleman::CoreExtensions::Routing
 
+    attr_reader :logger
+
     # Initialize the Middleman project
     def initialize(&block)
+      @logger = ::Middleman::Logger.singleton
+
       # Clear the static class cache
       cache.clear
 
@@ -168,7 +179,7 @@ module Middleman
       # Evaluate a passed block if given
       instance_exec(&block) if block_given?
 
-      config[:source] = ENV["MM_SOURCE"] if ENV["MM_SOURCE"]
+      config[:source] = ENV['MM_SOURCE'] if ENV['MM_SOURCE']
 
       super
     end
@@ -184,11 +195,15 @@ module Middleman
 
     # Whether we're in development mode
     # @return [Boolean] If we're in dev mode
-    def development?; config[:environment] == :development; end
+    def development?
+      config[:environment] == :development
+    end
 
     # Whether we're in build mode
     # @return [Boolean] If we're in build mode
-    def build?; config[:environment] == :build; end
+    def build?
+      config[:environment] == :build
+    end
 
     # The full path to the source directory
     #
@@ -197,7 +212,7 @@ module Middleman
       File.join(root, config[:source])
     end
 
-    delegate :logger, :instrument, :to => ::Middleman::Util
+    delegate :instrument, :to => ::Middleman::Util
 
     # Work around this bug: http://bugs.ruby-lang.org/issues/4521
     # where Ruby will call to_s/inspect while printing exception
@@ -208,27 +223,6 @@ module Middleman
     end
     alias :inspect :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
 
-    # Expand a path to include the index file if it's a directory
-    #
-    # @private
-    # @param [String] path Request path
-    # @return [String] Path with index file if necessary
-    def full_path(path)
-      resource = sitemap.find_resource_by_destination_path(path)
-
-      if !resource
-        # Try it with /index.html at the end
-        indexed_path = File.join(path.sub(%r{/$}, ''), config[:index_file])
-        resource = sitemap.find_resource_by_destination_path(indexed_path)
-      end
-
-      if resource
-        '/' + resource.destination_path
-      else
-        '/' + Middleman::Util.normalize_path(path)
-      end
-    end
-
   end
 end
 

data/lib/middleman-core/cli.rb

@@ -1,6 +1,6 @@
 # Require thor since that's what the who CLI is built around
 require 'thor'
-require "thor/group"
+require 'thor/group'
 
 # CLI Module
 module Middleman
@@ -12,18 +12,18 @@ module Middleman
       class << self
         def start(*args)
           # Change flag to a module
-          ARGV.unshift("help") if ARGV.delete("--help")
+          ARGV.unshift('help') if ARGV.delete('--help')
 
           # Default command is server
-          if ARGV[0] != "help" && (ARGV.length < 1 || ARGV.first.include?("-"))
-            ARGV.unshift("server")
+          if ARGV[0] != 'help' && (ARGV.length < 1 || ARGV.first.include?('-'))
+            ARGV.unshift('server')
           end
 
           super
         end
       end
 
-      desc "version", "Show version"
+      desc 'version', 'Show version'
       def version
         require 'middleman-core/version'
         say "Middleman #{Middleman::VERSION}"
@@ -36,7 +36,7 @@ module Middleman
       def help(meth = nil, subcommand = false)
         if meth && !self.respond_to?(meth)
           klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
-          klass.start(["-h", task].compact, :shell => self.shell)
+          klass.start(['-h', task].compact, :shell => self.shell)
         else
           list = []
           Thor::Util.thor_classes_in(Middleman::Cli).each do |thor_class|
@@ -44,7 +44,7 @@ module Middleman
           end
           list.sort!{ |a,b| a[0] <=> b[0] }
 
-          shell.say "Tasks:"
+          shell.say 'Tasks:'
           shell.print_table(list, :ident => 2, :truncate => true)
           shell.say
         end
@@ -62,10 +62,10 @@ module Middleman
         klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
 
         if klass.nil?
-          tasks_dir = File.join(Dir.pwd, "tasks")
+          tasks_dir = File.join(Dir.pwd, 'tasks')
 
           if File.exists?(tasks_dir)
-            Dir[File.join(tasks_dir, "**/*_task.rb")].each { |f| require f }
+            Dir[File.join(tasks_dir, '**/*_task.rb')].each { |f| require f }
             klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
           end
         end
@@ -82,9 +82,9 @@ module Middleman
 end
 
 # Include the core CLI items
-require "middleman-core/cli/init"
-require "middleman-core/cli/bundler"
-require "middleman-core/cli/extension"
-require "middleman-core/cli/server"
-require "middleman-core/cli/build"
-require "middleman-core/cli/console"
+require 'middleman-core/cli/init'
+require 'middleman-core/cli/bundler'
+require 'middleman-core/cli/extension'
+require 'middleman-core/cli/server'
+require 'middleman-core/cli/build'
+require 'middleman-core/cli/console'

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

@@ -1,11 +1,13 @@
-require "middleman-core"
-require "fileutils"
+require 'middleman-core'
+require 'middleman-core/logger'
+
+require 'fileutils'
 require 'set'
 
 # CLI Module
 module Middleman::Cli
   # Alias "b" to "build"
-  Base.map({ "b" => "build" })
+  Base.map({ 'b' => 'build' })
 
   # The CLI Build class
   class Build < Thor
@@ -18,14 +20,14 @@ module Middleman::Cli
 
     namespace :build
 
-    desc "build [options]", "Builds the static site for deployment"
+    desc 'build [options]', 'Builds the static site for deployment'
     method_option :clean,
       :type    => :boolean,
       :default => true,
       :desc    => 'Remove orphaned files from build (--no-clean to disable)'
     method_option :glob,
       :type    => :string,
-      :aliases => "-g",
+      :aliases => '-g',
       :default => nil,
       :desc    => 'Build a subset of the project'
     method_option :verbose,
@@ -44,33 +46,33 @@ module Middleman::Cli
     # Core build Thor command
     # @return [void]
     def build
-      if !ENV["MM_ROOT"]
-        raise Thor::Error, "Error: Could not find a Middleman project config, perhaps you are in the wrong folder?"
+      if !ENV['MM_ROOT']
+        raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?'
       end
 
       # Use Rack::Test for inspecting a running server for output
-      require "rack"
-      require "rack/test"
+      require 'rack'
+      require 'rack/test'
 
       require 'find'
 
       @debugging = Middleman::Cli::Base.respond_to?(:debugging) && Middleman::Cli::Base.debugging
       self.had_errors = false
 
-      self.class.shared_instance(options["verbose"], options["instrument"])
+      self.class.shared_instance(options['verbose'], options['instrument'])
 
       opts = {}
-      opts[:glob]  = options["glob"] if options.has_key?("glob")
-      opts[:clean] = options["clean"]
+      opts[:glob]  = options['glob'] if options.has_key?('glob')
+      opts[:clean] = options['clean']
 
       action BuildAction.new(self, opts)
 
       self.class.shared_instance.run_hook :after_build, self
 
       if self.had_errors && !self.debugging
-        msg = "There were errors during this build"
-        unless options["verbose"]
-          msg << ", re-run with `middleman build --verbose` to see the full exception."
+        msg = 'There were errors during this build'
+        unless options['verbose']
+          msg << ', re-run with `middleman build --verbose` to see the full exception.'
         end
         self.shell.say msg, :red
       end
@@ -90,7 +92,7 @@ module Middleman::Cli
       def shared_instance(verbose=false, instrument=false)
         @_shared_instance ||= ::Middleman::Application.server.inst do
           config[:environment] = :build
-          logger(verbose ? 0 : 1, instrument)
+          ::Middleman::Logger.singleton(verbose ? 0 : 1, instrument)
         end
       end
     end
@@ -134,7 +136,7 @@ module Middleman::Cli
         base.remove_file f, :force => true
       end
 
-      Dir[@build_dir.join("**", "*")].select {|d| File.directory?(d) }.each do |d|
+      Dir[@build_dir.join('**', '*')].select {|d| File.directory?(d) }.each do |d|
         base.remove_file d, :force => true if directory_empty? d
       end
     end
@@ -177,15 +179,15 @@ module Middleman::Cli
       sort_order = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .ico .woff .otf .ttf .eot .js .css)
 
       # Pre-request CSS to give Compass a chance to build sprites
-      logger.debug "== Prerendering CSS"
+      logger.debug '== Prerendering CSS'
 
       @app.sitemap.resources.select do |resource|
-        resource.ext == ".css"
+        resource.ext == '.css'
       end.each do |resource|
         @rack.get(URI.escape(resource.destination_path))
       end
 
-      logger.debug "== Checking for Compass sprites"
+      logger.debug '== Checking for Compass sprites'
 
       # Double-check for compass sprites
       @app.files.find_new_files((@source_dir + @app.images_dir).relative_path_from(@app.root_path))
@@ -195,7 +197,7 @@ module Middleman::Cli
       # find files in the build folder when it needs to generate sprites for the
       # css files
 
-      logger.debug "== Building files"
+      logger.debug '== Building files'
 
       resources = @app.sitemap.resources.sort_by do |r|
         sort_order.index(r.ext) || 100
@@ -222,7 +224,7 @@ module Middleman::Cli
         end
       end
 
-      ::Middleman::Profiling.report("build")
+      ::Middleman::Profiling.report('build')
     end
 
     # Render a resource to a file.
@@ -268,14 +270,14 @@ module Middleman::Cli
       if base.debugging
         raise e
         exit(1)
-      elsif base.options["verbose"]
+      elsif base.options['verbose']
         base.shell.say response, :red
       end
     end
 
     def binary_encode(string)
       if string.respond_to?(:force_encoding)
-        string.force_encoding("ascii-8bit")
+        string.force_encoding('ascii-8bit')
       end
       string
     end