middleman-more 3.0.0.beta.1 → 3.0.0.beta.2

data/Rakefile

@@ -2,4 +2,5 @@
 RAKE_ROOT = __FILE__
 
 require 'rubygems'
+GEM_NAME = "middleman-more"
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/features/asset_hash.feature

@@ -0,0 +1,84 @@
+Feature: Assets get a file hash appended to their and references to them are updated
+  Scenario: Hashed-asset files are produced, and HTML, CSS, and JavaScript gets rewritten to reference the new files
+    Given a successfully built app at "asset-hash-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | images/100px-1242c368.png |
+      | images/100px-5fd6fb90.jpg |
+      | images/100px-5fd6fb90.gif |
+      | javascripts/application-570e5d45.js |
+      | stylesheets/site-d9d84711.css |
+      | index.html |
+      | subdir/index.html |
+      | other/index.html |
+    And the following files should not exist:
+      | images/100px.png |
+      | images/100px.jpg |
+      | images/100px.gif |
+      | javascripts/application.js |
+      | stylesheets/site.css |
+      
+    And the file "javascripts/application-570e5d45.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
+    And the file "stylesheets/site-d9d84711.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
+    And the file "index.html" should contain 'href="stylesheets/site-d9d84711.css"'
+    And the file "index.html" should contain 'src="javascripts/application-570e5d45.js"'
+    And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
+    And the file "subdir/index.html" should contain 'href="../stylesheets/site-d9d84711.css"'
+    And the file "subdir/index.html" should contain 'src="../javascripts/application-570e5d45.js"'
+    And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
+    And the file "other/index.html" should contain 'href="../stylesheets/site-d9d84711.css"'
+    And the file "other/index.html" should contain 'src="../javascripts/application-570e5d45.js"'
+    And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
+    
+  Scenario: Hashed assets work in preview server
+    Given the Server is running at "asset-hash-app"
+    When I go to "/"
+    Then I should see 'href="stylesheets/site-d9d84711.css"'
+    And I should see 'src="javascripts/application-570e5d45.js"'
+    And I should see 'src="images/100px-5fd6fb90.jpg"'
+    When I go to "/subdir/"
+    Then I should see 'href="../stylesheets/site-d9d84711.css"'
+    And I should see 'src="../javascripts/application-570e5d45.js"'
+    And I should see 'src="../images/100px-5fd6fb90.jpg"'
+    When I go to "/other/"
+    Then I should see 'href="../stylesheets/site-d9d84711.css"'
+    And I should see 'src="../javascripts/application-570e5d45.js"'
+    And I should see 'src="../images/100px-5fd6fb90.jpg"'
+    When I go to "/javascripts/application-570e5d45.js"
+    Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
+    When I go to "/stylesheets/site-d9d84711.css"
+    Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
+
+  Scenario: Enabling an asset host still produces hashed files and references  
+    Given the Server is running at "asset-hash-host-app"
+    When I go to "/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-0ac82771.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    When I go to "/subdir/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-0ac82771.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    When I go to "/other/"
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-0ac82771.css"'
+    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+    # Asset helpers don't appear to work from Compass right now
+    # When I go to "/stylesheets/site-0ac82771.css"
+    # Then I should see "background-image: url('http://middlemanapp.com/images/100px-5fd6fb90.jpg')"
+
+  Scenario: The asset hash should change when a SASS or Sprockets partial changes
+    Given the Server is running at "asset-hash-app"
+    And the file "source/stylesheets/_partial.sass" has the contents
+      """
+      body
+        font-size: 14px
+      """
+    When I go to "/partials/"
+    Then I should see 'href="../stylesheets/uses_partials-e81dd9b4.css'
+    And the file "source/stylesheets/_partial.sass" has the contents
+      """
+      body
+        font-size: 18px !important
+      """
+    When I go to "/partials/"
+    Then I should see 'href="../stylesheets/uses_partials-ba3ef309.css'
+    

data/features/cache_buster.feature

@@ -5,22 +5,23 @@ Feature: Generate mtime-based query string for busting browser caches
     Given "cache_buster" feature is "disabled"
     And the Server is running at "cache-buster-app"
     When I go to "/stylesheets/relative_assets.css"
-    Then I should not see "?"
+    Then I should see "blank.gif'"
     
   Scenario: Rendering html with the feature disabled
     Given "cache_buster" feature is "disabled"
     And the Server is running at "cache-buster-app"
     When I go to "/cache-buster.html"
-    Then I should not see "?"
+    Then I should see 'site.css"'
 
   Scenario: Rendering css with the feature enabled
     Given "cache_buster" feature is "enabled"
     And the Server is running at "cache-buster-app"
     When I go to "/stylesheets/relative_assets.css"
-    Then I should see "?"
+    Then I should see "blank.gif?"
 
   Scenario: Rendering html with the feature enabled
     Given "cache_buster" feature is "enabled"
     And the Server is running at "cache-buster-app"
     When I go to "/cache-buster.html"
-    Then I should see "?"
+    Then I should see "site.css?"
+    Then I should see "blank.gif?"

data/features/coffee-script.feature

@@ -4,12 +4,12 @@ Feature: Support coffee-script
   Scenario: Rendering coffee script
     Given the Server is running at "coffeescript-app"
     When I go to "/javascripts/coffee_test.js"
-    Then I should see "Array.prototype.slice"
+    Then I should see ".slice"
 
   Scenario: Rendering coffee-script with :coffeescript haml-filter
     Given the Server is running at "coffeescript-app"
     When I go to "/inline-coffeescript.html"
-    Then I should see "Array.prototype.slice"
+    Then I should see ".slice"
   
   Scenario: Rendering broken coffee
     Given the Server is running at "coffeescript-app"

data/features/compass-sprites.feature

@@ -0,0 +1,6 @@
+Feature: Compass sprites should be generated on build and copied
+  Scenario: Building a clean site with sprites
+    Given a successfully built app at "compass-sprites-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | images/icon-s1a8aa64128.png |

data/features/gzip.feature

@@ -0,0 +1,21 @@
+Feature: GZIP assets during build
+
+  Scenario: Built assets should be gzipped
+    Given a successfully built app at "gzip-app"
+    Then the following files should exist:
+      | build/javascripts/test.js.gz |
+      | build/stylesheets/test.css.gz |
+      | build/index.html.gz |
+      | build/javascripts/test.js |
+      | build/stylesheets/test.css |
+      | build/index.html |
+    When I run `file build/javascripts/test.js.gz`
+    Then the output should contain "gzip"
+
+  Scenario: Preview server doesn't change
+    Given the Server is running at "gzip-app"
+    When I go to "/javascripts/test.js"
+    Then I should see "test_function"
+    When I go to "/stylesheets/test.css"
+    Then I should see "test_selector"
+   

data/features/minify_css.feature

@@ -1,19 +1,67 @@
 Feature: Minify CSS
   In order reduce bytes sent to client and appease YSlow
     
+  Background:
+    Given current environment is "build"
+
   Scenario: Rendering external css with the feature disabled
     Given "minify_css" feature is "disabled"
     And the Server is running at "minify-css-app"
     When I go to "/stylesheets/site.css"
-    Then I should see "55" lines
+    Then I should see "60" lines
+    And I should see "only screen and (device-width"
     
   Scenario: Rendering external css with the feature enabled
     Given "minify_css" feature is "enabled"
     And the Server is running at "minify-css-app"
     When I go to "/stylesheets/site.css"
     Then I should see "1" lines
+    And I should see "only screen and (device-width"
+    When I go to "/more-css/site.css"
+    Then I should see "1" lines    
     
   Scenario: Rendering external css with passthrough compressor
     Given the Server is running at "passthrough-app"
     When I go to "/stylesheets/site.css"
-    Then I should see "55" lines
+    Then I should see "55" lines
+
+  Scenario: Rendering inline css with the feature disabled
+    Given "minify_css" feature is "disabled"
+    And the Server is running at "minify-css-app"
+    When I go to "/inline-css.html"
+    Then I should see:
+    """
+    <style type='text/css'>
+      /*<![CDATA[*/
+        body {
+          test: style;
+          good: deal;
+        }
+      /*]]>*/
+    </style>
+    """
+   
+  Scenario: Rendering inline css with a passthrough minifier
+    Given the Server is running at "passthrough-app"
+    When I go to "/inline-css.html"
+    Then I should see:
+    """
+    <style type='text/css'>
+      body {
+        test: style;
+        good: deal; }
+    </style>
+    """
+
+  Scenario: Rendering inline css with the feature enabled
+    Given "minify_css" feature is "enabled"
+    And the Server is running at "minify-css-app"
+    When I go to "/inline-css.html"
+    Then I should see:
+    """
+    <style type='text/css'>
+      /*<![CDATA[*/
+     body{test:style;good:deal}
+      /*]]>*/
+    </style>
+    """

data/features/minify_javascript.feature

@@ -8,24 +8,106 @@ Feature: Minify Javascript
     Given "minify_javascript" feature is "disabled"
     And the Server is running at "minify-js-app"
     When I go to "/inline-js.html"
-    Then I should see "10" lines
+    Then I should see:
+    """
+    <script type='text/javascript'>
+      //<![CDATA[
+        ;(function() {
+          this;
+          should();
+          all.be();
+          on = { one: line };
+        })();
+      //]]>
+    </script>
+    <script>
+      ;(function() {
+        this;
+        should();
+        too();
+      })();
+    </script>
+    <script type='text/javascript'>
+      //<!--
+      ;(function() {
+        one;
+        line();
+        here();
+      })();
+      //-->
+    </script>
+    <script type='text/html'>
+      I'm a jQuery {{template}}.
+    </script>
+    """
     
   Scenario: Rendering inline js with a passthrough minifier
     Given the Server is running at "passthrough-app"
     When I go to "/inline-js.html"
-    Then I should see "11" lines
+    Then I should see:
+    """
+    <script type='text/javascript'>
+      //<![CDATA[
+        ;(function() {
+          this;
+          should();
+          all.be();
+          on = { one: line };
+        })();
+      //]]>
+    </script>
+    <script>
+      ;(function() {
+        this;
+        should();
+        too();
+      })();
+    </script>
+    <script type='text/javascript'>
+      //<!--
+      ;(function() {
+        one;
+        line();
+        here();
+      })();
+      //-->
+    </script>
+    <script type='text/html'>
+      I'm a jQuery {{template}}.
+    </script>
+    """
 
   Scenario: Rendering inline js with the feature enabled
     Given "minify_javascript" feature is "enabled"
     And the Server is running at "minify-js-app"
     When I go to "/inline-js.html"
-    Then I should see "5" lines
+    Then I should see:
+    """
+    <script type='text/javascript'>
+      //<![CDATA[
+    (function(){this,should(),all.be(),on={one:line}})();
+      //]]>
+    </script>
+    <script>
+      (function(){this,should(),too()})();
+    </script>
+    <script type='text/javascript'>
+      //<!--
+    (function(){one,line(),here()})();
+      //-->
+    </script>
+    <script type='text/html'>
+      I'm a jQuery {{template}}.
+    </script>
+    """
     
   Scenario: Rendering external js with the feature enabled
     Given "minify_javascript" feature is "enabled"
     And the Server is running at "minify-js-app"
     When I go to "/javascripts/js_test.js"
     Then I should see "1" lines
+    When I go to "/more-js/other.js"
+    Then I should see "1" lines
     
   Scenario: Rendering external js with a passthrough minifier
     And the Server is running at "passthrough-app"
@@ -36,7 +118,7 @@ Feature: Minify Javascript
     Given "minify_javascript" feature is "enabled"
     And the Server is running at "minify-js-app"
     When I go to "/inline-coffeescript.html"
-    Then I should see "5" lines
+    Then I should see "6" lines
   
   Scenario: Rendering external js (coffeescript) with the feature enabled
     Given "minify_javascript" feature is "enabled"
@@ -47,9 +129,10 @@ Feature: Minify Javascript
   Scenario: Rendering inline js (coffeescript) with a passthrough minifier
     Given the Server is running at "passthrough-app"
     When I go to "/inline-coffeescript.html"
-    Then I should see "17" lines
+    Then I should see "16" lines
     
   Scenario: Rendering external js (coffeescript) with a passthrough minifier
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/coffee_test.js"
-    Then I should see "11" lines
+    Then I should see "11" lines
+    

data/features/relative_assets.feature

@@ -1,12 +1,21 @@
 Feature: Relative Assets
   In order easily switch between relative and absolute paths
     
-  Scenario: Rendering css with the feature disabled
+  Scenario: Previewing css with the feature disabled
     Given "relative_assets" feature is "disabled"
     And the Server is running at "relative-assets-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should not see "url('../"
-    And I should see "/images/blank.gif"
+    And I should see "/images/blank.gif')"
+    
+  Scenario: Building css with the feature disabled
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      """
+    Given a successfully built app at "relative-assets-app"
+    When I cd to "build"
+    Then the file "stylesheets/relative_assets.css" should contain "url('/images/blank.gif')"
     
   Scenario: Rendering html with the feature disabled
     Given "relative_assets" feature is "disabled"
@@ -20,6 +29,27 @@ Feature: Relative Assets
     When I go to "/stylesheets/relative_assets.css"
     Then I should see "url('../images/blank.gif"
     
+  Scenario: Building css with the feature enabled
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets
+      """
+    Given a successfully built app at "relative-assets-app"
+    When I cd to "build"
+    Then the file "stylesheets/relative_assets.css" should contain "url('../images/blank.gif')"
+    
+  Scenario: Relative css reference with directory indexes
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :directory_indexes
+      activate :relative_assets
+      """
+    Given a successfully built app at "relative-assets-app"
+    When I cd to "build"
+    Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css"
+    
   Scenario: Rendering html with the feature enabled
     Given "relative_assets" feature is "enabled"
     And the Server is running at "relative-assets-app"
@@ -27,14 +57,25 @@ Feature: Relative Assets
     Then I should not see "/images/blank.gif"
     And I should see "images/blank.gif"
     
-  Scenario: Rendering html with a custom images_dir
+  Scenario: Rendering css with a custom images_dir
     Given "relative_assets" feature is "enabled"
     And "images_dir" is set to "img"
     And the Server is running at "relative-assets-app"
     When I go to "/stylesheets/relative_assets.css"
-    Then I should see "url('../img/blank.gif"
+    Then I should see "url('../img/blank.gif')"
     
-  Scenario: Rendering css with a custom images_dir
+  Scenario: Building css with a custom images_dir
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      set :images_dir, "img"
+      activate :relative_assets
+      """
+    Given a successfully built app at "relative-assets-app"
+    When I cd to "build"
+    Then the file "stylesheets/relative_assets.css" should contain "url('../img/blank.gif')"
+    
+  Scenario: Rendering html with a custom images_dir
     Given "relative_assets" feature is "enabled"
     And "images_dir" is set to "img"
     And the Server is running at "relative-assets-app"
@@ -47,4 +88,4 @@ Feature: Relative Assets
     Given "relative_assets" feature is "enabled"
     And the Server is running at "fonts-app"
     When I go to "/stylesheets/fonts.css"
-    Then I should see "url('../fonts/StMarie"
+    Then I should see "url('../fonts/StMarie-Thin.otf"