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

data/features/asset_hash.feature

@@ -7,8 +7,8 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | images/100px-1242c368.png |
       | images/100px-5fd6fb90.jpg |
       | images/100px-5fd6fb90.gif |
-      | javascripts/application-570e5d45.js |
-      | stylesheets/site-d9d84711.css |
+      | javascripts/application-df677242.js |
+      | stylesheets/site-ed8c2d12.css |
       | index.html |
       | subdir/index.html |
       | other/index.html |
@@ -19,50 +19,50 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | 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 "javascripts/application-df677242.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
+    And the file "stylesheets/site-ed8c2d12.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
+    And the file "index.html" should contain 'href="stylesheets/site-ed8c2d12.css"'
+    And the file "index.html" should contain 'src="javascripts/application-df677242.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 'href="../stylesheets/site-ed8c2d12.css"'
+    And the file "subdir/index.html" should contain 'src="../javascripts/application-df677242.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 'href="../stylesheets/site-ed8c2d12.css"'
+    And the file "other/index.html" should contain 'src="../javascripts/application-df677242.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"'
+    Then I should see 'href="stylesheets/site-ed8c2d12.css"'
+    And I should see 'src="javascripts/application-df677242.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"'
+    Then I should see 'href="../stylesheets/site-ed8c2d12.css"'
+    And I should see 'src="../javascripts/application-df677242.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"'
+    Then I should see 'href="../stylesheets/site-ed8c2d12.css"'
+    And I should see 'src="../javascripts/application-df677242.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
-    When I go to "/javascripts/application-570e5d45.js"
+    When I go to "/javascripts/application-df677242.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-d9d84711.css"
+    When I go to "/stylesheets/site-ed8c2d12.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"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e5a31a3e.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"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e5a31a3e.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"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e5a31a3e.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"
+    # When I go to "/stylesheets/site-e5a31a3e.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
@@ -73,12 +73,12 @@ Feature: Assets get a file hash appended to their and references to them are upd
         font-size: 14px
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-e81dd9b4.css'
+    Then I should see 'href="../stylesheets/uses_partials-8b948098.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'
+    Then I should see 'href="../stylesheets/uses_partials-1f9f0ed2.css'
     

data/features/ignore_already_minified.feature

@@ -1,12 +1,47 @@
 Feature: CSS and Javascripts which are minify shouldn't be re-minified
-  Scenario: CSS file
-  
+
   Scenario: JS files containing ".min" should not be re-compressed
-    And the Server is running at "already-minified-app"
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript
+      """
+    And a file named "source/javascripts/test.min.js" with:
+      """
+      var numbers = [ 1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10 ];
+      """
+    And the Server is running at "empty_app"
     When I go to "/javascripts/test.min.js"
     Then I should see "10" lines
     
   Scenario: CSS files containing ".min" should not be re-compressed
-    And the Server is running at "already-minified-app"
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      activate :minify_css
+      """
+    And a file named "source/stylesheets/test.min.css" with:
+      """
+      body { one: 1;
+        two: 2;
+        three: 3;
+        four: 4;
+        five: 5;
+        six: 6;
+        seven: 7;
+        eight: 8;
+        nine: 9; 
+        ten: 10; }
+      """
+    And the Server is running at "empty_app"
     When I go to "/stylesheets/test.min.css"
     Then I should see "10" lines

data/features/markdown.feature

@@ -6,22 +6,13 @@ Feature: Markdown support
     When I go to "/index.html"
     Then I should see "<p>Hello World</p>"
   
-  Scenario: Redcarpet 2 extensions
+  Scenario: Markdown extensions (Maruku)
     Given the Server is running at "markdown-app"
     When I go to "/smarty_pants.html"
-    Then I should see "&ldquo;"
+    Then I should see "&#8220;"
     When I go to "/no_intra_emphasis.html"
     Then I should not see "<em>"
     When I go to "/tables.html"
     Then I should see "<table>"
-    When I go to "/fenced_code_blocks.html"
-    Then I should see "<code>"
-    When I go to "/autolink.html"
-    Then I should see "<a href"
-    When I go to "/strikethrough.html"
-    Then I should see "<del>"
     When I go to "/space_after_headers.html"
-    Then I should not see "<h1>"
-    When I go to "/superscript.html"
-    Then I should see "<sup>"
-    
+    Then I should not see "<h1>"

data/features/markdown_redcarpet.feature

@@ -0,0 +1,37 @@
+@nojava
+Feature: Markdown support
+  In order to test included Maruku support
+
+  Scenario: Redcarpet 2 extensions
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, :no_intra_emphasis => true,
+                     :tables => true,
+                     :fenced_code_blocks => true,
+                     :autolink => true,
+                     :strikethrough => true,
+                     :lax_html_blocks => true,
+                     :space_after_headers => true,
+                     :superscript => true#, :smartypants => true
+                     
+      """
+    Given the Server is running at "markdown-app"
+    # When I go to "/smarty_pants.html"
+    # Then I should see "“"
+    When I go to "/no_intra_emphasis.html"
+    Then I should not see "<em>"
+    When I go to "/tables.html"
+    Then I should see "<table>"
+    When I go to "/fenced_code_blocks.html"
+    Then I should see "<code>"
+    When I go to "/autolink.html"
+    Then I should see "<a href"
+    When I go to "/strikethrough.html"
+    Then I should see "<del>"
+    When I go to "/space_after_headers.html"
+    Then I should not see "<h1>"
+    When I go to "/superscript.html"
+    Then I should see "<sup>"
+    

data/features/minify_css.feature

@@ -1,32 +1,52 @@
 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"
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      """
     And the Server is running at "minify-css-app"
     When I go to "/stylesheets/site.css"
     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"
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_css
+      """
     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    
+    Then I should see "1" lines
     
   Scenario: Rendering external css with passthrough compressor
-    Given the Server is running at "passthrough-app"
+    Given a fixture app "passthrough-app"
+    And a file named "config.rb" with:
+      """
+      module ::PassThrough
+        def self.compress(data)
+          data
+        end
+      end
+
+      activate :minify_css
+
+      set :css_compressor, ::PassThrough
+      """
+    And the Server is running at "passthrough-app"
     When I go to "/stylesheets/site.css"
     Then I should see "55" lines
 
   Scenario: Rendering inline css with the feature disabled
-    Given "minify_css" feature is "disabled"
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      """
     And the Server is running at "minify-css-app"
     When I go to "/inline-css.html"
     Then I should see:
@@ -42,7 +62,22 @@ Feature: Minify CSS
     """
    
   Scenario: Rendering inline css with a passthrough minifier
-    Given the Server is running at "passthrough-app"
+    Given a fixture app "passthrough-app"
+    And a file named "config.rb" with:
+      """
+      module ::PassThrough
+        def self.compress(data)
+          data
+        end
+      end
+
+      activate :minify_css, :inline => true
+
+      set :css_compressor, ::PassThrough
+
+      page "/inline-css.html", :layout => false
+      """
+    And the Server is running at "passthrough-app"
     When I go to "/inline-css.html"
     Then I should see:
     """
@@ -53,8 +88,35 @@ Feature: Minify CSS
     </style>
     """
 
+  Scenario: Rendering inline css with a passthrough minifier using activate-style compressor
+    Given a fixture app "passthrough-app"
+    And a file named "config.rb" with:
+      """
+      module ::HelloCompressor
+        def self.compress(data)
+          "Hello"
+        end
+      end
+
+      activate :minify_css, :inline => true, :compressor => ::HelloCompressor
+
+      page "/inline-css.html", :layout => false
+      """
+    And the Server is running at "passthrough-app"
+    When I go to "/inline-css.html"
+    Then I should see:
+    """
+    <style type='text/css'>
+      Hello
+    </style>
+    """
+    
   Scenario: Rendering inline css with the feature enabled
-    Given "minify_css" feature is "enabled"
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_css, :inline => true
+      """
     And the Server is running at "minify-css-app"
     When I go to "/inline-css.html"
     Then I should see:

data/features/minify_javascript.feature

@@ -1,11 +1,11 @@
 Feature: Minify Javascript
   In order reduce bytes sent to client and appease YSlow
 
-  Background:
-    Given current environment is "build"
-
   Scenario: Rendering inline js with the feature disabled
-    Given "minify_javascript" feature is "disabled"
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      """
     And the Server is running at "minify-js-app"
     When I go to "/inline-js.html"
     Then I should see:
@@ -42,7 +42,22 @@ Feature: Minify Javascript
     """
     
   Scenario: Rendering inline js with a passthrough minifier
-    Given the Server is running at "passthrough-app"
+    Given a fixture app "passthrough-app"
+    And a file named "config.rb" with:
+      """
+      module ::PassThrough
+        def self.compress(data)
+          data
+        end
+      end
+
+      activate :minify_javascript, :inline => true
+
+      set :js_compressor, ::PassThrough
+
+      page "/inline-js.html", :layout => false
+      """
+    And the Server is running at "passthrough-app"
     When I go to "/inline-js.html"
     Then I should see:
     """
@@ -77,8 +92,48 @@ Feature: Minify Javascript
     </script>
     """
 
+  Scenario: Rendering inline css with a passthrough minifier using activate-style compressor
+    Given a fixture app "passthrough-app"
+    And a file named "config.rb" with:
+      """
+      module ::HelloCompressor
+        def self.compress(data)
+          "Hello"
+        end
+      end
+
+      activate :minify_javascript, :inline => true, :compressor => ::HelloCompressor
+
+      page "/inline-js.html", :layout => false
+      """
+    And the Server is running at "passthrough-app"
+    When I go to "/inline-js.html"
+    Then I should see:
+    """
+    <script type='text/javascript'>
+      //<![CDATA[
+    Hello
+      //]]>
+    </script>
+    <script>
+      Hello
+    </script>
+    <script type='text/javascript'>
+      //<!--
+    Hello
+      //-->
+    </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"
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript, :inline => true
+      """
     And the Server is running at "minify-js-app"
     When I go to "/inline-js.html"
     Then I should see:
@@ -102,7 +157,11 @@ Feature: Minify Javascript
     """
     
   Scenario: Rendering external js with the feature enabled
-    Given "minify_javascript" feature is "enabled"
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript
+      """
     And the Server is running at "minify-js-app"
     When I go to "/javascripts/js_test.js"
     Then I should see "1" lines
@@ -115,23 +174,62 @@ Feature: Minify Javascript
     Then I should see "8" lines
 
   Scenario: Rendering inline js (coffeescript) with the feature enabled
-    Given "minify_javascript" feature is "enabled"
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      require "coffee-filter"
+      activate :minify_javascript, :inline => true
+      """
     And the Server is running at "minify-js-app"
     When I go to "/inline-coffeescript.html"
     Then I should see "6" lines
   
   Scenario: Rendering external js (coffeescript) with the feature enabled
-    Given "minify_javascript" feature is "enabled"
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript
+      """
     And the Server is running at "minify-js-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "1" lines
     
   Scenario: Rendering inline js (coffeescript) with a passthrough minifier
-    Given the Server is running at "passthrough-app"
+    Given a fixture app "passthrough-app"
+    And a file named "config.rb" with:
+      """
+      require "coffee-filter"
+      
+      module ::PassThrough
+        def self.compress(data)
+          data
+        end
+      end
+
+      activate :minify_javascript, :inline => true
+
+      set :js_compressor, ::PassThrough
+
+      page "/inline-coffeescript.html", :layout => false
+      """
+    And the Server is running at "passthrough-app"
     When I go to "/inline-coffeescript.html"
     Then I should see "16" lines
     
   Scenario: Rendering external js (coffeescript) with a passthrough minifier
+    Given a fixture app "passthrough-app"
+    And a file named "config.rb" with:
+      """
+      module ::PassThrough
+        def self.compress(data)
+          data
+        end
+      end
+
+      activate :minify_javascript
+
+      set :js_compressor, ::PassThrough
+      """
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "11" lines