middleman-core 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c57d497044df7725a8dbf742d1ad1145ddb43f81
-  data.tar.gz: a44fcf58e1c0b9aa89df85bb0495b95b1474a182
+  metadata.gz: ef753f5b00f4988ae300a75042c40b029cdec327
+  data.tar.gz: 79cbd2f81eded854ad3a5556064a4ef4426b86d3
 SHA512:
-  metadata.gz: f1a07b30081dedb39503aca5d0f0a983f1c1c54ca55a8a82eb4bd418a34eabc6ea00626cb7fe47ebfa133856969d7a2d2ee7de3b03c1fafc3d98a4ed0a5342e9
-  data.tar.gz: c640e8874882a1a991355cab16380407f0a164b35fb18bb8c41550effabcc53c76f942e02d714dc67618798aa3d12796aad7940685a59ddaa45e0ba448587fff
+  metadata.gz: 5673c38132a41e5b75f473e9a6ceedc8ae9edf291fa07290fd9fbc24bfd63ab91206c3267e45424cdfa6290b8a58fb1a8b3019cc15eff8debf2fd06e705baba0
+  data.tar.gz: fa31465e107a5d86bdd26b280da9001b2c5736bbceb96a69556a937b19bf1cf5d1a60566d93861d8c166692d5a96d7538b70e5db90234b666e12c0b81fdfc976

data/features/asset_hash.feature

@@ -20,7 +20,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | images/100px.gif |
       | javascripts/application.js |
       | stylesheets/site.css |
-      
+
     And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
     And the file "stylesheets/site-50eaa978.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
     And the file "index.html" should contain 'href="apple-touch-icon.png"'
@@ -33,7 +33,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And the file "other/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
     And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.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 "/"
@@ -54,7 +54,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
     When I go to "/stylesheets/site-50eaa978.css"
     Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
 
-  Scenario: Enabling an asset host still produces hashed files and references  
+  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-54baaf3a.css"'
@@ -132,4 +132,18 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | images/100px-5fd6fb90.jpg |
       | images/100px-5fd6fb90.gif |
       | javascripts/application-1d8d5276.js |
-      | stylesheets/site.css |
+      | stylesheets/site.css |
+
+  # @wip Currently broken, we should move all asset-host functionality out of Compass and into something more similar to asset_hash with Rack-based rewrites
+  # Scenario: Enabling an asset host and referencing assets in CSS with URL fragments are rewritten correctly
+  #   Given a successfully built app at "asset-hash-host-app"
+  #   When I cd to "build"
+
+  #   Then the following files should exist:
+  #     | images/100px-5fd6fb90.jpg |
+  #     | stylesheets/fragment-c058ecb2.css |
+  #   And the following files should not exist:
+  #     | images/100px.jpg |
+
+  #   And the file "stylesheets/fragment-c058ecb2.css" should contain "http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"
+  #   And the file "stylesheets/fragment-c058ecb2.css" should not contain "http://middlemanapp.com/images/100px.jpg#test"

data/features/directory_index.feature

@@ -9,6 +9,7 @@ Feature: Directory Index
       | a_folder/needs_index/index.html               |
       | leave_me_alone.html                           |
       | wildcard_leave_me_alone.html                  |
+      | evil spaces/index.html                        |
       | regular/index.html                            |
       | .htaccess                                     |
       | .htpasswd                                     |
@@ -16,6 +17,7 @@ Feature: Directory Index
     Then the following files should not exist:
       | egular/index/index.html                       |
       | needs_index.html                              |
+      | evil spaces.html                              |
       | a_folder/needs_index.html                     |
       | leave_me_alone/index.html                     |
       | wildcard_leave_me_alone/index.html            |
@@ -23,12 +25,19 @@ Feature: Directory Index
     And the file "a_folder/needs_index/index.html" should contain "Indexable"
     And the file "leave_me_alone.html" should contain "Stay away"
     And the file "regular/index.html" should contain "Regular"
+    And the file "evil spaces/index.html" should contain "Spaces"
+
     
   Scenario: Preview normal file
     Given the Server is running at "indexable-app"
     When I go to "/needs_index/"
     Then I should see "Indexable"
     
+  Scenario: Preview normal file with spaces in filename
+    Given the Server is running at "indexable-app"
+    When I go to "/evil%20spaces/"
+    Then I should see "Spaces"
+
   Scenario: Preview normal file subdirectory
     Given the Server is running at "indexable-app"
     When I go to "/a_folder/needs_index/"
@@ -47,6 +56,7 @@ Feature: Directory Index
     explicit_link_to: <%= link_to "Explicit", "/needs_index/index.html" %>
     unknown_link_to: <%= link_to "Unknown", "/unknown.html" %>
     relative_link_to: <%= link_to "Relative", "needs_index.html" %>
+    link_to_with_spaces: <%= link_to "Spaces", "/evil%20spaces.html" %>
     """
     And a file named "source/link_to/sub.html.erb" with:
     """
@@ -54,6 +64,7 @@ Feature: Directory Index
     explicit_link_to: <%= link_to "Explicit", "/needs_index/index.html" %>
     unknown_link_to: <%= link_to "Unknown", "/unknown.html" %>
     relative_link_to: <%= link_to "Relative", "../needs_index.html" %>
+    link_to_with_spaces: <%= link_to "Spaces", "../evil%20spaces.html" %>
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to/"
@@ -61,8 +72,11 @@ Feature: Directory Index
     Then I should see 'explicit_link_to: <a href="/needs_index/index.html">Explicit</a>'
     Then I should see 'unknown_link_to: <a href="/unknown.html">Unknown</a>'
     Then I should see 'relative_link_to: <a href="/needs_index/">Relative</a>'
+    Then I should see 'link_to_with_spaces: <a href="/evil%20spaces/">Spaces</a>'
     When I go to "/link_to/sub/"
     Then I should see 'link_to: <a href="/needs_index/">Needs Index</a>'
     Then I should see 'explicit_link_to: <a href="/needs_index/index.html">Explicit</a>'
     Then I should see 'unknown_link_to: <a href="/unknown.html">Unknown</a>'
-    Then I should see 'relative_link_to: <a href="/needs_index/">Relative</a>'
+    Then I should see 'relative_link_to: <a href="/needs_index/">Relative</a>'
+    Then I should see 'link_to_with_spaces: <a href="/evil%20spaces/">Spaces</a>'
+

data/features/markdown_kramdown.feature

@@ -0,0 +1,36 @@
+Feature: Markdown (Kramdown) support
+  In order to test included Kramdown support
+
+  Scenario: Kramdown smartypants extension
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :kramdown
+      set :markdown, :smartypants => true
+      """
+    Given the Server is running at "markdown-app"
+    When I go to "/smarty_pants.html"
+    Then I should see "“Hello”"
+
+  Scenario: Kramdown uses our link_to and image_tag helpers
+    Given a fixture app "markdown-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :kramdown
+      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)
+
+      [Mail me](mailto:ben@benhollis.net)
+      """
+    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/markdown_kramdown_in_haml.feature

@@ -0,0 +1,41 @@
+Feature: Markdown support in Haml (Kramdown)
+  In order to test support of the Haml markdown filter
+
+  Scenario: Markdown filter in Haml works (with Kramdown)
+    Given a fixture app "markdown-in-haml-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :kramdown
+      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>"
+    Then I should see "<p>paragraph</p>"
+
+
+  Scenario: Markdown filter in Haml uses our link_to and image_tag helpers (with Kramdown)
+    Given a fixture app "markdown-in-haml-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :kramdown
+      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/markdown_redcarpet.feature

@@ -1,6 +1,6 @@
 @nojava
-Feature: Markdown support
-  In order to test included Maruku support
+Feature: Markdown (Redcarpet) support
+  In order to test included Redcarpet support
 
   Scenario: Redcarpet 2 extensions
     Given a fixture app "markdown-app"

data/features/markdown_redcarpet_in_haml.feature

@@ -18,7 +18,7 @@ Feature: Markdown support in Haml
       """
     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 ">H1</h1>"
     Then I should see "<p>paragraph</p>"
 
 

data/fixtures/asset-hash-host-app/source/stylesheets/fragment.css.scss

@@ -0,0 +1,4 @@
+#main {
+  padding: 50px;
+  background-image: image-url('100px.jpg#test');
+}

data/fixtures/indexable-app/source/evil spaces.html

@@ -0,0 +1 @@
+Spaces

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

@@ -119,7 +119,7 @@ module Middleman::Cli
       # @return [String] The full path of the file that was written
       def render_to_file(resource)
         build_dir = self.class.shared_instance.config[:build_dir]
-        output_file = File.join(build_dir, resource.destination_path)
+        output_file = File.join(build_dir, resource.destination_path.gsub('%20', ' '))
 
         if resource.binary?
           if !File.exists?(output_file)
@@ -236,7 +236,7 @@ module Middleman::Cli
       @cleaning_queue = []
       return unless File.exist?(@destination)
 
-      paths = ::Middleman::Util.all_files_under(@destination)
+      paths = ::Middleman::Util.all_files_under(@destination).map(&:realpath)
       @cleaning_queue += paths.select do |path|
         path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
       end

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

@@ -0,0 +1,41 @@
+require "kramdown"
+
+module Middleman
+  module Renderers
+
+    # Our own Kramdown Tilt template that simply uses our custom renderer.
+    class KramdownTemplate < ::Tilt::KramdownTemplate
+      def evaluate(scope, locals, &block)
+        @output ||= begin
+          output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options)
+          @engine.warnings.concat(warnings)
+          output
+        end
+      end
+    end
+
+    # Custom Kramdown renderer that uses our helpers for images and links
+    class MiddlemanKramdownHTML < ::Kramdown::Converter::Html
+      cattr_accessor :middleman_app
+
+      def convert_img(el, indent)
+        attrs = el.attr.dup
+        link = attrs.delete('src')
+        middleman_app.image_tag(link, attrs)
+      end
+
+      def convert_a(el, indent)
+        content = inner(el, indent)
+        attr = el.attr.dup
+        if attr['href'] =~ /\Amailto:/
+          mail_addr = attr['href'].sub(/\Amailto:/, '')
+          attr['href'] = obfuscate('mailto') << ":" << obfuscate(mail_addr)
+          content = obfuscate(content) if content == mail_addr
+        end
+
+        link = attr.delete('href')
+        middleman_app.link_to(content, link, attr)
+      end
+    end
+  end
+end

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

@@ -23,13 +23,18 @@ module Middleman
 
           # Once configuration is parsed
           app.after_configuration do
+            markdown_exts = %w(markdown mdown md mkd mkdn)
 
             begin
               # Look for the user's preferred engine
               if config[:markdown_engine] == :redcarpet
                 require "middleman-core/renderers/redcarpet"
-                ::Tilt.prefer(::Middleman::Renderers::RedcarpetTemplate)
+                ::Tilt.prefer(::Middleman::Renderers::RedcarpetTemplate, *markdown_exts)
                 MiddlemanRedcarpetHTML.middleman_app = self
+              elsif config[:markdown_engine] == :kramdown
+                require "middleman-core/renderers/kramdown"
+                ::Tilt.prefer(::Middleman::Renderers::KramdownTemplate, *markdown_exts)
+                MiddlemanKramdownHTML.middleman_app = self
               elsif !config[:markdown_engine].nil?
                 # Map symbols to classes
                 markdown_engine_klass = if config[:markdown_engine].is_a? Symbol
@@ -41,7 +46,7 @@ module Middleman
                 end
 
                 # Tell tilt to use that engine
-                ::Tilt.prefer(markdown_engine_klass)
+                ::Tilt.prefer(markdown_engine_klass, *markdown_exts)
               end
             rescue LoadError
               logger.warn "Requested Markdown engine (#{config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?"

data/lib/middleman-core/sitemap/extensions/redirects.rb

@@ -77,7 +77,7 @@ module Middleman
           def template?
             true
           end
-      
+
           def render(*args, &block)
             url = ::Middleman::Util.url_for(store.app, @request_path, :relative => false, :find_resource => true)
 
@@ -89,6 +89,7 @@ module Middleman
                   <head>
                     <meta http-equiv=refresh content="0; url=#{url}" />
                     <meta name="robots" content="noindex,follow" />
+                    <meta http-equiv="cache-control" content="no-cache" />
                   </head>
                   <body>
                   </body>

data/lib/middleman-core/sitemap/resource.rb

@@ -38,7 +38,7 @@ module Middleman
       def initialize(store, path, source_file=nil)
         @store       = store
         @app         = @store.app
-        @path        = path
+        @path        = path.gsub(' ', '%20') # handle spaces in filenames
         @source_file = source_file
 
         @destination_paths = [@path]

data/lib/middleman-core/util.rb

@@ -153,6 +153,7 @@ module Middleman
     def self.url_for(app, path_or_resource, options={})
       # Handle Resources and other things which define their own url method
       url = path_or_resource.respond_to?(:url) ? path_or_resource.url : path_or_resource
+      url = url.gsub(' ', '%20')
 
       begin
         uri = URI(url)

data/lib/middleman-core/version.rb

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

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

@@ -34,7 +34,7 @@ class Middleman::CoreExtensions::Compass < ::Middleman::Extension
 
       # Disable this initially, the cache_buster extension will
       # re-enable it if requested.
-      compass_config.asset_cache_buster :none
+      compass_config.asset_cache_buster { |_| nil }
 
       # Disable this initially, the relative_assets extension will
 

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

@@ -13,7 +13,7 @@ if !defined?(::Padrino::Helpers)
   require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
   require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
 end
-    
+
 class Padrino::Helpers::OutputHelpers::ErbHandler
   # Force Erb capture not to use safebuffer
   def capture_from_template(*args, &block)
@@ -176,11 +176,15 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       if path.include?('//') or path.start_with?('data:')
         path
       else # rewrite paths to use their destination path
-        path = File.join(prefix, path)
-        if resource = sitemap.find_resource_by_path(path)
+        if resource = sitemap.find_resource_by_destination_path(url_for(path))
           resource.url
         else
-          File.join(config[:http_prefix], 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
     end

data/middleman-core.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 1.2.2"])
+  s.add_dependency("listen", ["~> 1.1"])
 
   # i18n
   s.add_dependency("i18n", ["~> 0.6.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +195,8 @@ files:
 - features/layouts_dir.feature
 - features/liquid.feature
 - features/markdown.feature
+- features/markdown_kramdown.feature
+- features/markdown_kramdown_in_haml.feature
 - features/markdown_redcarpet.feature
 - features/markdown_redcarpet_in_haml.feature
 - features/minify_css.feature
@@ -260,6 +262,7 @@ files:
 - fixtures/asset-hash-host-app/source/index.html.erb
 - fixtures/asset-hash-host-app/source/layout.erb
 - fixtures/asset-hash-host-app/source/other.html.erb
+- fixtures/asset-hash-host-app/source/stylesheets/fragment.css.scss
 - fixtures/asset-hash-host-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-host-app/source/subdir/index.html.erb
 - fixtures/asset-host-app/config.rb
@@ -525,6 +528,7 @@ files:
 - fixtures/indexable-app/source/.htpasswd
 - fixtures/indexable-app/source/.nojekyll
 - fixtures/indexable-app/source/a_folder/needs_index.html
+- fixtures/indexable-app/source/evil spaces.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
@@ -955,6 +959,7 @@ files:
 - lib/middleman-core/renderers/coffee_script.rb
 - lib/middleman-core/renderers/erb.rb
 - lib/middleman-core/renderers/haml.rb
+- lib/middleman-core/renderers/kramdown.rb
 - lib/middleman-core/renderers/less.rb
 - lib/middleman-core/renderers/liquid.rb
 - lib/middleman-core/renderers/markdown.rb
@@ -1359,7 +1364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1415,6 +1420,8 @@ test_files:
 - features/layouts_dir.feature
 - features/liquid.feature
 - features/markdown.feature
+- features/markdown_kramdown.feature
+- features/markdown_kramdown_in_haml.feature
 - features/markdown_redcarpet.feature
 - features/markdown_redcarpet_in_haml.feature
 - features/minify_css.feature
@@ -1480,6 +1487,7 @@ test_files:
 - fixtures/asset-hash-host-app/source/index.html.erb
 - fixtures/asset-hash-host-app/source/layout.erb
 - fixtures/asset-hash-host-app/source/other.html.erb
+- fixtures/asset-hash-host-app/source/stylesheets/fragment.css.scss
 - fixtures/asset-hash-host-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-host-app/source/subdir/index.html.erb
 - fixtures/asset-host-app/config.rb
@@ -1745,6 +1753,7 @@ test_files:
 - fixtures/indexable-app/source/.htpasswd
 - fixtures/indexable-app/source/.nojekyll
 - fixtures/indexable-app/source/a_folder/needs_index.html
+- fixtures/indexable-app/source/evil spaces.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html