middleman-more 3.0.14 → 3.1.0.beta.1

data/features/asset_hash.feature

@@ -104,3 +104,32 @@ Feature: Assets get a file hash appended to their and references to them are upd
     Then I should see 'Added by Rack filter'
     When I go to "stylesheets/site-50eaa978.css"
     Then I should see 'Not Found'
+
+  Scenario: Hashed-asset files are not produced for ignored paths
+    Given a fixture app "asset-hash-app"
+    And a file named "config.rb" with:
+      """
+      activate :asset_hash, :ignore => [%r(javascripts/*), 'images/*']
+      activate :relative_assets
+      activate :directory_indexes
+      """
+    And a successfully built app at "asset-hash-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | apple-touch-icon.png |
+      | favicon.ico |
+      | images/100px.png |
+      | images/100px.jpg |
+      | images/100px.gif |
+      | javascripts/application.js |
+      | stylesheets/site-50eaa978.css |
+      | index.html |
+      | subdir/index.html |
+      | other/index.html |
+    And the following files should not exist:
+      | images/100px-1242c368.png |
+      | images/100px-5fd6fb90.jpg |
+      | images/100px-5fd6fb90.gif |
+      | javascripts/application-1d8d5276.js |
+      | stylesheets/site.css |

data/features/clean_build.feature

@@ -1,14 +1,14 @@
 Feature: Build Clean
 
   Scenario: Clean an app with directory indexes
-    Given a successfully built app at "clean-dir-app"
+    Given a successfully built app at "clean-dir-app" with flags "--no-clean"
     Then the following files should exist:
       | build/about/index.html        |
-    Given a successfully built app at "clean-dir-app" with flags "--clean"
+    Given a successfully built app at "clean-dir-app"
     Then the following files should exist:
       | build/about/index.html        |
 
   Scenario: Clean build an app that's never been built
-    Given a successfully built app at "clean-dir-app" with flags "--clean"
+    Given a successfully built app at "clean-dir-app"
     Then the following files should exist:
       | build/about/index.html        |

data/features/helpers_link_to.feature

@@ -36,15 +36,15 @@ Feature: link_to helper
     And a file named "source/link_to.html.erb" with:
     """
     <% menu_items.each do |item| %>
-        <%= link_to(item.metadata[:page]['title'], item.url) %>
-        <%= link_to(item.metadata[:page]['title'], item) %>
+        <%= link_to(item.data['title'], item.url) %>
+        <%= link_to(item.data['title'], item) %>
     <% end %>
     """
     And a file named "source/link_to/sub.html.erb" with:
     """
     <% menu_items.each do |item| %>
-        <%= link_to(item.metadata[:page]['title'], item.url) %>
-        <%= link_to(item.metadata[:page]['title'], item) %>
+        <%= link_to(item.data['title'], item.url) %>
+        <%= link_to(item.data['title'], item) %>
     <% end %>
     """
     And the Server is running at "indexable-app"

data/features/i18n_force_locale.feature

@@ -0,0 +1,13 @@
+Feature: i18n manually setting locale
+
+  Scenario: Setting I18n.locale in a block (see issue #809) or with the :lang option
+    Given the Server is running at "i18n-force-locale"
+    When I go to "/en/index.html"
+    Then I should see "Hello"
+    Then I should see "I18n.locale: en"
+    When I go to "/es/index.html"
+    Then I should see "Hola"
+    Then I should see "I18n.locale: es"
+    When I go to "/fr/index.html"
+    Then I should see "Bonjour"
+    Then I should see "I18n.locale: fr"

data/features/i18n_preview.feature

@@ -202,4 +202,17 @@ Feature: i18n Preview
     When I go to "/es/index.html"
     Then I should see '"../stylesheets/site.css"'
     When I go to "/es/hola.html"
-    Then I should see '"../stylesheets/site.css"'
+    Then I should see '"../stylesheets/site.css"'
+
+  Scenario: Missing translations fall back to the default locale
+    Given a fixture app "i18n-default-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n, :mount_at_root => :es
+      """
+    Given the Server is running at "i18n-default-app"
+    When I go to "/en/"
+    Then I should see "Default locale: es"
+    Then I should see "Current locale: en"
+    Then I should see "Buenos días"
+    Then I should see "Howdy"

data/features/markdown.feature

@@ -5,8 +5,9 @@ Feature: Markdown support
     Given the Server is running at "markdown-app"
     When I go to "/index.html"
     Then I should see "<p>Hello World</p>"
-  
+
+  @encoding
   Scenario: Markdown extensions (Maruku)
     Given the Server is running at "markdown-app"
     When I go to "/smarty_pants.html"
-    Then I should see "&"
+    Then I should see "“Hello”"

data/features/markdown_redcarpet.feature

@@ -42,6 +42,27 @@ Feature: Markdown support
     When I go to "/hard_wrap.html"
     Then I should see "br"
 
+  Scenario: Redcarpet per-page frontmatter options
+    Given a fixture app "markdown-frontmatter-options-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, :smartypants => true
+      """
+    Given the Server is running at "markdown-frontmatter-options-app"
+    When I go to "/smarty_pants-default.html"
+    Then I should see "“"
+    When I go to "/smarty_pants-on.html"
+    Then I should see "“"
+    When I go to "/smarty_pants-off.html"
+    Then I should not see "“"
+    When I go to "/tables-default.html"
+    Then I should not see "<table>"
+    When I go to "/tables-on.html"
+    Then I should see "<table>"
+    When I go to "/tables-off.html"
+    Then I should not see "<table>"
+
   Scenario: Redcarpet uses our link_to and image_tag helpers
     Given a fixture app "markdown-app"
     And a file named "config.rb" with:

data/features/markdown_redcarpet_in_haml.feature

@@ -0,0 +1,42 @@
+@nojava
+Feature: Markdown support in Haml
+  In order to test support of the Haml markdown filter
+
+  Scenario: Markdown filter in Haml works
+    Given a fixture app "markdown-in-haml-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      activate :directory_indexes
+      """
+    And a file named "source/markdown_filter.html.haml" with:
+      """
+      :markdown
+        # H1
+
+        paragraph
+      """
+    Given the Server is running at "markdown-in-haml-app"
+    When I go to "/markdown_filter/"
+    Then I should see "<h1>H1</h1>"
+    Then I should see "<p>paragraph</p>"
+
+
+  Scenario: Markdown filter in Haml uses our link_to and image_tag helpers
+    Given a fixture app "markdown-in-haml-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      activate :directory_indexes
+      """
+    And a file named "source/link_and_image.html.haml" with:
+      """
+      :markdown
+        [A link](/link_target.html)
+
+        ![image](blank.gif)
+      """
+    Given the Server is running at "markdown-in-haml-app"
+    When I go to "/link_and_image/"
+    Then I should see "/link_target/"
+    Then I should see 'src="/images/blank.gif"'

data/features/minify_javascript.feature

@@ -203,7 +203,7 @@ Feature: Minify Javascript
       """
     And the Server is running at "passthrough-app"
     When I go to "/inline-coffeescript.html"
-    Then I should see "13" lines
+    Then I should see "14" lines
     
   Scenario: Rendering external js (coffeescript) with a passthrough minifier
     Given a fixture app "passthrough-app"
@@ -221,5 +221,5 @@ Feature: Minify Javascript
       """
     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 "12" lines
     

data/features/partials_dir.feature

@@ -0,0 +1,30 @@
+Feature: Partials dir
+  Scenario: Find partials in a custom partials dir
+    Given a fixture app "partials-dir-app"
+    And a file named "config.rb" with:
+    """
+    set :partials_dir, 'partials'
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see "contents of the partial"
+
+  Scenario: Find partials in a nested custom partials dir
+    Given a fixture app "partials-dir-app"
+    And a file named "config.rb" with:
+    """
+    set :partials_dir, 'nested/partials'
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see "contents of the nested partial"
+
+  Scenario: Find partials in the default partials dir
+    Given a fixture app "default-partials-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 partial"
+

data/features/sass-assets-paths.feature

@@ -6,6 +6,6 @@ Feature: Support SASS assets paths
    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 "/* Works with shared SASS assets from APPROOT/assets/stylesheets/_shared-asset-sass.sass */"
    Then I should see "font-size: 18px"
    Then I should see "/* Works with shared SASS assets from external source directory */"

data/fixtures/default-partials-dir-app/source/_partial.html.erb

@@ -0,0 +1 @@
+contents of the partial

data/fixtures/default-partials-dir-app/source/index.html.erb

@@ -0,0 +1,2 @@
+<%= partial 'partial' %>
+

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

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

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

@@ -0,0 +1,8 @@
+---
+es:
+  paths:
+    hello: "hola"
+  
+  greetings: "Como Esta?"
+  hi: "Hola"
+  untranslated: "Buenos días"

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

@@ -0,0 +1,5 @@
+Default locale: <%= I18n.default_locale %>
+Current locale: <%= I18n.locale %>
+Fallbacks: <%= I18n.fallbacks[:en] %>
+<%= t(:untranslated) %>
+<%= t(:greetings) %>

data/fixtures/i18n-force-locale/config.rb

@@ -0,0 +1,13 @@
+[:en, :es].each do |locale|
+  proxy "/#{locale}/index.html", "index.html", :ignore => true do
+    ::I18n.locale = locale
+  end
+end
+
+proxy "/fr/index.html", "index.html", :lang => :fr
+
+activate :i18n
+
+# This is what breaks i18n, just because it adds a resource list manipulator that 
+# forces a rebuild of the resource list.
+activate :asset_hash

data/fixtures/i18n-force-locale/locales/en.yml

@@ -0,0 +1,3 @@
+---
+en:
+  hello: "Hello"

data/fixtures/i18n-force-locale/locales/es.yml

@@ -0,0 +1,3 @@
+---
+es:
+  hello: "Hola"

data/fixtures/i18n-force-locale/locales/fr.yml

@@ -0,0 +1,3 @@
+---
+fr:
+  hello: "Bonjour"

data/fixtures/i18n-force-locale/source/index.haml

@@ -0,0 +1,2 @@
+Greeting: #{I18n.t 'hello'}
+I18n.locale: #{I18n.locale}

data/fixtures/markdown-app/config.rb

@@ -0,0 +1 @@
+set :markdown, :smartypants => true

data/fixtures/markdown-frontmatter-options-app/config.rb

@@ -0,0 +1 @@
+set :markdown, :smartypants => true

data/fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+"Hello"

data/fixtures/markdown-frontmatter-options-app/source/smarty_pants-off.html.markdown

@@ -0,0 +1,7 @@
+---
+layout: false
+renderer_options:
+  smartypants: false
+---
+
+"Hello"

data/fixtures/markdown-frontmatter-options-app/source/smarty_pants-on.html.markdown

@@ -0,0 +1,7 @@
+---
+layout: false
+renderer_options:
+  smartypants: true
+---
+
+"Hello"

data/fixtures/markdown-frontmatter-options-app/source/tables-default.html.markdown

@@ -0,0 +1,8 @@
+---
+layout: false
+---
+
+First Header  | Second Header
+------------- | -------------
+Content Cell  | Content Cell
+Content Cell  | Content Cell

data/fixtures/markdown-frontmatter-options-app/source/tables-off.html.markdown

@@ -0,0 +1,10 @@
+---
+layout: false
+renderer_options:
+  tables: false
+---
+
+First Header  | Second Header
+------------- | -------------
+Content Cell  | Content Cell
+Content Cell  | Content Cell

data/fixtures/markdown-frontmatter-options-app/source/tables-on.html.markdown

@@ -0,0 +1,10 @@
+---
+layout: false
+renderer_options:
+  tables: true
+---
+
+First Header  | Second Header
+------------- | -------------
+Content Cell  | Content Cell
+Content Cell  | Content Cell

data/fixtures/markdown-in-haml-app/source/link_target.html.markdown

@@ -0,0 +1,4 @@
+---
+layout: false
+---
+Hello World

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

@@ -0,0 +1,2 @@
+<%= partial 'partial' %>
+

data/fixtures/partials-dir-app/source/nested/partials/_partial.html.erb

@@ -0,0 +1 @@
+contents of the nested partial

data/fixtures/partials-dir-app/source/partials/_partial.html.erb

@@ -0,0 +1 @@
+contents of the partial

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

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

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

@@ -8,7 +8,7 @@ red
 @import "_shared-asset.scss"
 
 // without extension
-@import "shared-asset"
+@import "shared-asset-sass"
 
 // imported from outside of local 'assets/' directory
 @import "_partial.sass"

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

@@ -19,41 +19,41 @@ module Middleman
 
           # 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, []
+          #   config[:sass_assets_paths] = ["#{root}/assets/sass/", "/path/2/external/sass/repository/"]
+          app.config.define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files'
 
           app.after_configuration do
-            ::Compass.configuration do |config|
-              config.project_path    = source_dir
-              config.environment     = :development
-              config.cache_path      = sass_cache_path
-              config.sass_dir        = css_dir
-              config.css_dir         = css_dir
-              config.javascripts_dir = js_dir
-              config.fonts_dir       = fonts_dir
-              config.images_dir      = images_dir
-              config.http_path       = http_prefix
-
-              sass_assets_paths.each do |path|
-                config.add_import_path path
+            ::Compass.configuration do |compass_config|
+              compass_config.project_path    = source_dir
+              compass_config.environment     = :development
+              compass_config.cache_path      = config[:sass_cache_path]
+              compass_config.sass_dir        = config[:css_dir]
+              compass_config.css_dir         = config[:css_dir]
+              compass_config.javascripts_dir = config[:js_dir]
+              compass_config.fonts_dir       = config[:fonts_dir]
+              compass_config.images_dir      = config[:images_dir]
+              compass_config.http_path       = config[:http_prefix]
+
+              config[:sass_assets_paths].each do |path|
+                compass_config.add_import_path path
               end
 
               # Disable this initially, the cache_buster extension will
               # re-enable it if requested.
-              config.asset_cache_buster :none
+              compass_config.asset_cache_buster :none
 
               # Disable this initially, the relative_assets extension will
-              # re-enable it if requested.
-              config.relative_assets = false
+
+              compass_config.relative_assets = false
 
               # Default output style
-              config.output_style = :nested
+              compass_config.output_style = :nested
 
               # No line-comments in test mode (changing paths mess with sha1)
-              config.line_comments = false if ENV["TEST"]
+              compass_config.line_comments = false if ENV["TEST"]
 
-              if respond_to?(:asset_host) && asset_host.is_a?(Proc)
-                config.asset_host(&asset_host)
+              if config.defines_setting?(:asset_host) && config[:asset_host].is_a?(Proc)
+                compass_config.asset_host(&config[:asset_host])
               end
             end
 

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

@@ -18,17 +18,21 @@ module Middleman
           app.helpers ::Padrino::Helpers::FormatHelpers
           app.helpers ::Padrino::Helpers::RenderHelpers
           app.helpers ::Padrino::Helpers::NumberHelpers
-          # app.helpers ::Padrino::Helpers::TranslationHelpers
 
           app.helpers Helpers
 
-          app.set :relative_links, false
+          app.config.define_setting :relative_links, false, 'Whether to generate relative links instead of absolute ones'
         end
         alias :included :registered
       end
 
       # The helpers
       module Helpers
+        # Disable Padrino cache buster
+        def asset_stamp
+          false
+        end
+
         # Output a stylesheet link tag based on the current path
         #
         # @return [String]
@@ -50,7 +54,6 @@ module Middleman
         # Output a stylesheet link tag based on the current path
         #
         # @param [Symbol] asset_ext The type of asset
-        # @param [String] separator How to break up path in parts
         # @param [String] asset_dir Where to look for assets
         # @return [void]
         def auto_tag(asset_ext, asset_dir=nil)
@@ -95,16 +98,36 @@ module Middleman
             when :css    then css_dir
             when :js     then js_dir
             when :images then images_dir
+            when :fonts  then fonts_dir
             else kind.to_s
           end
           source = source.to_s.tr(' ', '')
-          ignore_extension = (kind == :images) # don't append extension
+          ignore_extension = (kind == :images || kind == :fonts) # don't append extension
           source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}")
           asset_folder = "" if source.start_with?('/') # absolute path
 
           asset_url(source, asset_folder)
         end
 
+        # Get the URL of an asset given a type/prefix
+        #
+        # @param [String] path The path (such as "photo.jpg")
+        # @param [String] prefix The type prefix (such as "images")
+        # @return [String] The fully qualified asset url
+        def asset_url(path, prefix="")
+          # Don't touch assets which already have a full path
+          if path.include?("//")
+            path
+          else # rewrite paths to use their destination path
+            path = File.join(prefix, path)
+            if resource = sitemap.find_resource_by_path(path)
+              resource.url
+            else
+              File.join(config[:http_prefix], path)
+            end
+          end
+        end
+
         # Given a source path (referenced either absolutely or relatively)
         # or a Resource, this will produce the nice URL configured for that
         # path, respecting :relative_links, directory indexes, etc.
@@ -122,16 +145,16 @@ module Middleman
           relative = options.delete(:relative)
           raise "Can't use the relative option with an external URL" if relative && uri.host
 
-          # Allow people to turn on relative paths for all links with 
+          # Allow people to turn on relative paths for all links with
           # set :relative_links, true
           # but still override on a case by case basis with the :relative parameter.
           effective_relative = relative || false
-          effective_relative = true if relative.nil? && relative_links
+          effective_relative = true if relative.nil? && config[:relative_links]
 
           # Try to find a sitemap resource corresponding to the desired path
           this_resource = current_resource # store in a local var to save work
           if path_or_resource.is_a?(Sitemap::Resource)
-            resource = path_or_resource 
+            resource = path_or_resource
             resource_url = url
           elsif this_resource && uri.path
             # Handle relative urls
@@ -163,7 +186,7 @@ module Middleman
             # If they explicitly asked for relative links but we can't find a resource...
             raise "No resource exists at #{url}" if relative
           end
-            
+
           # Support a :query option that can be a string or hash
           if query = options.delete(:query)
             uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
@@ -172,7 +195,7 @@ module Middleman
           # Support a :fragment or :anchor option just like Padrino
           fragment = options.delete(:anchor) || options.delete(:fragment)
           uri.fragment = fragment.to_s if fragment
-          
+
           # Finally make the URL back into a string
           uri.to_s
         end
@@ -183,10 +206,10 @@ module Middleman
         # :relative option which, if set to true, will produce
         # relative URLs instead of absolute URLs. You can also add
         #
-        # set :relative_links, true
+        # config[:relative_links] = true
         #
         # to config.rb to have all links default to relative.
-        # 
+        #
         # There is also a :query option that can be used to append a
         # query string, which can be expressed as either a String,
         # or a Hash which will be turned into URL parameters.
@@ -201,11 +224,11 @@ module Middleman
           if url = args[url_arg_index]
             options = args[options_index] || {}
             raise ArgumentError.new("Options must be a hash") unless options.is_a?(Hash)
-            
+
             # Transform the url through our magic url_for method
             args[url_arg_index] = url_for(url, options)
           end
-            
+
           super(*args, &block)
         end