middleman-core 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e72ec7118c675ea751825737b7d382670144035
-  data.tar.gz: 035a9102b513a809495a687a6cf11154a29d8842
+  metadata.gz: 9136eed750e812964590bf24ce5c278e02030cb4
+  data.tar.gz: 44d32a56dead0c8a459725ffe033f1dcec63ede0
 SHA512:
-  metadata.gz: 246c43b8e6372afe90cbd427d80135e8d72b1d5686f15b9fca2d773e023b6f54ebd20b53fd61374beea8d87951e6dd7a103384454c27f06b610ef4a5dc7acb06
-  data.tar.gz: 396268eda2f27bbf32d83b46dd87f2add1c26225f9af60df2b968359de40375487dd3fa8a405d0ace99b869233d00bec46f44f89cc546bb87ab1691f43e77667
+  metadata.gz: 4b4362a8a7d6d67bc9f5895193bd38b877008ab678e183ef03e719c549f04a5668616a94a4e1091730ecf9f7469c5f32bb1d2f969156f18d2db78e3edad1ee21
+  data.tar.gz: cadb0cb5b71dbbb7c21be2048edb7a60adf05404616680ff5a0442af89bd4f6fa24552a3a31fe7125e33b9273b60c67a10ccbbbe77bc0b53c1157c3020d3b4f0

data/.yardopts

@@ -0,0 +1,10 @@
+lib/**/*.rb
+--exclude lib/vendored-middleman-deps/
+--exclude lib/middleman-core/step_definitions
+--exclude lib/middleman-core/templates/default/
+--exclude lib/middleman-core/templates/html5/
+--exclude lib/middleman-core/templates/mobile/
+--exclude lib/middleman-core/templates/shared/
+--exclude lib/middleman-core/templates/extension/
+--no-private
+--hide-void-return

data/features/helpers_auto_javascript_include_tag.feature

@@ -6,11 +6,25 @@ Feature: Built-in auto_javascript_include_tag view helper
     When I go to "/auto-js.html"
     Then I should see "javascripts/auto-js.js"
 
+  Scenario: Viewing the root path (build mode)
+    Given a successfully built app at "auto-js-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | auto-js.html |
+    And the file "auto-js.html" should contain "javascripts/auto-js.js"
+
   Scenario: Viewing a tier-1 path
     Given the Server is running at "auto-js-app"
     When I go to "/auto-js/auto-js.html"
     Then I should see "javascripts/auto-js/auto-js.js"
 
+  Scenario: Viewing a tier-1 path (build mode)
+    Given a successfully built app at "auto-js-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | auto-js/auto-js.html |
+    And the file "auto-js/auto-js.html" should contain "javascripts/auto-js/auto-js.js"
+
   Scenario: Viewing the index file of a tier-1 path, without filename
     Given the Server is running at "auto-js-app"
     When I go to "/auto-js"
@@ -25,3 +39,10 @@ Feature: Built-in auto_javascript_include_tag view helper
     Given the Server is running at "auto-js-app"
     When I go to "/auto-js/sub/auto-js.html"
     Then I should see "javascripts/auto-js/sub/auto-js.js"
+
+  Scenario: Viewing a tier-2 path (build mode)
+    Given a successfully built app at "auto-js-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | auto-js/sub/auto-js.html |
+    And the file "auto-js/sub/auto-js.html" should contain "javascripts/auto-js/sub/auto-js.js"

data/features/helpers_auto_stylesheet_link_tag.feature

@@ -6,11 +6,25 @@ Feature: Built-in auto_stylesheet_link_tag view helper
     When I go to "/auto-css.html"
     Then I should see "stylesheets/auto-css.css"
 
+  Scenario: Viewing the root path (build mode)
+    Given a successfully built app at "auto-css-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | auto-css.html |
+    And the file "auto-css.html" should contain "stylesheets/auto-css.css"
+
   Scenario: Viewing a tier-1 path
     Given the Server is running at "auto-css-app"
     When I go to "/auto-css/auto-css.html"
     Then I should see "stylesheets/auto-css/auto-css.css"
 
+  Scenario: Viewing a tier-1 path (build mode)
+    Given a successfully built app at "auto-css-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | auto-css/auto-css.html |
+    And the file "auto-css/auto-css.html" should contain "stylesheets/auto-css/auto-css.css"
+
   Scenario: Viewing the index file of a tier-1 path, without filename
     Given the Server is running at "auto-css-app"
     When I go to "/auto-css"
@@ -25,3 +39,10 @@ Feature: Built-in auto_stylesheet_link_tag view helper
     Given the Server is running at "auto-css-app"
     When I go to "/auto-css/sub/auto-css.html"
     Then I should see "stylesheets/auto-css/sub/auto-css.css"
+
+  Scenario: Viewing a tier-2 path (build mode)
+    Given a successfully built app at "auto-css-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | auto-css/sub/auto-css.html |
+    And the file "auto-css/sub/auto-css.html" should contain "stylesheets/auto-css/sub/auto-css.css"

data/features/i18n_builder.feature

@@ -1,6 +1,6 @@
 Feature: i18n Builder
   In order to preview localized html
-  
+
   Scenario: Running localize with the default config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -22,9 +22,19 @@ Feature: i18n Builder
       | password.txt                                  |
     Then the following files should not exist:
       | en/index.html                                 |
+      | en/manana.html                                |
+      | en/hola.html                                  |
+      | en/una.html                                   |
+      | es/morning.html                               |
+      | es/one.html                                   |
+      | es/hello.html                                 |
+      | en/morning.en.html                            |
+      | en/morning.es.html                            |
+      | morning.en.html                               |
+      | morning.es.html                               |
       | defaults_en/index.html                        |
       | en_defaults/index.html                        |
-    And the file "index.html" should contain "Howdy"  
+    And the file "index.html" should contain "Howdy"
     And the file "hello.html" should contain "Hello World"
     And the file "morning.html" should contain "Good morning"
     And the file "one.html" should contain "Only one"
@@ -34,7 +44,7 @@ Feature: i18n Builder
     And the file "es/una.html" should contain "Solamente una"
     And the file "CNAME" should contain "test.github.com"
     And the file "password.txt" should contain "hunter2"
-    
+
   Scenario: Running localize with the alt path config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -50,11 +60,11 @@ Feature: i18n Builder
       | lang_es/hola.html                             |
     Then the following files should not exist:
       | lang_en/index.html                            |
-    And the file "index.html" should contain "Howdy"  
+    And the file "index.html" should contain "Howdy"
     And the file "hello.html" should contain "Hello World"
     And the file "lang_es/index.html" should contain "Como Esta?"
     And the file "lang_es/hola.html" should contain "Hola World"
-    
+
   Scenario: Running localize with the alt root config
     Given a fixture app "i18n-alt-root-app"
     And a file named "config.rb" with:
@@ -70,11 +80,11 @@ Feature: i18n Builder
       | es/hola.html                                  |
     Then the following files should not exist:
       | en/index.html                                 |
-    And the file "index.html" should contain "Howdy"  
+    And the file "index.html" should contain "Howdy"
     And the file "hello.html" should contain "Hello World"
     And the file "es/index.html" should contain "Como Esta?"
     And the file "es/hola.html" should contain "Hola World"
-    
+
   Scenario: Running localize with the lang map config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -90,11 +100,11 @@ Feature: i18n Builder
       | spanish/hola.html                             |
     Then the following files should not exist:
       | english/index.html                            |
-    And the file "index.html" should contain "Howdy"  
+    And the file "index.html" should contain "Howdy"
     And the file "hello.html" should contain "Hello World"
     And the file "spanish/index.html" should contain "Como Esta?"
     And the file "spanish/hola.html" should contain "Hola World"
-    
+
   Scenario: Running localize with the no mount config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -111,11 +121,11 @@ Feature: i18n Builder
     Then the following files should not exist:
       | index.html                                    |
       | hello.html                                    |
-    And the file "en/index.html" should contain "Howdy"  
+    And the file "en/index.html" should contain "Howdy"
     And the file "en/hello.html" should contain "Hello World"
     And the file "es/index.html" should contain "Como Esta?"
     And the file "es/hola.html" should contain "Hola World"
-    
+
   Scenario: Running localize with the subset config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -131,9 +141,9 @@ Feature: i18n Builder
       | en/index.html                                 |
       | es/index.html                                 |
       | es/hola.html                                  |
-    And the file "index.html" should contain "Howdy"  
+    And the file "index.html" should contain "Howdy"
     And the file "hello.html" should contain "Hello World"
-    
+
   Scenario: Running localize with relative_assets
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:

data/features/i18n_preview.feature

@@ -1,6 +1,6 @@
 Feature: i18n Preview
   In order to preview localized html
-  
+
   Scenario: Running localize with the default config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -80,8 +80,8 @@ Feature: i18n Preview
     Then I should see "Como Esta?"
     When I go to "/lang_es/hola.html"
     Then I should see "Hola World"
-    
-    
+
+
   Scenario: Running localize with the alt root config
     Given a fixture app "i18n-alt-root-app"
     And a file named "config.rb" with:
@@ -99,7 +99,7 @@ Feature: i18n Preview
     Then I should see "Como Esta?"
     When I go to "/es/hola.html"
     Then I should see "Hola World"
-    
+
   Scenario: Running localize with the lang map config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -167,8 +167,8 @@ Feature: i18n Preview
     Then I should see "File Not Found"
     When I go to "/es/hola.html"
     Then I should see "File Not Found"
-    
-    
+
+
   Scenario: Running localize with the no mount config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -188,7 +188,7 @@ Feature: i18n Preview
     Then I should see "Como Esta?"
     When I go to "/es/hola.html"
     Then I should see "Hola World"
-    
+
   Scenario: Running localize with the subset config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -206,7 +206,7 @@ Feature: i18n Preview
     Then I should see "File Not Found"
     When I go to "/es/hola.html"
     Then I should see "File Not Found"
-    
+
   Scenario: Running localize with relative_assets
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
@@ -249,4 +249,4 @@ Feature: i18n Preview
     Then I should see "More"
     When I go to "/es/"
     Then I should see "Como Esta?"
-    Then I should see "Mucho"
+    Then I should see "Mucho"

data/features/markdown_kramdown.feature

@@ -26,7 +26,7 @@ Feature: Markdown (Kramdown) support
 
       ![image](blank.gif)
 
-      (mailto:mail@mail.com)
+      [mail@mail.com](mailto:mail@mail.com)
       """
     Given the Server is running at "markdown-app"
     When I go to "/link_and_image/"

data/lib/middleman-core/application.rb

@@ -117,6 +117,10 @@ module Middleman
     # @return [String]
     config.define_setting :encoding, "utf-8", 'Default string encoding for templates and output'
 
+    # Should Padrino include CRSF tag
+    # @return [Boolean]
+    config.define_setting :protect_from_csrf, false, 'Should Padrino include CRSF tag'
+
     # Activate custom features and extensions
     include Middleman::CoreExtensions::Extensions
 

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

@@ -159,9 +159,15 @@ module Middleman::Cli
       return unless File.exist?(@build_dir)
 
       paths = ::Middleman::Util.all_files_under(@build_dir).map(&:realpath).select(&:file?)
+
       @to_clean += paths.select do |path|
         path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
       end
+
+      if RUBY_PLATFORM =~ /darwin/
+        # handle UTF-8-MAC filename on MacOS
+        @to_clean = @to_clean.map { |path| path.to_s.encode('UTF-8', 'UTF-8-MAC') }
+      end
     end
 
     # Actually build the app
@@ -205,8 +211,14 @@ module Middleman::Cli
 
         output_path = render_to_file(resource)
 
-        if should_clean?
-          @to_clean.delete(output_path.realpath) if output_path.exist?
+        if should_clean? && output_path.exist?
+          if RUBY_PLATFORM =~ /darwin/
+            # handle UTF-8-MAC filename on MacOS
+
+            @to_clean.delete(output_path.realpath.to_s.encode('UTF-8', 'UTF-8-MAC'))
+          else
+            @to_clean.delete(output_path.realpath)
+          end
         end
       end
 

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

@@ -34,6 +34,7 @@ module Middleman::Cli
       :desc    => "Don't create a Gemfile"
     method_option "skip-bundle",
       :type    => :boolean,
+      :aliases => "-B",
       :default => false,
       :desc    => "Don't run bundle install"
     method_option "skip-git",

data/lib/middleman-core/core_extensions.rb

@@ -87,4 +87,9 @@ require "middleman-more/extensions/lorem"
 # and automatically adds width and height attributes to their HTML
 # elements.
 require "middleman-more/extensions/automatic_image_sizes"
-Middleman::Extensions::AutomaticImageSizes.register
+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"
+Middleman::Extensions::AutomaticAltTags.register

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

@@ -11,6 +11,7 @@ module Middleman
         /^\.bundle\//,
         /^vendor\//,
         /^\.sass-cache\//,
+        /^\.cache\//,
         /^\.git\//,
         /^\.gitignore$/,
         /\.DS_Store/,

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

@@ -173,8 +173,8 @@ module Middleman
           })
         end
 
-        delegate :use, :to => :"self.class" 
-        delegate :map, :to => :"self.class" 
+        delegate :use, :to => :"self.class"
+        delegate :map, :to => :"self.class"
 
         # Rack request
         # @return [Rack::Request]
@@ -287,8 +287,6 @@ module Middleman
         end
 
         # Immediately send static file
-        #
-        # @param [String] path File to send
         def send_file(resource, env)
           file      = ::Rack::File.new nil
           file.path = resource.source_file

data/lib/middleman-core/extensions.rb

@@ -113,12 +113,20 @@ module Middleman
         config.define_setting(key, default, description)
       end
 
-      def helpers(&block)
+      # Add helpers to the global Middleman application.
+      # This accepts either a list of modules to add on behalf
+      # of this extension, or a block whose contents will all
+      # be used as helpers in a new module.
+      def helpers(*m, &block)
         self.defined_helpers ||= []
 
-        m = Module.new
-        m.module_eval(&block)
-        self.defined_helpers << m
+        if block
+          mod = Module.new
+          mod.module_eval(&block)
+          m = [mod]
+        end
+
+        self.defined_helpers += m
       end
 
       def extension_name
@@ -172,7 +180,7 @@ module Middleman
 
     def app=(app)
       @app = app
-      
+
       (self.class.defined_helpers || []).each do |m|
         app.class.send(:include, m)
       end

data/lib/middleman-core/meta_pages.rb

@@ -60,18 +60,28 @@ module Middleman
       # Inspect configuration
       def config(env)
         global_config = @middleman.inst.config.all_settings.map {|c| ConfigSetting.new(c) }
-        extension_config = Hash[@middleman.inst.extensions.map do |ext_name, extension|
-                                  opts = if extension.is_a?(::Middleman::Extension)
-                                           extension.options.all_settings.map {|c| ConfigSetting.new(c) }
-                                         else 
-                                           nil
-                                         end
-                                  [ext_name, opts]
-                                end]
-
-        template('config.html.erb', 
+        extension_config = {}
+
+        @middleman.inst.extensions.each do |ext_name, extension|
+          if extension.is_a?(Hash)
+            # Multiple instance extension
+            if extension.size == 1
+              extension_config[ext_name] = extension_options(extension.values.first)
+            else
+              extension.each do |inst, ext|
+                extension_config["#{ext_name} (#{inst})"] = extension_options(ext)
+              end
+            end
+          elsif extension.is_a?(::Middleman::Extension)
+            extension_config[ext_name] = extension_options(extension)
+          else
+            extension_config[ext_name] = nil
+          end
+        end
+
+        template('config.html.erb',
                  :global_config => global_config,
-                 :extension_config => extension_config, 
+                 :extension_config => extension_config,
                  :registered_extensions => Middleman::Extensions.registered.dup)
       end
 
@@ -88,6 +98,10 @@ module Middleman
       def response(content)
         [ 200, {"Content-Type" => "text/html"}, Array(content) ]
       end
+
+      def extension_options(extension)
+        extension.options.all_settings.map {|c| ConfigSetting.new(c) }
+      end
     end
   end
 end