middleman-core 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3dc6c4f0306d2699602558b9c5969cb39559b89
-  data.tar.gz: 529578435c9d7de90f8776c1c4820f21174fad59
+  metadata.gz: 5edb6179e1b8db65a77a208907ba89912542d232
+  data.tar.gz: eb2c10c41dae6b5cda0dc3d637ab3e72622243ee
 SHA512:
-  metadata.gz: b4234809f3a048f76e43b64cd61650a512aa87084c516a60e0bda2d984eb96f767a63ac0ffd0975f12f165be88da363c00b2e0bbc3a35b70c0ac2de59e64c844
-  data.tar.gz: 94b55256d747a907562b7334928453f770b4562182b7d042a1e77a2a19dfbe4655fd65482204990383878fda3a06754bd19024892a76d224b1ebd447cb4cd751
+  metadata.gz: 83ba70dcaafdd039ce05654b00800e5e1e3d54f820dfa23a062373d89214d18e8ebe675bc39f31289a7dc44ae22929b87ec8acac08cda3545b78d44d0bc91a46
+  data.tar.gz: 6283466a1bb102a867a43c61651c11b7271b08f29557b065eebb2d8b156c9f8f9d3b4673e3ae375bca5c5b48387b39aefd2a5561c427908b1b4113e3bd08aec4

data/features/cli_init.feature

@@ -98,3 +98,54 @@ Feature: Middleman CLI
       | config.rb                                     |
       | config.ru                                     |
       | Gemfile                                       |
+
+  Scenario: Enforce creation of Mobile HTML5 project
+    When I run `middleman init MY_PROJECT --template=mobile`
+    When I run `middleman init MY_PROJECT --template=mobile --force`
+    Then a directory named "MY_PROJECT" should exist
+    And the output should contain:
+    """
+    identical
+    """
+    And the output should contain:
+    """
+    exist
+    """
+  Scenario: Enforce creation of HTML5 project
+    When I run `middleman init MY_PROJECT --template=html5`
+    When I run `middleman init MY_PROJECT --template=html5 --force`
+    Then a directory named "MY_PROJECT" should exist
+    And the output should contain:
+    """
+    identical
+    """
+    And the output should contain:
+    """
+    exist
+    """
+
+  Scenario: Enforce creation of default project
+    When I run `middleman init MY_PROJECT --template=default`
+    When I run `middleman init MY_PROJECT --template=default --force`
+    Then a directory named "MY_PROJECT" should exist
+    And the output should contain:
+    """
+    identical
+    """
+    And the output should contain:
+    """
+    exist
+    """
+
+  Scenario: Enforce creation of empty project
+    When I run `middleman init MY_PROJECT --template=empty`
+    When I run `middleman init MY_PROJECT --template=empty --force`
+    Then a directory named "MY_PROJECT" should exist
+    And the output should contain:
+    """
+    identical
+    """
+    And the output should contain:
+    """
+    exist
+    """

data/features/compass-sprites.feature

@@ -3,4 +3,4 @@ Feature: Compass sprites should be generated on build and copied
     Given a successfully built app at "compass-sprites-app"
     When I cd to "build"
     Then the following files should exist:
-      | images/icon-s1a8aa64128.png |
+      | images/icon-s0de2218f58.png |

data/features/front-matter.feature

@@ -21,6 +21,17 @@ Feature: YAML Front Matter
     Then I should see "<?php"
     Then I should not see "---"
 
+  Scenario: Rendering markdown (template-less) (yaml)
+    Given the Server is running at "frontmatter-app"
+    When I go to "/front-matter-pandoc.html"
+    Then I should see ">This is a document</h1>"
+    Then I should see "<p>To be or not to be</p>"
+    Then I should see "The meaning of life is 42"
+    Then I should not see "..."
+    Then I should not see "layout: false"
+    Then I should not see "title: Pandoc likes trailing dots..."
+
+
   Scenario: YAML not on first line, no encoding
     Given the Server is running at "frontmatter-app"
     When I go to "/front-matter-line-2.html"

data/features/slim.feature

@@ -74,4 +74,4 @@ Feature: Support slim templating language
     When I go to "/sass.html"
     Then I should see "html, body, div"
     When I go to "/error.html"
-    Then I should see "Syntax error"
+    Then I should see "Error: Invalid"

data/fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb

@@ -0,0 +1,13 @@
+---
+layout: false
+title: Pandoc likes trailing dots...
+dotty_string: "..."
+famous_quote: To be or not to be
+popular_number: 42
+...
+
+# This is a document
+
+<%= current_page.data.famous_quote %>
+
+The meaning of life is <%= current_page.data.popular_number %>.

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

@@ -178,7 +178,7 @@ module Middleman::Cli
     # @return [void]
     def execute!
       # Sort order, images, fonts, js/css and finally everything else.
-      sort_order = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .ico .woff .otf .ttf .eot .js .css)
+      sort_order = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .ico .webp .woff .otf .ttf .eot .js .css)
 
       # Pre-request CSS to give Compass a chance to build sprites
       logger.debug '== Prerendering CSS'

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

@@ -40,6 +40,11 @@ module Middleman::Cli
                   type: :boolean,
                   default: false,
                   desc: 'Skip Git ignores and keeps'
+    method_option 'force',
+                  type: :boolean,
+                  default: false,
+                  desc: 'Overwrite existing files without any question'
+
     # The init task
     # @param [String] name
     def init(name='.')

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

@@ -119,7 +119,7 @@ module Middleman::CoreExtensions
     # @param [String] content
     # @return [Array<Hash, String>]
     def parse_yaml_front_matter(content, full_path)
-      yaml_regex = /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
+      yaml_regex = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
       if content =~ yaml_regex
         content = content.sub(yaml_regex, '')
 
@@ -176,7 +176,14 @@ module Middleman::CoreExtensions
 
       return [data, nil] if !app.files.exists?(full_path) || ::Middleman::Util.binary?(full_path)
 
-      content = File.read(full_path)
+      # Avoid weird race condition when a file is renamed.
+      content = begin
+        File.read(full_path)
+      rescue ::EOFError
+      rescue ::IOError
+      rescue ::Errno::ENOENT
+        ''
+      end
 
       begin
         if content =~ /\A.*coding:/

data/lib/middleman-core/preview_server.rb

@@ -208,8 +208,12 @@ module Middleman
       # @param [Array<String>] paths Array of paths to check
       # @return [Boolean] Whether the server needs to reload
       def needs_to_reload?(paths)
+        relative_paths = paths.map do |p|
+          Pathname(p).relative_path_from(Pathname(app.root)).to_s
+        end
+
         match_against = [
-          %r{^config\.rb},
+          %r{^config\.rb$},
           %r{^lib/[^\.](.*)\.rb$},
           %r{^helpers/[^\.](.*)\.rb$}
         ]
@@ -220,7 +224,7 @@ module Middleman
           end
         end
 
-        paths.any? do |path|
+        relative_paths.any? do |path|
           match_against.any? do |matcher|
             path =~ matcher
           end

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

@@ -86,7 +86,7 @@ module Middleman
           begin
             @engine.render
           rescue ::Sass::SyntaxError => e
-            ::Sass::SyntaxError.exception_to_css(e, full_exception: true)
+            ::Sass::SyntaxError.exception_to_css(e)
           end
         end
 

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

@@ -80,10 +80,6 @@ module Middleman
         @local_metadata[:blocks] += [block] if block_given?
       end
 
-      # The output/preview URL for this resource
-      # @return [String]
-      attr_accessor :destination_path
-
       # Extension of the path (i.e. '.js')
       # @return [String]
       def ext

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

@@ -19,17 +19,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'), force: options[:force]
+    copy_file 'default/source/index.html.erb', File.join(location, 'source/index.html.erb'), force: options[:force]
+    copy_file 'default/source/layouts/layout.erb', File.join(location, 'source/layouts/layout.erb'), force: options[:force]
+    empty_directory File.join(location, 'source', options[:css_dir]), force: options[:force]
+    copy_file 'default/source/stylesheets/all.css', File.join(location, 'source', options[:css_dir], 'all.css'), force: options[:force]
+    copy_file 'default/source/stylesheets/normalize.css', File.join(location, 'source', options[:css_dir], 'normalize.css'), force: options[:force]
+    empty_directory File.join(location, 'source', options[:js_dir]), force: options[:force]
+    copy_file 'default/source/javascripts/all.js', File.join(location, 'source', options[:js_dir], 'all.js'), force: options[:force]
+    empty_directory File.join(location, 'source', options[:images_dir]), force: options[:force]
+    copy_file 'default/source/images/background.png', File.join(location, 'source', options[:images_dir], 'background.png'), force: options[:force]
+    copy_file 'default/source/images/middleman.png', File.join(location, 'source', options[:images_dir], 'middleman.png'), force: options[:force]
   end
 end
 

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

@@ -13,8 +13,8 @@ class Middleman::Templates::Empty < Middleman::Templates::Base
   # 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", force: options[:force]
+    empty_directory File.join(location, 'source'), force: options[:force]
   end
 end
 

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

@@ -19,9 +19,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'), force: options[:force]
+    directory 'html5/source', File.join(location, 'source'), force: options[:force]
+    empty_directory File.join(location, 'source'), force: options[:force]
   end
 end
 

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

@@ -9,7 +9,7 @@ class Middleman::Templates::Local < Middleman::Templates::Base
   # Just copy from the template path
   # @return [void]
   def build_scaffold!
-    directory options[:template].to_s, location
+    directory options[:template].to_s, location, force: options[:force]
   end
 end
 

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

@@ -14,9 +14,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'), force: options[:force]
+    directory 'mobile/source', File.join(location, 'source'), force: options[:force]
+    empty_directory File.join(location, 'source'), force: options[:force]
   end
 end
 

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.3.5' unless const_defined?(:VERSION)
+  VERSION = '3.3.6' unless const_defined?(:VERSION)
 end

data/lib/middleman-more/core_extensions/compass.rb

@@ -27,6 +27,7 @@ class Middleman::CoreExtensions::Compass < ::Middleman::Extension
       compass_config.images_dir      = app.config[:images_dir]
       compass_config.http_path       = app.config[:http_prefix]
 
+      compass_config.additional_import_paths = []
       app.config[:sass_assets_paths].each do |path|
         compass_config.add_import_path path
       end

data/lib/middleman-more/extensions/asset_hash.rb

@@ -1,7 +1,7 @@
 require 'middleman-core/util'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
-  option :exts, %w(.jpg .jpeg .png .gif .js .css .otf .woff .eot .ttf .svg), 'List of extensions that get asset hashes appended to them.'
+  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .eot .ttf .svg .svgz), 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Patterns to avoid adding asset hashes to'
 
   def initialize(app, options_hash={}, &block)

data/lib/middleman-more/extensions/automatic_image_sizes.rb

@@ -16,8 +16,6 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
     # @return [String]
     def image_tag(path, params={})
       if !params.key?(:width) && !params.key?(:height) && !path.include?('://')
-        params[:alt] ||= ''
-
         real_path = path
         real_path = File.join(images_dir, real_path) unless real_path.start_with?('/')
         full_path = File.join(source_dir, real_path)

data/lib/middleman-more/extensions/cache_buster.rb

@@ -24,7 +24,7 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension
     def asset_url(path, prefix='')
       http_path = super
 
-      if http_path.include?('://') || !%w(.css .png .jpg .jpeg .svg .svgz .js .gif).include?(File.extname(http_path))
+      if http_path.include?('://') || !%w(.css .png .jpg .jpeg .svg .svgz .webp .js .gif).include?(File.extname(http_path))
         http_path
       else
         if respond_to?(:http_images_path) && prefix == http_images_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,184 +10,184 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.9
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.9
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
 description: A static site generator. Provides dozens of templating languages (Haml,
@@ -202,9 +202,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .simplecov
-- .yardopts
+- ".gemtest"
+- ".simplecov"
+- ".yardopts"
 - Rakefile
 - bin/middleman
 - features/3rd_party_cli.feature
@@ -512,6 +512,7 @@ files:
 - fixtures/frontmatter-app/source/front-matter-change.html.erb
 - fixtures/frontmatter-app/source/front-matter-encoding.html.erb
 - fixtures/frontmatter-app/source/front-matter-line-2.html.erb
+- fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb
 - fixtures/frontmatter-app/source/json-front-matter-2.php.erb
 - fixtures/frontmatter-app/source/json-front-matter-auto.erb
 - fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb
@@ -1256,12 +1257,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -1576,6 +1577,7 @@ test_files:
 - fixtures/frontmatter-app/source/front-matter-change.html.erb
 - fixtures/frontmatter-app/source/front-matter-encoding.html.erb
 - fixtures/frontmatter-app/source/front-matter-line-2.html.erb
+- fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb
 - fixtures/frontmatter-app/source/json-front-matter-2.php.erb
 - fixtures/frontmatter-app/source/json-front-matter-auto.erb
 - fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb