middleman-core 3.1.0.rc.1 → 3.1.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e40df8cb66fd2ae88e80198382cc84972e0e429
-  data.tar.gz: 17f92284191312808e9eeaade8cd2729aa163700
+  metadata.gz: f0268514dc3abe13da04e0bfd4bb14b5817ba45a
+  data.tar.gz: 7727d4051f853d8ef84b2212c6092e6ad5e71991
 SHA512:
-  metadata.gz: cab5e84751490941fde3dedad1ec279364a9f56c7bcf9110405eba53683b26022ce3d69fc54f053e664b14a2434c3e8a3ccd988bf31ae720e0ad054c94c2c211
-  data.tar.gz: b0fa568aa63304d35b56a6803a49871ec74af6e81708b09f93e434ac1c829b2ea9c4957bdeb1b721bd468fbe36fb5d35de5b25873abad5c6bfa394132f5e8632
+  metadata.gz: 2668ab06a6cad5a214691da0310e7ad6fb0329753c8f8f5b7fcb6150d256c3cdfd5a952e15d1fe5ddb1d90d3397a15c00683975fe97bbbb386b2d6d1fc6b3baf
+  data.tar.gz: f4b5d70c1e7507abe9f4fbecea9de575609697f611fd0e907edeb912b539ef09e87c419d247464fcb2c61e9fb3aa3a085e1534e32ba47dd12ae9a621f977aa52

data/.simplecov

@@ -0,0 +1,6 @@
+SimpleCov.start do
+  add_filter '/features/'
+  add_filter '/spec/'
+  add_filter '/vendor'
+  add_filter '/step_definitions/'
+end

data/features/clean_build.feature

@@ -17,11 +17,28 @@ Feature: Build Clean
     And the file "build/index.html" should contain "Comment in layout"
 
   Scenario: Clean build an app with newly ignored files and a nested output directory
+    Given a fixture app "clean-nested-app"
+    When a file named "config.rb" with:
+      """
+      set :build_dir, "sub/dir"
+      """
     Given a built app at "clean-nested-app" with flags "--no-clean"
     Then a directory named "sub/dir" should exist
+    Then the following directories should exist:
+      | sub/dir                    |
+      | sub/dir/nested             |
     Then the following files should exist:
-      | sub/dir/about.html        |
-    When I append to "config.rb" with "ignore 'about.html'"
+      | sub/dir/about.html         |
+      | sub/dir/nested/nested.html |
+    When a file named "config.rb" with:
+      """
+      set :build_dir, "sub/dir"
+      ignore 'about.html'
+      ignore 'nested/*'
+      """
     Given a built app at "clean-nested-app"
+    Then the following directories should not exist:
+      | sub/dir/nested             |
     Then the following files should not exist:
-      | sub/dir/about.html        |
+      | sub/dir/about.html         |
+      | sub/dir/nested/nested.html |

data/features/custom-source.feature

@@ -0,0 +1,7 @@
+Feature: Support customizing the source directory name
+
+  Scenario: Layouts don't try to build
+    Given a successfully built app at "custom-src-app"
+    When I cd to "build"
+    Then the following files should not exist:
+      | layouts/layout.html |

data/features/data.feature

@@ -5,11 +5,35 @@ Feature: Local Data API
     Given the Server is running at "basic-data-app"
     When I go to "/data.html"
     Then I should see "One:Two"
+    When the file "data/test.yml" has the contents
+      """
+      -
+        title: "Three"
+      -
+        title: "Four"
+      """
+    When I go to "/data.html"
+    Then I should see "Three:Four"
+    When the file "data/test.yml" is removed
+    When I go to "/data.html"
+    Then I should see "No Test Data"
 
   Scenario: Rendering json
     Given the Server is running at "basic-data-app"
     When I go to "/data3.html"
     Then I should see "One:Two"
+    When the file "data/test2.json" has the contents
+      """
+      [
+        { "title": "Three" },
+        { "title": "Four" }
+      ]
+      """
+    When I go to "/data3.html"
+    Then I should see "Three:Four"
+    When the file "data/test2.json" is removed
+    When I go to "/data3.html"
+    Then I should see "No Test Data"
 
   Scenario: Using data in config.rb
     Given the Server is running at "data-app"
@@ -24,4 +48,6 @@ Feature: Local Data API
   Scenario: Using nested data
     Given the Server is running at "nested-data-app"
     When I go to "/test.html"
-    Then I should see "test:Hello"
+    Then I should see "title1:Hello"
+    Then I should see "title2:More"
+    Then I should see "title3:Stuff"

data/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
       """

data/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"

data/features/i18n_builder.feature

@@ -13,9 +13,11 @@ Feature: i18n Builder
       | index.html                                    |
       | hello.html                                    |
       | morning.html                                  |
+      | one.html                                      |
       | es/index.html                                 |
       | es/hola.html                                  |
       | es/manana.html                                |
+      | es/una.html                                   |
       | CNAME                                         |
       | password.txt                                  |
     Then the following files should not exist:
@@ -23,9 +25,11 @@ Feature: i18n Builder
     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"
     And the file "es/index.html" should contain "Como Esta?"
     And the file "es/hola.html" should contain "Hola World"
     And the file "es/manana.html" should contain "Buenos días"
+    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"
     
@@ -145,4 +149,4 @@ Feature: i18n Builder
     And the file "index.html" should contain '"stylesheets/site.css"'
     And the file "hello.html" should contain '"stylesheets/site.css"'
     And the file "es/index.html" should contain '"../stylesheets/site.css"'
-    And the file "es/hola.html" should contain '"../stylesheets/site.css"'
+    And the file "es/hola.html" should contain '"../stylesheets/site.css"'

data/features/i18n_preview.feature

@@ -14,6 +14,8 @@ Feature: i18n Preview
     Then I should see "Hello World"
     When I go to "/morning.html"
     Then I should see "Good morning"
+    When I go to "/one.html"
+    Then I should see "Only one"
     When I go to "/en/index.html"
     Then I should see "File Not Found"
     When I go to "/en/morning.html"
@@ -24,6 +26,8 @@ Feature: i18n Preview
     Then I should see "Hola World"
     When I go to "/es/manana.html"
     Then I should see "Buenos días"
+    When I go to "/es/una.html"
+    Then I should see "Solamente una"
 
   Scenario: A template changes i18n during preview
     Given a fixture app "i18n-test-app"
@@ -228,3 +232,17 @@ Feature: i18n Preview
     Then I should see "Current locale: en"
     Then I should see "Buenos días"
     Then I should see "Howdy"
+
+  Scenario: Nested i18n yaml
+    Given a fixture app "i18n-nested-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n
+      """
+    Given the Server is running at "i18n-nested-app"
+    When I go to "/"
+    Then I should see "Howdy"
+    Then I should see "More"
+    When I go to "/es/"
+    Then I should see "Como Esta?"
+    Then I should see "Mucho"

data/features/layouts_dir.feature

@@ -0,0 +1,30 @@
+Feature: Layouts dir
+  Scenario: Find layouts in a custom layouts dir
+    Given a fixture app "layouts-dir-app"
+    And a file named "config.rb" with:
+    """
+    set :layouts_dir, 'layouts2'
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see "contents of the custom layout"
+
+  Scenario: Find layouts in a nested custom layouts dir
+    Given a fixture app "layouts-dir-app"
+    And a file named "config.rb" with:
+    """
+    set :layouts_dir, 'nested/layouts2'
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see "contents of the nested layout"
+
+  Scenario: Find layouts in the default layouts dir
+    Given a fixture app "layouts-dir-app"
+    And a file named "config.rb" with:
+    """
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see "contents of the layout"
+

data/features/minify_javascript.feature

@@ -133,14 +133,14 @@ Feature: Minify Javascript
     Then I should see:
     """
     <script>
-      (function(){should(),all.be(),on={one:line}})();
+      !function(){should(),all.be(),on={one:line}}();
     </script>
     <script>
-      (function(){should(),too()})();
+      !function(){should(),too()}();
     </script>
     <script type='text/javascript'>
       //<!--
-    (function(){line(),here()})();
+    !function(){line(),here()}();
       //-->
     </script>
     <script type='text/html'>

data/features/support/env.rb

@@ -1,6 +1,12 @@
 ENV["TEST"] = "true"
 ENV["AUTOLOAD_SPROCKETS"] = "false"
 
+require 'simplecov'
+SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
+
+require 'coveralls'
+Coveralls.wear!
+
 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/basic-data-app/source/data.html.erb

@@ -1 +1,5 @@
-<%= data.test.map { |r| r.title }.join(":") %>
+<% if data.respond_to?(:test) %>
+  <%= data.test.map { |r| r.title }.join(":") %>
+<% else %>
+  No Test Data
+<% end %>

data/fixtures/basic-data-app/source/data3.html.erb

@@ -1 +1,5 @@
-<%= data.test2.map { |r| r.title }.join(":") %>
+<% if data.respond_to?(:test2) %>
+  <%= data.test2.map { |r| r.title }.join(":") %>
+<% else %>
+  No Test Data
+<% end %>

data/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>

data/fixtures/clean-nested-app/config.rb

@@ -1,3 +1 @@
-set :build_dir, "sub/dir"
-
-
+set :build_dir, "sub/dir"

data/fixtures/clean-nested-app/source/nested/nested.html

@@ -0,0 +1 @@
+Hi

data/fixtures/custom-src-app/config.rb

@@ -0,0 +1 @@
+set :source, 'src'

data/fixtures/custom-src-app/src/layouts/layout.html.erb

@@ -0,0 +1 @@
+<%= yield %>

data/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>
-<?php echo "sup"; ?>
+<h1><%= current_page.data.title %></h1>
+<?php echo "sup"; ?>

data/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>

data/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 %>

data/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>

data/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>

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

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

data/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>

data/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>

data/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>

data/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>

data/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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/fixtures/i18n-nested-app/locales/en/more.yml

@@ -0,0 +1,3 @@
+---
+en:
+  more: "More"

data/fixtures/i18n-nested-app/locales/en.yml

@@ -0,0 +1,4 @@
+---
+en:
+  greetings: "Howdy"
+  hi: "Hello"

data/fixtures/i18n-nested-app/locales/es/mucho.yml

@@ -0,0 +1,3 @@
+---
+es:
+  more: "Mucho"

data/fixtures/i18n-nested-app/locales/es.yml

@@ -0,0 +1,4 @@
+---
+es:
+  greetings: "Como Esta?"
+  hi: "Hola"

data/fixtures/i18n-nested-app/source/localizable/index.html.erb

@@ -0,0 +1,3 @@
+<%= t(:greetings) %>
+
+<%= t(:more) %>

data/fixtures/i18n-test-app/locales/es.yml

@@ -3,6 +3,7 @@ es:
   paths:
     hello: "hola"
     morning: "manana"
+    one: "una"
   
   greetings: "Como Esta?"
   hi: "Hola"

data/fixtures/i18n-test-app/source/one.en.md

@@ -0,0 +1 @@
+Only one

data/fixtures/i18n-test-app/source/one.es.md

@@ -0,0 +1 @@
+Solamente una

data/fixtures/layouts-dir-app/source/index.html.erb

@@ -0,0 +1,2 @@
+
+Hello

data/fixtures/layouts-dir-app/source/layouts/layout.erb

@@ -0,0 +1,3 @@
+contents of the layout
+
+<%= yield %>

data/fixtures/layouts-dir-app/source/layouts2/layout.erb

@@ -0,0 +1,3 @@
+contents of the custom layout
+
+<%= yield %>

data/fixtures/layouts-dir-app/source/nested/layouts2/layout.erb

@@ -0,0 +1,3 @@
+contents of the nested layout
+
+<%= yield %>

data/fixtures/nested-data-app/data/examples/deeper/stuff.yml

@@ -0,0 +1 @@
+title: "Stuff"

data/fixtures/nested-data-app/data/examples/more.yml

@@ -0,0 +1 @@
+title: "More"

data/fixtures/nested-data-app/source/test.html.erb

@@ -1 +1,3 @@
-<%= data.examples.map { |k, r| [k, r.title].join(":") }.join %>
+title1:<%= data.examples.test.title %>
+title2:<%= data.examples.more.title %>
+title3:<%= data.examples.deeper.stuff.title %>

data/fixtures/nested-layout-app/source/layouts/master.erb

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

data/fixtures/nested-layout-app/source/layouts/master_haml.haml

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

data/fixtures/nested-layout-app/source/layouts/master_slim.slim

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

data/lib/middleman-core/application.rb

@@ -1,18 +1,21 @@
 # Using Tilt for templating
 require "tilt"
 
+# i18n Built-in
+require "i18n"
+
 # Use ActiveSupport JSON
 require "active_support/json"
 require "active_support/core_ext/integer/inflections"
 require "active_support/core_ext/float/rounding"
 
 # Simple callback library
-require "middleman-core/vendor/hooks-0.2.0/lib/hooks"
+require "vendored-middleman-deps/hooks-0.2.0/lib/hooks"
 
 require "middleman-core/sitemap"
 
-require "middleman-core/core_extensions"
 require "middleman-core/configuration"
+require "middleman-core/core_extensions"
 
 # Core Middleman Class
 module Middleman
@@ -94,6 +97,10 @@ module Middleman
     # @return [String]
     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'
+
     # Where to build output files
     # @return [String]
     config.define_setting :build_dir,   "build", 'Where to build output files'
@@ -167,7 +174,7 @@ module Middleman
     # @private
     # @return [Middleman::Util::Cache] The cache
     def self.cache
-      @_cache ||= ::Middleman::Util::Cache.new
+      @_cache ||= ::Tilt::Cache.new
     end
     delegate :cache, :to => :"self.class"
 
@@ -220,3 +227,13 @@ module Middleman
 
   end
 end
+
+Middleman::CoreExtensions::DefaultHelpers.activate
+
+Middleman::CoreExtensions::Internationalization.register(:i18n)
+
+if defined?(Middleman::CoreExtensions::Compass)
+  Middleman::CoreExtensions::Compass.activate
+end
+
+Middleman::Extensions::Lorem.activate

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

@@ -205,17 +205,14 @@ module Middleman::Cli
     # Remove files which were not built in this cycle
     # @return [void]
     def clean!
-      files       = @cleaning_queue.select { |q| q.file? }
-      directories = @cleaning_queue.select { |q| q.directory? }
-
-      files.each do |f|
+      @cleaning_queue.select { |q| q.file? }.each do |f|
         base.remove_file f, :force => true
       end
 
-      directories = directories.sort_by {|d| d.to_s.length }.reverse!
-
-      directories.each do |d|
-        base.remove_file d, :force => true if directory_empty? d
+      Dir[File.join(@destination, "**", "*")].select { |d|
+        File.directory?(d)
+      }.each do |d|
+        base.remove_file d, :force => true if directory_empty? Pathname(d)
       end
     end
 

data/lib/middleman-core/configuration.rb

@@ -127,7 +127,7 @@ module Middleman
       def method_missing(method, *args)
         if defines_setting?(method) && args.size == 0
           self[method]
-        elsif method =~ /^(\w+)=$/ && args.size == 1
+        elsif method.to_s =~ /^(\w+)=$/ && args.size == 1
           self[$1.to_sym] = args[0]
         else
           super