middleman-core 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 955d0ea89728b170a8a5e7b94dadbf9c7e848ac05c41ee69e8d6932e531c6d45
-  data.tar.gz: 1c59256a26b181e745b0a263514411c61aa6887fff9c293b5a9dba0ebb10f665
+  metadata.gz: 4f75b57d4f7b5046290d41e0748282ab8fa02a2b230be9fb5045242432f2a72d
+  data.tar.gz: 4aba8ff90a5e723281990b3a1a7341509c1aa8891d231ecc3fe3ad39de29c7e9
 SHA512:
-  metadata.gz: 6a7956f26e7c55806f06ab7dc18e5fb544f3f91a43b814011edb5aecec5fa0d9124cd873b402a04d65edabba4f0d3f32750d963be889d3379a0f17bb1356428a
-  data.tar.gz: a6f6e1038e04ea990628b2a6a62b59fdfb4da77acfa46f49a07ac3774c2f706c1ff7366a1f745e0a70ccd1dbe4f18ad276664a616bb05da4f0033186b3fe292e
+  metadata.gz: 3e63cf33f58076d4b2d8ebcaf7803157236a86443e273ea0400d93aa6a8456c7e641ca0552a6ed9197f3494ba045dd22c8fafef293f6aad5273d1bc9cc8cc5b6
+  data.tar.gz: d2012044ebe3eaf1aaba82208b945d03fc18bc9830373cc5603242bc90eef9183c852ad0c7e2cf2ad6e047b7eace0c14228ca77e152c32579d34f9e5d4cfe393

data/.simplecov

@@ -2,6 +2,4 @@ SimpleCov.configure do
   add_filter '/fixtures/'
   add_filter '/features/'
   add_filter '/spec/'
-  add_filter '/step_definitions/'
-  add_filter '/lib/vendored-middleman-deps/'
 end

data/.yardopts

@@ -1,6 +1,5 @@
 lib/**/*.rb
---exclude lib/vendored-middleman-deps/
 --exclude lib/middleman-core/step_definitions
 --no-private
 --hide-void-return
---markup=markdown
+--markup=markdown

data/Rakefile

@@ -1,3 +1,3 @@
 RAKE_ROOT = __FILE__.freeze
 GEM_NAME = ENV['NAME'] || 'middleman-core'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require File.expand_path("#{File.dirname(__FILE__)}/../gem_rake_helper")

data/features/builder.feature

@@ -55,7 +55,7 @@ Feature: Builder
   Scenario: Builded text file(ex: html, css, xml, txt)'s permission is 0644
     Given a successfully built app at "large-build-app"
     When I cd to "build"
-    Then the mode of filesystem object "index.html" should match "0644"
-    And the mode of filesystem object "stylesheets/static.css" should match "0644"
-    And the mode of filesystem object "feed.xml" should match "0644"
-    And the mode of filesystem object ".htaccess" should match "0644"
+    Then the file named "index.html" should have permissions "0644"
+    And the file named "stylesheets/static.css" should have permissions "0644"
+    And the file named "feed.xml" should have permissions "0644"
+    And the file named ".htaccess" should have permissions "0644"

data/features/content_type.feature

@@ -7,7 +7,7 @@ Feature: Setting the right content type for files
     When I go to "/images/blank.gif"
     Then the content type should be "image/gif"
     When I go to "/javascripts/app.js"
-    Then the content type should be "application/javascript"
+    Then the content type should be "text/javascript"
     When I go to "/stylesheets/site.css"
     Then the content type should be "text/css"
     When I go to "/README"

data/features/data.feature

@@ -83,6 +83,11 @@ Feature: Local Data API
     Then I should see "title2:More"
     Then I should see "title3:Stuff"
 
+  Scenario: Using data with aliases
+    Given the Server is running at "data-with-aliases-app"
+    When I go to "/test1.html"
+    Then I should see "Welcome"
+
   Scenario: Using data postscript
     Given the Server is running at "nested-data-app"
     When I go to "/extracontent.html"

data/features/front-matter.feature

@@ -80,6 +80,27 @@ Feature: YAML Front Matter
     When I go to "/front-matter-change.html"
     Then I should see "Hello World"
 
+  Scenario: A template should handle YAML with types
+    Given the Server is running at "frontmatter-app"
+    And the file "source/front-matter-types.html.erb" has the contents
+      """
+      ---
+      date_matter: 2020-01-01
+      time_matter: 2020-12-31 13:14:15 +0000
+      symbol_matter: :a_symbol
+      regexp_matter: !ruby/regexp /a|b/
+      ---
+      Date: <%= current_page.data.date_matter.strftime('%d %m %Y') %>
+      Time: <%= current_page.data.time_matter.strftime('%d %m %Y %H::%M::%S %z') %>
+      Symbol: <%= current_page.data.symbol_matter.is_a? Symbol %>
+      Regexp: <%= "za" =~ current_page.data.regexp_matter %>
+      """
+    When I go to "/front-matter-types.html"
+    Then I should see "Date: 01 01 2020"
+    Then I should see "Time: 31 12 2020 13::14::15 +0000"
+    Then I should see "Symbol: true"
+    Then I should see "Regexp: 1"
+
   Scenario: Rendering raw (template-less) (toml)
     Given the Server is running at "frontmatter-app"
     When I go to "/raw-front-matter-toml.html"

data/features/minify_javascript.feature

@@ -19,23 +19,23 @@ Feature: Minify Javascript
       })();
     </script>
     <script>
-      ;(function() {
-        this;
-        should();
-        too();
-      })();
+    ;(function() {
+      this;
+      should();
+      too();
+    })();
     </script>
     <script type='text/javascript'>
-      //<!--
-      ;(function() {
-        one;
-        line();
-        here();
-      })();
-      //-->
+    //<!--
+    ;(function() {
+      one;
+      line();
+      here();
+    })();
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -66,23 +66,23 @@ Feature: Minify Javascript
       })();
     </script>
     <script>
-      ;(function() {
-        this;
-        should();
-        too();
-      })();
+    ;(function() {
+      this;
+      should();
+      too();
+    })();
     </script>
     <script type='text/javascript'>
-      //<!--
-      ;(function() {
-        one;
-        line();
-        here();
-      })();
-      //-->
+    //<!--
+    ;(function() {
+      one;
+      line();
+      here();
+    })();
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -108,15 +108,15 @@ Feature: Minify Javascript
       Hello
     </script>
     <script>
-      Hello
+    Hello
     </script>
     <script type='text/javascript'>
-      //<!--
+    //<!--
     Hello
-      //-->
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -131,18 +131,18 @@ Feature: Minify Javascript
     Then I should see:
     """
     <script>
-      !function(){should(),all.be(),on={one:line}}();
+      should(),all.be(),on={one:line};
     </script>
     <script>
-      !function(){should(),too()}();
+    should(),too();
     </script>
     <script type='text/javascript'>
-      //<!--
-    !function(){one,line(),here()}();
-      //-->
+    //<!--
+    one,line(),here();
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -159,11 +159,11 @@ Feature: Minify Javascript
     <?='Hello'?>
 
     <script>
-      !function(){should(),all.be(),on={one:line}}();
+      should(),all.be(),on={one:line};
     </script>
     <script type='text/javascript'>
       //<!--
-    !function(){one,line(),here()}();
+    one,line(),here();
       //-->
     </script>
     <script type='text/html'>
@@ -263,4 +263,3 @@ Feature: Minify Javascript
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "11" lines
-

data/features/preview_changes.feature

@@ -27,3 +27,14 @@ Feature: Preview Changes
     And the file "source/a-page.html.erb" is removed
     When I go to "/a-page.html"
     Then I should see "File Not Found"
+
+  Scenario: A template with apostrophe is reloaded during preview
+    Given the Server is running at "preview-app"
+    And the file "source/a-page.html.erb" has the contents
+      """
+      Matz's Ruby Interpreter
+      """
+    When I go to "/a-page.html"
+    Then I should see "Matz's Ruby Interpreter"
+    When I go to "/a-page.html"
+    Then I should see "Matz's Ruby Interpreter"

data/features/sass_in_slim.feature

@@ -15,7 +15,7 @@ Feature: Sass/SCSS support in Slim
       """
     Given the Server is running at "sass-in-slim-app"
     When I go to "/sass_filter/"
-    Then I should see "text/css"
+    Then I should see "<style>"
     Then I should see ".sass"
     Then I should see "margin:0"
 
@@ -35,6 +35,6 @@ Feature: Sass/SCSS support in Slim
       """
     Given the Server is running at "sass-in-slim-app"
     When I go to "/scss_filter/"
-    Then I should see "text/css"
+    Then I should see "<style>"
     Then I should see ".scss"
     Then I should see "margin:0"

data/features/support/env.rb

@@ -7,6 +7,14 @@ SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
 SimpleCov.start
 
+require "rspec"
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.max_formatted_output_length = nil
+  end
+end
+
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core', 'step_definitions')

data/fixtures/data-with-aliases-app/config.rb

@@ -0,0 +1,3 @@
+data.pages.each do |p|
+  proxy p.from, p.to, locals: { content: p.content }
+end

data/fixtures/data-with-aliases-app/data/pages.yml

@@ -0,0 +1,9 @@
+-
+  from: "/test1.html"
+  to:   "/index.html"
+  content: &greeting 'Welcome'
+
+-
+  from: "/test2.html"
+  to:   "/index.html"
+  content: *greeting

data/fixtures/data-with-aliases-app/source/index.html.erb

@@ -0,0 +1 @@
+<p><%= content %></p>

data/fixtures/data-with-aliases-app/source/layout.erb

@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <%= yield %>
+  </body>
+</html>