Merge pull request #914 from krautcomputing/replace_data_page_with_current_page_data

Replace all occurrences of data.page with current_page.data

middleman-core/features/front-matter-neighbor.feature

@@ -17,7 +17,7 @@ Feature: Neighboring YAML Front Matter
   Scenario: Rendering raw (template-less) (yaml)
     Given the Server is running at "frontmatter-neighbor-app"
     When I go to "/raw-front-matter.html"
-    Then I should see "<h1><%= data.page.title %></h1>"
+    Then I should see "<h1><%= current_page.data.title %></h1>"
     Then I should not see "---"
     When I go to "/raw-front-matter.html.frontmatter"
     Then I should see "File Not Found"
@@ -59,7 +59,7 @@ Feature: Neighboring YAML Front Matter
     Given the Server is running at "frontmatter-neighbor-app"
     And the file "source/front-matter-change.html.erb" has the contents
       """
-      <%= data.page.title %>
+      <%= current_page.data.title %>
       """
     And the file "source/front-matter-change.html.erb.frontmatter" has the contents
       """

middleman-core/features/front-matter.feature

@@ -14,7 +14,7 @@ Feature: YAML Front Matter
   Scenario: Rendering raw (template-less) (yaml)
     Given the Server is running at "frontmatter-app"
     When I go to "/raw-front-matter.html"
-    Then I should see "<h1><%= data.page.title %></h1>"
+    Then I should see "<h1><%= current_page.data.title %></h1>"
     Then I should not see "---"
     When I go to "/raw-front-matter.php"
     Then I should see '<?php echo "sup"; ?>'
@@ -66,7 +66,7 @@ Feature: YAML Front Matter
       title: Hello World
       layout: false
       ---
-      <%= data.page.title %>
+      <%= current_page.data.title %>
       """
     When I go to "/front-matter-change.html"
     Then I should see "Hello World"
@@ -76,7 +76,7 @@ Feature: YAML Front Matter
       title: Hola Mundo
       layout: false
       ---
-      <%= data.page.title %>
+      <%= current_page.data.title %>
       """
     When I go to "/front-matter-change.html"
     Then I should see "Hola Mundo"

middleman-core/fixtures/chained-app/source/index.html.str.erb

@@ -5,4 +5,4 @@ sup: "Sup"
 
 <h1>#{"<%= data.article.title %>"}</h1>
 <h2>#{"<%= data.article.subtitle %>"}</h2>
-<h3>#{"<%= data.page.sup %>"}</h3>
+<h3>#{"<%= current_page.data.sup %>"}</h3>

middleman-core/fixtures/frontmatter-app/source/front-matter-2.php.erb

@@ -3,5 +3,5 @@ layout: false
 title: This is the title
 ---
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>
 <?php echo "sup"; ?>

middleman-core/fixtures/frontmatter-app/source/front-matter-auto.erb

@@ -3,4 +3,4 @@ layout: false
 title: This is the title
 ---
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-app/source/front-matter-change.html.erb

@@ -2,4 +2,4 @@
 title: Hola Mundo
 layout: false
 ---
-<%= data.page.title %>
+<%= current_page.data.title %>

middleman-core/fixtures/frontmatter-app/source/front-matter-encoding.html.erb

@@ -4,4 +4,4 @@ layout: false
 title: This is the title
 ---
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-app/source/front-matter-line-2.html.erb

@@ -4,4 +4,4 @@ layout: false
 title: This is the title
 ---
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-app/source/json-front-matter-2.php.erb

@@ -3,5 +3,5 @@
   "title":  "This is the title"
 ;;;
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>
 <?php echo "sup"; ?>

middleman-core/fixtures/frontmatter-app/source/json-front-matter-auto.erb

@@ -3,4 +3,4 @@
   "title":  "This is the title"
 ;;;
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb

@@ -4,4 +4,4 @@
 "title": "This is the title"
 ;;;
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb

@@ -4,4 +4,4 @@ layout: false,
 title: "This is the title"
 ;;;
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-app/source/json-front-matter.html.erb

@@ -3,4 +3,4 @@
   "title":  "This is the title"
 ;;;
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-app/source/raw-front-matter.html

@@ -3,4 +3,4 @@ layout: false
 title: This is the title
 ---
 
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-2.php.erb

@@ -1,2 +1,2 @@
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>
 <?php echo "sup"; ?>

middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb

@@ -1 +1 @@
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-change.html.erb

@@ -1 +1 @@
-<%= data.page.title %>
+<%= current_page.data.title %>

middleman-core/fixtures/frontmatter-neighbor-app/source/front-matter-encoding.html.erb

@@ -1 +1 @@
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb

@@ -1,2 +1,2 @@
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>
 <?php echo "sup"; ?>

middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb

@@ -1 +1 @@
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb

@@ -1 +1 @@
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/frontmatter-neighbor-app/source/raw-front-matter.html

@@ -1 +1 @@
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>

middleman-core/fixtures/nested-layout-app/source/layouts/master.erb

@@ -1,3 +1,3 @@
 Master
-<h1><%= data.page.title %></h1>
+<h1><%= current_page.data.title %></h1>
 <%= yield %>

middleman-core/fixtures/nested-layout-app/source/layouts/master_haml.haml

@@ -1,3 +1,3 @@
 Master
-%h1= data.page.title
+%h1= current_page.data.title
 = yield

middleman-core/fixtures/nested-layout-app/source/layouts/master_slim.slim

@@ -1,3 +1,3 @@
 h1 Master
-p== data.page.title
+p== current_page.data.title
 div== yield