middleman-more 3.0.0 → 3.0.1.pre

data/.cane

@@ -0,0 +1,2 @@
+--exclusions-file .cane-exclusions.yml
+--no-doc

data/.cane-exclusions.yml

@@ -0,0 +1,3 @@
+style:
+  - lib/middleman-more/extensions/minify_css/rainpress.rb
+  - lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb

data/features/coffee-script.feature

@@ -14,4 +14,9 @@ Feature: Support coffee-script
   Scenario: Rendering broken coffee
     Given the Server is running at "coffeescript-app"
     When I go to "/javascripts/broken-coffee.js"
-    Then I should see "reserved word"
+    Then I should see "reserved word"
+  
+  Scenario: Building broken coffee
+    Given a built app at "coffeescript-app"
+    Then the output should contain "error  build/javascripts/broken-coffee.js"
+    And the exit status should be 1

data/features/markdown_redcarpet.feature

@@ -40,4 +40,26 @@ Feature: Markdown support
     When I go to "/with_toc_data.html"
     Then I should see "toc_0"
     When I go to "/hard_wrap.html"
-    Then I should see "br"
+    Then I should see "br"
+
+  Scenario: Redcarpet uses our link_to and image_tag helpers
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      activate :automatic_image_sizes
+      activate :directory_indexes
+      """
+    And a file named "source/link_and_image.html.markdown" with:
+      """
+      [A link](/smarty_pants.html)
+
+      ![image](blank.gif)
+      """
+    Given the Server is running at "markdown-app"
+    When I go to "/link_and_image/"
+    Then I should see "/smarty_pants/"
+    Then I should see 'width="1"'
+    And I should see 'height="1"'
+    And I should see 'src="/images/blank.gif"'
+    

data/features/minify_css.feature

@@ -23,6 +23,8 @@ Feature: Minify CSS
     And I should see "only screen and (device-width"
     When I go to "/more-css/site.css"
     Then I should see "1" lines
+    When I go to "/stylesheets/report.css"
+    Then I should see "p{border:1px solid #ff6600}"
     
   Scenario: Rendering external css with passthrough compressor
     Given a fixture app "passthrough-app"

data/features/sass-assets-paths.feature

@@ -0,0 +1,11 @@
+Feature: Support SASS assets paths
+ In order to import common shared assets when writing Sass
+
+ Scenario: Importing assets from 'assets/stylesheets/' directory in app root
+   Given the Server is running at "sass-assets-path-app"
+   When I go to "/stylesheets/plain.css"
+   Then I should see "color: green;"
+   Then I should see "/* Works with shared SCSS assets from APPROOT/assets/stylesheets/_shared-asset.scss */"
+   Then I should see "/* Works with shared SASS assets from APPROOT/assets/stylesheets/_shared-asset.sass */"
+   Then I should see "font-size: 18px"
+   Then I should see "/* Works with shared SASS assets from external source directory */"

data/features/sass_cache_path.feature

@@ -0,0 +1,22 @@
+Feature: SASS .sass_cache custom location
+
+  Scenario: Using the default location for .sass_cache folder
+    Given the Server is running at "sass-cache-path-default-app"
+
+    When I go to "/stylesheets/plain.css"
+    Then I should see "color: blue;"
+
+    #  TODO:: 
+    #  Not sure how to test this location, as the directory is stored outside of the app root
+    #  during testing, but inside app root in "production"
+
+    # Then a directory named ".sass_cache" should exist
+
+
+  Scenario: Using a custom location for .sass_cache folder
+    Given the Server is running at "sass-cache-path-custom-app"
+
+    When I go to "/stylesheets/plain.css"
+    Then I should see "html, body, div, span, applet, object, iframe,"
+
+    Then a directory named "/tmp/middleman-more-custom-sass_cache_path" should exist

data/features/slim.feature

@@ -18,4 +18,52 @@ Feature: Support slim templating language
       """
     And the Server is running at "empty_app"
     When I go to "/slim.html"
-    Then I should see "<h1>Welcome to Slim</h1>"
+    Then I should see "<h1>Welcome to Slim</h1>"
+
+  Scenario: Rendering Scss in a Slim filter
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      """
+    And a file named "source/scss.html.slim" with:
+      """
+      doctype 5
+      html lang='en'
+        head
+          meta charset="utf-8"
+          scss:
+            @import "compass";
+            @include global-reset;
+        body
+          h1 Welcome to Slim
+      """
+    And a file named "source/sass.html.slim" with:
+      """
+      doctype 5
+      html lang='en'
+        head
+          meta charset="utf-8"
+          sass:
+            @import "compass"
+            +global-reset
+        body
+          h1 Welcome to Slim
+      """
+    And a file named "source/error.html.slim" with:
+      """
+      doctype 5
+      html lang='en'
+        head
+          meta charset="utf-8"
+          scss:
+            +global-reset
+        body
+          h1 Welcome to Slim
+      """
+    And the Server is running at "empty_app"
+    When I go to "/scss.html"
+    Then I should see "html, body, div"
+    When I go to "/sass.html"
+    Then I should see "html, body, div"
+    When I go to "/error.html"
+    Then I should see "Syntax error"

data/features/support/env.rb

@@ -6,5 +6,5 @@ PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 core_root = File.expand_path("../../../../middleman-core/lib/middleman-core", __FILE__)
 
 require core_root
-require File.join(core_root, "step_definitions") 
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-more')
+require File.join(core_root, "step_definitions")
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-more')

data/fixtures/asset-host-app/config.rb

@@ -3,4 +3,4 @@ set :layout, false
 activate :asset_host
 set :asset_host do |asset|
   "http://assets%d.example.com" % (asset.hash % 4)
-end
+end

data/fixtures/auto-css-app/config.rb

@@ -8,4 +8,4 @@ with_layout false do
   }.each do |path|
     page path
   end
-end
+end

data/fixtures/auto-js-app/config.rb

@@ -8,4 +8,4 @@ with_layout false do
   }.each do |path|
     page path
   end
-end
+end

data/fixtures/coffeescript-app/config.rb

@@ -1 +1 @@
-require "coffee-filter"
+require "coffee-filter"

data/fixtures/content-for-app/config.rb

@@ -4,4 +4,4 @@ with_layout :content_for do
   page "/content_for_erb.html"
   page "/content_for_haml.html"
   page "/content_for_slim.html"
-end
+end

data/fixtures/extensionless-text-files-app/config.rb

@@ -1 +1 @@
-activate :directory_indexes
+activate :directory_indexes

data/fixtures/lorem-app/config.rb

@@ -1 +1 @@
-# activate :minify_css
+# activate :minify_css

data/fixtures/minify-css-app/source/stylesheets/report.css

@@ -0,0 +1 @@
+p{border: 1px solid #ff6600;}

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

@@ -1 +1 @@
-set :layout, :inner
+set :layout, :inner

data/fixtures/page-classes-app/config.rb

@@ -1,4 +1,4 @@
 with_layout false do
   page "/sub1/page-classes.html"
   page "/sub1/sub2/page-classes.html"
-end
+end

data/fixtures/relative-assets-app/config.rb

@@ -1 +1 @@
-# activate :relative_assets
+# activate :relative_assets

data/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass

@@ -0,0 +1 @@
+/* Works with shared SASS assets from APPROOT/assets/stylesheets/_shared-asset.sass */

data/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss

@@ -0,0 +1 @@
+/* Works with shared SCSS assets from APPROOT/assets/stylesheets/_shared-asset.scss */

data/fixtures/sass-assets-path-app/config.rb

@@ -0,0 +1,4 @@
+set :sass_assets_paths, [
+  File.join(root, "assets", "stylesheets"),
+  File.join(root, "my-vendor", "stylesheets")
+]

data/fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass

@@ -0,0 +1,2 @@
+body
+  font-size: 18px

data/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass

@@ -0,0 +1,16 @@
+
+red
+ color: green
+ 
+/* imports below 
+
+// SCSS with extension
+@import "_shared-asset.scss"
+
+// without extension
+@import "shared-asset"
+
+// imported from outside of local 'assets/' directory
+@import "_partial.sass"
+
+/* Works with shared SASS assets from external source directory */

data/fixtures/sass-cache-path-custom-app/config.rb

@@ -0,0 +1,3 @@
+
+
+set :sass_cache_path, File.join('/tmp', "#{File.basename(Dir.pwd)}-custom-sass_cache_path")

data/fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass

@@ -0,0 +1,4 @@
+@import "compass/reset"
+
+red
+  color: blue

data/fixtures/sass-cache-path-default-app/config.rb

@@ -0,0 +1,3 @@
+
+# Using default setting
+# set :sass_cache_path, File.join(Dir.pwd, '.sass_cache')

data/fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass

@@ -0,0 +1,4 @@
+@import "compass/reset"
+
+red
+  color: blue

data/fixtures/traversal-app/config.rb

@@ -4,4 +4,4 @@ page "/sub/fake.html", :proxy => "/proxied.html", :ignore => true
 page "/sub/fake2.html", :proxy => "/proxied.html", :ignore => true
 
 page "/directory-indexed/fake.html", :proxy => "/proxied.html", :ignore => true
-page "/directory-indexed/fake2.html", :proxy => "/proxied.html", :ignore => true
+page "/directory-indexed/fake2.html", :proxy => "/proxied.html", :ignore => true

data/fixtures/wildcard-directory-index-app/config.rb

@@ -1,2 +1,2 @@
 activate :directory_indexes
-page "/admin/*", :layout => :admin
+page "/admin/*", :layout => :admin

data/lib/middleman-more.rb

@@ -6,15 +6,18 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 module Middleman
   module More
-  
+
     # Setup extension
     class << self
 
       # Once registered
       def registered(app, options={})
-        ### 
+        ###
         # Setup Core Extensions
         ###
+        
+        require "middleman-core/templates"
+        require "middleman-more/templates/smacss"
 
         # Setup default helpers
         require "middleman-more/core_extensions/default_helpers"
@@ -29,62 +32,62 @@ module Middleman
         app.after_configuration do
           # This is for making the tests work - since the tests
           # don't completely reload middleman, I18n.load_path can get
-          # polluted with paths from other test app directories that don't 
+          # polluted with paths from other test app directories that don't
           # exist anymore.
           ::I18n.load_path.delete_if {|path| path =~ %r{tmp/aruba}}
           ::I18n.reload!
         end
-      
+
         Middleman::Extensions.register(:i18n) do
           require "middleman-more/core_extensions/i18n"
           Middleman::CoreExtensions::Internationalization
         end
-      
+
         # Compass framework
         require "middleman-more/core_extensions/compass"
         Middleman::Application.register Middleman::CoreExtensions::Compass
 
-        ### 
+        ###
         # Setup Optional Extensions
         ###
 
-        # CacheBuster adds a query string to assets in dynamic templates to avoid
-        # browser caches failing to update to your new content.
+        # CacheBuster adds a query string to assets in dynamic templates to
+        # avoid browser caches failing to update to your new content.
         Middleman::Extensions.register(:cache_buster) do
           require "middleman-more/extensions/cache_buster"
-          Middleman::Extensions::CacheBuster 
+          Middleman::Extensions::CacheBuster
         end
 
         # MinifyCss compresses CSS
         Middleman::Extensions.register(:minify_css) do
           require "middleman-more/extensions/minify_css"
-          Middleman::Extensions::MinifyCss 
+          Middleman::Extensions::MinifyCss
         end
 
         # MinifyJavascript compresses JS
         Middleman::Extensions.register(:minify_javascript) do
           require "middleman-more/extensions/minify_javascript"
-          Middleman::Extensions::MinifyJavascript 
+          Middleman::Extensions::MinifyJavascript
         end
 
         # RelativeAssets allow any asset path in dynamic templates to be either
         # relative to the root of the project or use an absolute URL.
         Middleman::Extensions.register(:relative_assets) do
           require "middleman-more/extensions/relative_assets"
-          Middleman::Extensions::RelativeAssets 
+          Middleman::Extensions::RelativeAssets
         end
 
         # GZIP assets and pages during build
         Middleman::Extensions.register(:gzip) do
           require "middleman-more/extensions/gzip"
-          Middleman::Extensions::Gzip 
+          Middleman::Extensions::Gzip
         end
 
         # AssetHash appends a hash of the file contents to the assets filename
         # to avoid browser caches failing to update to your new content.
         Middleman::Extensions.register(:asset_hash) do
           require "middleman-more/extensions/asset_hash"
-          Middleman::Extensions::AssetHash 
+          Middleman::Extensions::AssetHash
         end
 
         # AssetHost allows you to setup multiple domains to host your static
@@ -92,13 +95,13 @@ module Middleman
         # through each of the asset servers to better spread the load.
         Middleman::Extensions.register(:asset_host) do
           require "middleman-more/extensions/asset_host"
-          Middleman::Extensions::AssetHost 
+          Middleman::Extensions::AssetHost
         end
 
         # Provide Apache-style index.html files for directories
         Middleman::Extensions.register(:directory_indexes) do
           require "middleman-more/extensions/directory_indexes"
-          Middleman::Extensions::DirectoryIndexes 
+          Middleman::Extensions::DirectoryIndexes
         end
 
         # Lorem provides a handful of helpful prototyping methods to generate

data/lib/middleman-more/core_extensions/assets.rb

@@ -1,24 +1,24 @@
 module Middleman
   module CoreExtensions
-    
+
     # Base helper to manipulate asset paths
     module Assets
-  
+
       # Extension registered
       class << self
         def registered(app)
           # Disable Padrino cache buster
           app.set :asset_stamp, false
-      
+
           # Include helpers
           app.send :include, InstanceMethod
         end
         alias :included :registered
       end
-  
+
       # Methods to be mixed-in to Middleman::Application
       module InstanceMethod
-    
+
         # Get the URL of an asset given a type/prefix
         #
         # @param [String] path The path (such as "photo.jpg")

data/lib/middleman-more/core_extensions/compass.rb

@@ -17,12 +17,18 @@ module Middleman
           # done with it
           app.define_hook :compass_config
 
+          # Location of SASS/SCSS files external to source directory.
+          # @return [Array]
+          #   set :sass_assets_paths, ["#{root}/assets/sass/", "/path/2/external/sass/repository/"]
+          app.set :sass_assets_paths, []
+
           app.after_configuration do
             ::Compass.configuration do |config|
               config.project_path    = source_dir
               config.environment     = :development
-              config.cache_path      = File.join(root, ".sass-cache")
+              config.cache_path      = sass_cache_path
               config.sass_dir        = css_dir
+              config.additional_import_paths = sass_assets_paths
               config.css_dir         = css_dir
               config.javascripts_dir = js_dir
               config.fonts_dir       = fonts_dir
@@ -65,16 +71,15 @@ module Middleman
 
     end
 
-    # A Compass template for Tilt
+    # A Compass Sass template for Tilt, adding our options in
     class CompassSassTemplate < ::Middleman::Renderers::Sass::SassPlusCSSFilenameTemplate
-    private
       def sass_options
         super.merge(::Compass.configuration.to_sass_engine_options)
       end
     end
 
+    # A Compass Scss template for Tilt, adding our options in
     class CompassScssTemplate < ::Middleman::Renderers::Sass::ScssPlusCSSFilenameTemplate
-    private
       def sass_options
         super.merge(::Compass.configuration.to_sass_engine_options)
       end