middleman-core 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1a1dedbf7d4f3e960822c366d874721b693063f
-  data.tar.gz: 86c7fc7a7be9505d48d8e32a426e40a70fbfe24c
+  metadata.gz: c57d497044df7725a8dbf742d1ad1145ddb43f81
+  data.tar.gz: a44fcf58e1c0b9aa89df85bb0495b95b1474a182
 SHA512:
-  metadata.gz: 85adeed7a5ac88e08fd12b9f1d16f7bfcf4c728a2238caedbdbb0b0c7dc9c15f5fe03f2542dd22632472ca424bcf18b49ca0c74274a9a7150e2b3df23858760e
-  data.tar.gz: d61bfccd6fdcd63cedeada4fe03b6147fe98507b458477cced21823efd0fbb8dce2619bf191854de072965c227525113d191fa2667bb3cd1a3cba5655e9b7b8a
+  metadata.gz: f1a07b30081dedb39503aca5d0f0a983f1c1c54ca55a8a82eb4bd418a34eabc6ea00626cb7fe47ebfa133856969d7a2d2ee7de3b03c1fafc3d98a4ed0a5342e9
+  data.tar.gz: c640e8874882a1a991355cab16380407f0a164b35fb18bb8c41550effabcc53c76f942e02d714dc67618798aa3d12796aad7940685a59ddaa45e0ba448587fff

data/features/markdown_redcarpet.feature

@@ -12,17 +12,12 @@ Feature: Markdown support
                      :fenced_code_blocks => true,
                      :autolink => true,
                      :strikethrough => true,
-                     :lax_html_blocks => true,
                      :space_after_headers => true,
-                     :with_toc_data => true,
                      :superscript => true,
-                     :smartypants => true,
-                     :hard_wrap => true
-                     
+                     :lax_spacing => 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"
@@ -37,36 +32,97 @@ Feature: Markdown support
     Then I should not see "<h1>"
     When I go to "/superscript.html"
     Then I should see "<sup>"
-    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"
+    When I go to "/lax_spacing.html"
+    Then I should see "<p>hello</p>"
+
+  @no18
+  Scenario: Redcarpet 3 extensions
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, :underline => true,
+                     :highlight => true,
+                     :disable_indented_code_blocks => true
+      """
+    Given the Server is running at "markdown-app"
+    When I go to "/underline.html"
+    Then I should see "<u>underlined</u>"
+    When I go to "/highlighted.html"
+    Then I should see "<mark>highlighted</mark>"
+    When I go to "/indented_code_blocks.html"
+    Then I should not see "<code>"
 
-  Scenario: Redcarpet 2 no_images extension (with overrides)
+  Scenario: Redcarpet smartypants extension
     Given a fixture app "markdown-app"
     And a file named "config.rb" with:
       """
       set :markdown_engine, :redcarpet
-      set :markdown, :no_images => true
-                     
+      set :markdown, :smartypants => true
       """
     Given the Server is running at "markdown-app"
+    When I go to "/smarty_pants.html"
+    Then I should see "&ldquo;"
+
+  Scenario: Redcarpet::Render::HTML options
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, :filter_html => true,
+                     :no_images => true,
+                     :no_links => true,
+                     :with_toc_data => true,
+                     :hard_wrap => true,
+                     :safe_links_only => true,
+                     :prettify => true
+
+      """
+    Given the Server is running at "markdown-app"
+    When I go to "/filter_html.html"
+    Then I should not see "<em>"
     When I go to "/img.html"
     Then I should see "![dust mite](http://dust.mite/image.png)"
     And I should not see "<img"
+    When I go to "/with_toc_data.html"
+    Then I should see 'id="toc_0"'
+    And I should see 'id="toc_1"'
+    When I go to "/hard_wrap.html"
+    Then I should see "br"
+    When I go to "/link.html"
+    Then I should see "[This link](http://example.net/) links"
+    And I should not see "<a"
+    When I go to "/safe_links.html"
+    Then I should see "[IRC](irc://chat.freenode.org/#freenode)"
+    When I go to "/prettify.html"
+    Then I should see '<code class="prettyprint">'
 
-  Scenario: Redcarpet 2 no_links extension (with overrides)
+  Scenario: Redcarpet link_attributes option
     Given a fixture app "markdown-app"
     And a file named "config.rb" with:
       """
       set :markdown_engine, :redcarpet
-      set :markdown, :no_links => true
-                     
+      set :markdown, :link_attributes => { :target => "_blank" }
+      """
+    And a file named "source/link.html.markdown" with:
+      """
+      [A link](/foo.html)
       """
     Given the Server is running at "markdown-app"
     When I go to "/link.html"
-    Then I should see "[This link](http://example.net/) links"
-    And I should not see "<a"
+    Then I should see 'target="_blank"'
+
+  Scenario: Redcarpet xhtml option
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, :xhtml => true,
+                     :hard_wrap => true
+      """
+    Given the Server is running at "markdown-app"
+    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"
@@ -109,4 +165,3 @@ Feature: Markdown support
     Then I should see 'width="1"'
     And I should see 'height="1"'
     And I should see 'src="/images/blank.gif"'
-    

data/fixtures/generator-test/config.rb

@@ -76,5 +76,5 @@ configure :build do
   # activate :smusher
 
   # Or use a different image path
-  # set :http_path, "/Content/images/"
+  # set :http_prefix, "/Content/images/"
 end

data/fixtures/markdown-app/source/filter_html.html.markdown

@@ -0,0 +1 @@
+I <em>shouldn't</em> be emphasised

data/fixtures/markdown-app/source/footnote.html.markdown

@@ -0,0 +1,3 @@
+This is a footnote.[^1]
+
+[^1]: It provides additional information.

data/fixtures/markdown-app/source/highlighted.html.markdown

@@ -0,0 +1 @@
+this is ==highlighted==

data/fixtures/markdown-app/source/indented_code_blocks.html.markdown

@@ -0,0 +1,5 @@
+Hello
+
+    Something that would be flagged as code
+
+World

data/fixtures/markdown-app/source/lax_spacing.html.markdown

@@ -0,0 +1,3 @@
+hello
+<div>world</div>
+again

data/fixtures/markdown-app/source/prettify.html.markdown

@@ -0,0 +1,3 @@
+```
+code block
+```

data/fixtures/markdown-app/source/quote.html.markdown

@@ -0,0 +1 @@
+this is "quote"

data/fixtures/markdown-app/source/safe_links.html.markdown

@@ -0,0 +1 @@
+[IRC](irc://chat.freenode.org/#freenode)

data/fixtures/markdown-app/source/underline.html.markdown

@@ -0,0 +1 @@
+hello _underlined_ text

data/fixtures/markdown-app/source/with_toc_data.html.markdown

@@ -1,3 +1,3 @@
-# Header 1
+# First Header
 
-## Header 2
+## Second Header

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

@@ -45,6 +45,11 @@ module Middleman::Cli
       :type    => :boolean,
       :default => false,
       :desc    => 'Force file watcher into polling mode'
+    method_option :latency,
+      :type    => :numeric,
+      :aliases => "-l",
+      :default => 0.25,
+      :desc    => 'Set file watcher latency, in seconds'
 
     # Start the server
     def server
@@ -66,7 +71,8 @@ module Middleman::Cli
         :instrumenting     => options["instrument"],
         :disable_watcher   => options["disable_watcher"],
         :reload_paths      => options["reload_paths"],
-        :force_polling     => options["force_polling"]
+        :force_polling     => options["force_polling"],
+        :latency           => options["latency"]
       }
 
       puts "== The Middleman is loading"

data/lib/middleman-core/core_extensions/front_matter.rb

@@ -196,7 +196,7 @@ module Middleman::CoreExtensions
     end
 
     def normalize_path(path)
-      path.sub(%r{^#{app.source_dir}\/}, "")
+      path.sub(%r{^#{Regexp.escape(app.source_dir)}\/}, "")
     end
   end
 end

data/lib/middleman-core/core_extensions/rendering.rb

@@ -191,7 +191,7 @@ module Middleman
             engine = File.extname(resource.source_file)[1..-1].to_sym
 
             # Look for partials relative to the current path
-            relative_dir = File.join(current_dir.sub(%r{^#{self.source_dir}/?}, ""), data)
+            relative_dir = File.join(current_dir.sub(%r{^#{Regexp.escape(self.source_dir)}/?}, ""), data)
 
             # Try to use the current engine first
             found_partial, found_engine = resolve_template(relative_dir, :preferred_engine => engine, :try_without_underscore => true)
@@ -277,7 +277,7 @@ module Middleman
             content = callback.call(content, path, locs, template_class)
           end
 
-          output = ::ActiveSupport::SafeBuffer.new
+          output = ::ActiveSupport::SafeBuffer.new ""
           output.safe_concat content
           output
         ensure

data/lib/middleman-core/preview_server.rb

@@ -104,6 +104,7 @@ module Middleman
           # Watcher Library
           require "listen"
           @listener = Listen.to(Dir.pwd, :relative_paths => true, :force_polling => @options[:force_polling])
+          @listener.latency(@options[:latency])
         end
 
         @listener.change do |modified, added, removed|

data/lib/middleman-core/renderers/redcarpet.rb

@@ -4,12 +4,21 @@ module Middleman
   module Renderers
 
     class RedcarpetTemplate < ::Tilt::RedcarpetTemplate::Redcarpet2
+
+      # because tilt has decided to convert these
+      # in the wrong direction
+      ALIASES = {
+        :escape_html => :filter_html
+      }
+
       # Overwrite built-in Tilt version.
       # Don't overload :renderer option with smartypants
       # Support renderer-level options
       def generate_renderer
         return options.delete(:renderer) if options.has_key?(:renderer)
 
+        covert_options_to_aliases!
+
         # Pick a renderer
         renderer = MiddlemanRedcarpetHTML
 
@@ -30,6 +39,14 @@ module Middleman
 
         renderer.new(render_options)
       end
+
+      private
+
+        def covert_options_to_aliases!
+          ALIASES.each do |aka, actual|
+            options[actual] = options.delete(aka) if options.has_key? aka
+          end
+        end
     end
 
     # Custom Redcarpet renderer that uses our helpers for images and links
@@ -54,7 +71,10 @@ module Middleman
 
       def link(link, title, content)
         if !@local_options[:no_links]
-          middleman_app.link_to(content, link, :title => title)
+          attributes = { :title => title }
+          attributes.merge!( @local_options[:link_attributes] ) if @local_options[:link_attributes]
+
+          middleman_app.link_to(content, link, attributes )
         else
           link_string = link.dup
           link_string << %Q{"#{title}"} if title && title.length > 0 && title != alt_text

data/lib/middleman-core/templates/shared/config.tt

@@ -81,5 +81,5 @@ configure :build do
   # activate :relative_assets
 
   # Or use a different image path
-  # set :http_path, "/Content/images/"
+  # set :http_prefix, "/Content/images/"
 end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.1.4' unless const_defined?(:VERSION)
+  VERSION = '3.1.5' unless const_defined?(:VERSION)
 end

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

@@ -124,7 +124,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       # If the basename of the request as no extension, assume we are serving a
       # directory and join index_file to the path.
       path = File.join(asset_dir, current_path)
-      path = path.sub(/#{File.extname(path)}$/, ".#{asset_ext}")
+      path = path.sub(/#{Regexp.escape(File.extname(path))}$/, ".#{asset_ext}")
 
       yield path if sitemap.find_resource_by_path(path)
     end

data/lib/middleman-more/extensions/automatic-alt-tags.rb

@@ -0,0 +1,32 @@
+# Automatic Image alt tags from image names extension
+class Middleman::Extensions::AutomaticAltTags < ::Middleman::Extension
+
+  def initialize(app, options_hash={}, &block)
+    super
+  end
+
+  helpers do
+    # Override default image_tag helper to automatically insert alt tag
+    # containing image name.
+    
+    def image_tag(path)
+      if !path.include?("://")
+        params[:alt] ||= ""
+
+        real_path = path
+        real_path = File.join(images_dir, real_path) unless real_path.start_with?('/')
+        full_path = File.join(source_dir, real_path)
+
+        if File.exists?(full_path)
+          begin
+            alt_text = File.basename(full_path, ".*")
+            alt_text.capitalize!
+            params[:alt] = alt_text
+          end
+        end
+      end
+
+      super(path)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -578,17 +578,26 @@ files:
 - fixtures/markdown-app/config.rb
 - fixtures/markdown-app/source/autolink.html.markdown
 - fixtures/markdown-app/source/fenced_code_blocks.html.markdown
+- fixtures/markdown-app/source/filter_html.html.markdown
+- fixtures/markdown-app/source/footnote.html.markdown
 - fixtures/markdown-app/source/hard_wrap.html.markdown
+- fixtures/markdown-app/source/highlighted.html.markdown
 - fixtures/markdown-app/source/images/blank.gif
 - fixtures/markdown-app/source/img.html.markdown
+- fixtures/markdown-app/source/indented_code_blocks.html.markdown
 - fixtures/markdown-app/source/index.html.markdown
+- fixtures/markdown-app/source/lax_spacing.html.markdown
 - fixtures/markdown-app/source/link.html.markdown
 - fixtures/markdown-app/source/no_intra_emphasis.html.markdown
+- fixtures/markdown-app/source/prettify.html.markdown
+- fixtures/markdown-app/source/quote.html.markdown
+- fixtures/markdown-app/source/safe_links.html.markdown
 - fixtures/markdown-app/source/smarty_pants.html.markdown
 - fixtures/markdown-app/source/space_after_headers.html.markdown
 - fixtures/markdown-app/source/strikethrough.html.markdown
 - fixtures/markdown-app/source/superscript.html.markdown
 - fixtures/markdown-app/source/tables.html.markdown
+- fixtures/markdown-app/source/underline.html.markdown
 - fixtures/markdown-app/source/with_toc_data.html.markdown
 - fixtures/markdown-frontmatter-options-app/config.rb
 - fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown
@@ -1093,6 +1102,7 @@ files:
 - lib/middleman-more/core_extensions/i18n.rb
 - lib/middleman-more/extensions/asset_hash.rb
 - lib/middleman-more/extensions/asset_host.rb
+- lib/middleman-more/extensions/automatic-alt-tags.rb
 - lib/middleman-more/extensions/automatic_image_sizes.rb
 - lib/middleman-more/extensions/cache_buster.rb
 - lib/middleman-more/extensions/directory_indexes.rb
@@ -1349,7 +1359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1788,17 +1798,26 @@ test_files:
 - fixtures/markdown-app/config.rb
 - fixtures/markdown-app/source/autolink.html.markdown
 - fixtures/markdown-app/source/fenced_code_blocks.html.markdown
+- fixtures/markdown-app/source/filter_html.html.markdown
+- fixtures/markdown-app/source/footnote.html.markdown
 - fixtures/markdown-app/source/hard_wrap.html.markdown
+- fixtures/markdown-app/source/highlighted.html.markdown
 - fixtures/markdown-app/source/images/blank.gif
 - fixtures/markdown-app/source/img.html.markdown
+- fixtures/markdown-app/source/indented_code_blocks.html.markdown
 - fixtures/markdown-app/source/index.html.markdown
+- fixtures/markdown-app/source/lax_spacing.html.markdown
 - fixtures/markdown-app/source/link.html.markdown
 - fixtures/markdown-app/source/no_intra_emphasis.html.markdown
+- fixtures/markdown-app/source/prettify.html.markdown
+- fixtures/markdown-app/source/quote.html.markdown
+- fixtures/markdown-app/source/safe_links.html.markdown
 - fixtures/markdown-app/source/smarty_pants.html.markdown
 - fixtures/markdown-app/source/space_after_headers.html.markdown
 - fixtures/markdown-app/source/strikethrough.html.markdown
 - fixtures/markdown-app/source/superscript.html.markdown
 - fixtures/markdown-app/source/tables.html.markdown
+- fixtures/markdown-app/source/underline.html.markdown
 - fixtures/markdown-app/source/with_toc_data.html.markdown
 - fixtures/markdown-frontmatter-options-app/config.rb
 - fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown