middleman-core 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3bad6e93b50e8000b3eeaf4ba03683bf24dcac9
-  data.tar.gz: a6e1e3a5a01a52630de3b8a5e14d19af24db286f
+  metadata.gz: b1a1dedbf7d4f3e960822c366d874721b693063f
+  data.tar.gz: 86c7fc7a7be9505d48d8e32a426e40a70fbfe24c
 SHA512:
-  metadata.gz: c2470a181763cd1dbb08133c7b8276bffc4087633027271ef0a3d8e412966639ab0fb3ab12edd222c208d76fd5eb4d4d0dc822ea45ba5b80522795ad3be42e61
-  data.tar.gz: ff1f7cbb5b7815eb2a547e4788775a1cb86e0270871e3edda1e6bcc943cd4594d80506755531e514cb6a91b7001834e722fd06658aff657c8b14db8021f97ee4
+  metadata.gz: 85adeed7a5ac88e08fd12b9f1d16f7bfcf4c728a2238caedbdbb0b0c7dc9c15f5fe03f2542dd22632472ca424bcf18b49ca0c74274a9a7150e2b3df23858760e
+  data.tar.gz: d61bfccd6fdcd63cedeada4fe03b6147fe98507b458477cced21823efd0fbb8dce2619bf191854de072965c227525113d191fa2667bb3cd1a3cba5655e9b7b8a

data/features/markdown_redcarpet.feature

@@ -42,6 +42,32 @@ Feature: Markdown support
     When I go to "/hard_wrap.html"
     Then I should see "br"
 
+  Scenario: Redcarpet 2 no_images extension (with overrides)
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, :no_images => true
+                     
+      """
+    Given the Server is running at "markdown-app"
+    When I go to "/img.html"
+    Then I should see "![dust mite](http://dust.mite/image.png)"
+    And I should not see "<img"
+
+  Scenario: Redcarpet 2 no_links extension (with overrides)
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      set :markdown, :no_links => true
+                     
+      """
+    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"
+
   Scenario: Redcarpet per-page frontmatter options
     Given a fixture app "markdown-frontmatter-options-app"
     And a file named "config.rb" with:

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 "14" lines
+    Then I should see "13" 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 "12" lines
+    Then I should see "11" lines
     

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

@@ -0,0 +1 @@
+![dust mite](http://dust.mite/image.png) <img src="image.png" />

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

@@ -0,0 +1 @@
+[This link](http://example.net/) <a href="links.html">links</a>

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

@@ -119,7 +119,7 @@ module Middleman::CoreExtensions
     # Parse YAML frontmatter out of a string
     # @param [String] content
     # @return [Array<Hash, String>]
-    def parse_yaml_front_matter(content)
+    def parse_yaml_front_matter(content, full_path)
       yaml_regex = /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
       if content =~ yaml_regex
         content = content.sub(yaml_regex, "")
@@ -128,7 +128,7 @@ module Middleman::CoreExtensions
           data = YAML.load($1) || {}
           data = data.symbolize_keys
         rescue *YAML_ERRORS => e
-          app.logger.error "YAML Exception: #{e.message}"
+          app.logger.error "YAML Exception parsing #{full_path}: #{e.message}"
           return false
         end
       else
@@ -140,7 +140,7 @@ module Middleman::CoreExtensions
       [{}, content]
     end
 
-    def parse_json_front_matter(content)
+    def parse_json_front_matter(content, full_path)
       json_regex = /\A(;;;\s*\n.*?\n?)^(;;;\s*$\n?)/m
 
       if content =~ json_regex
@@ -150,7 +150,7 @@ module Middleman::CoreExtensions
           json = ($1+$2).sub(";;;", "{").sub(";;;", "}")
           data = ActiveSupport::JSON.decode(json).symbolize_keys
         rescue => e
-          app.logger.error "JSON Exception: #{e.message}"
+          app.logger.error "JSON Exception parsing #{full_path}: #{e.message}"
           return false
         end
 
@@ -186,7 +186,7 @@ module Middleman::CoreExtensions
           content = lines.join("\n")
         end
 
-        result = parse_yaml_front_matter(content) || parse_json_front_matter(content)
+        result = parse_yaml_front_matter(content, full_path) || parse_json_front_matter(content, full_path)
         return result if result
       rescue
         # Probably a binary file, move on

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

@@ -70,8 +70,8 @@ module Middleman
             app = ::Rack::Builder.new
             app.use Rack::Lint
 
-            Array(@middleware).each do |klass, options, blockm|
-              app.use(klass, *options, &blockm)
+            Array(@middleware).each do |klass, options, block|
+              app.use(klass, *options, &block)
             end
 
             inner_app = inst(&block)
@@ -291,8 +291,13 @@ module Middleman
           file      = ::Rack::File.new nil
           file.path = resource.source_file
           response = file.serving(env)
+          status = response[0]
           response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)
-          response[1]['Content-Type'] = resource.content_type || "application/octet-stream"
+          # Do not set Content-Type if status is 1xx, 204, 205 or 304, otherwise
+          # Rack will throw an error (500)
+          if !(100..199).include?(status) && ![204, 205, 304].include?(status)
+            response[1]['Content-Type'] = resource.content_type || "application/octet-stream"
+          end
           halt response
         end
       end

data/lib/middleman-core/meta_pages/config_setting.rb

@@ -15,11 +15,11 @@ module Middleman
         key_classes << 'modified' if @setting.value_set?
         content << content_tag(:span, @setting.key.inspect, :class => key_classes.join(' '))
         content << " = "
-        content << content_tag(:span, CGI::escapeHTML(@setting.value.inspect), :class => 'value')
+        content << content_tag(:span, @setting.value.inspect, :class => 'value')
         if @setting.default
           content << content_tag(:span, :class => 'default') do
             if @setting.value_set?
-              "Default: #{CGI::escapeHTML(@setting.default.inspect)}"
+              "Default: #{@setting.default.inspect}"
             else
               "(Default)"
             end

data/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -23,10 +23,10 @@ module Middleman
                 row_content = ""
                 row_content << content_tag(:th, label)
                 row_content << content_tag(:td, value)
-                row_content
+                row_content.html_safe
               end
             end
-            content
+            content.html_safe
           end
         end
       end

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

@@ -21,7 +21,7 @@ module Middleman
         end
 
         # Renderer Options
-        possible_render_opts = [:filter_html, :no_images, :no_links, :no_styles, :safe_links_only, :with_toc_data, :hard_wrap, :xhtml]
+        possible_render_opts = [:filter_html, :no_images, :no_links, :no_styles, :safe_links_only, :with_toc_data, :hard_wrap, :xhtml, :prettify, :link_attributes]
 
         render_options = possible_render_opts.inject({}) do |sum, opt|
           sum[opt] = options.delete(opt) if options.has_key?(opt)
@@ -36,12 +36,30 @@ module Middleman
     class MiddlemanRedcarpetHTML < ::Redcarpet::Render::HTML
       cattr_accessor :middleman_app
 
+      def initialize(options={})
+        @local_options = options.dup
+
+        super
+      end
+
       def image(link, title, alt_text)
-        middleman_app.image_tag(link, :title => title, :alt => alt_text)
+        if !@local_options[:no_images]
+          middleman_app.image_tag(link, :title => title, :alt => alt_text)
+        else
+          link_string = link.dup
+          link_string << %Q{"#{title}"} if title && title.length > 0 && title != alt_text
+          %Q{![#{alt_text}](#{link_string})}
+        end
       end
 
       def link(link, title, content)
-        middleman_app.link_to(content, link, :title => title)
+        if !@local_options[:no_links]
+          middleman_app.link_to(content, link, :title => title)
+        else
+          link_string = link.dup
+          link_string << %Q{"#{title}"} if title && title.length > 0 && title != alt_text
+          %Q{[#{content}](#{link_string})}
+        end
       end
     end
 

data/lib/middleman-core/templates/empty/Gemfile.tt

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 gem "middleman", "~><%= Middleman::VERSION %>"
 
+# For faster file watcher updates on Windows:
+gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
+
 # Cross-templating language block fix for Ruby 1.8
 platforms :mri_18 do
   gem "ruby18_source_location"

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

@@ -7,8 +7,8 @@ gem "middleman", "~><%= Middleman::VERSION %>"
 # Live-reloading plugin
 gem "middleman-livereload", "~> 3.1.0"
 
-# For faster file watcher updates:
-# gem "wdm", "~> 0.1.0") # Windows
+# For faster file watcher updates on Windows:
+gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
 
 # Cross-templating language block fix for Ruby 1.8
 platforms :mri_18 do

data/lib/middleman-core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -580,7 +580,9 @@ files:
 - fixtures/markdown-app/source/fenced_code_blocks.html.markdown
 - fixtures/markdown-app/source/hard_wrap.html.markdown
 - fixtures/markdown-app/source/images/blank.gif
+- fixtures/markdown-app/source/img.html.markdown
 - fixtures/markdown-app/source/index.html.markdown
+- fixtures/markdown-app/source/link.html.markdown
 - fixtures/markdown-app/source/no_intra_emphasis.html.markdown
 - fixtures/markdown-app/source/smarty_pants.html.markdown
 - fixtures/markdown-app/source/space_after_headers.html.markdown
@@ -1788,7 +1790,9 @@ test_files:
 - fixtures/markdown-app/source/fenced_code_blocks.html.markdown
 - fixtures/markdown-app/source/hard_wrap.html.markdown
 - fixtures/markdown-app/source/images/blank.gif
+- fixtures/markdown-app/source/img.html.markdown
 - fixtures/markdown-app/source/index.html.markdown
+- fixtures/markdown-app/source/link.html.markdown
 - fixtures/markdown-app/source/no_intra_emphasis.html.markdown
 - fixtures/markdown-app/source/smarty_pants.html.markdown
 - fixtures/markdown-app/source/space_after_headers.html.markdown