middleman-core 4.1.8 → 4.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99765b41dbcadb0a1fe8e9017ce95171fe5e7877
-  data.tar.gz: 972fcfba7e09229dc557444eba1434d6d42a0346
+  metadata.gz: 1bccc6ed0250ec6eca700de9c7a9fe08d002878d
+  data.tar.gz: 74b10ad510adda189d3e9b4f138425b3243246f3
 SHA512:
-  metadata.gz: 52e4d9adb600ebb0a3003902d97e349df96d73c4c679c11885f6d867ce178dbe4905b16ae051b5cece2f3fffdee729fd689b8698fbc32fbcbd3067aaa3462dab
-  data.tar.gz: cbbe75c5a1fc93a1c201cb2db174be431e766eb519f7bba08ba6ff06ccd4e693c7a4707c1602625fc7ac09337e4ddb0cf73e0b55ac1e6d24eae71ece75e69671
+  metadata.gz: a9a907fc76debe6f613ab50ed3e061db1aa2e4cb6f4841c92a2a0ca5674231e608f10da5dca677e683b1a53ac2e9f06d88f55c35e0fce6d824408ef35ba86709
+  data.tar.gz: add958d204c4d9265d5407b5cb5f66e3e41fd8ea948bab1b4cf0d226343cfe65b61918df21ce55b87eeba34c1d5a03f1285c8dfb3deeb05712f0e58627826902

data/features/helpers_link_to.feature

@@ -40,19 +40,29 @@ Feature: link_to helper
     """
     absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
     relative: <%= link_to "Relative", "needs_index.html", relative: true %>
+
+    absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %>
+    relative spaces: <%= link_to "Spaces Relative", "evil spaces.html", relative: true %>
     """
     And a file named "source/link_to/sub.html.erb" with:
     """
     absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
     relative: <%= link_to "Relative", "../needs_index.html", relative: true %>
+
+    absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %>
+    relative spaces: <%= link_to "Spaces Relative", "../evil spaces.html", relative: true %>
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to.html"
     Then I should see 'absolute: <a href="needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="needs_index.html">Relative</a>'
+    Then I should see 'absolute spaces: <a href="evil%20spaces.html">Spaces Index</a>'
+    Then I should see 'relative spaces: <a href="evil%20spaces.html">Spaces Relative</a>'
     When I go to "/link_to/sub.html"
     Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
+    Then I should see 'absolute spaces: <a href="../evil%20spaces.html">Spaces Index</a>'
+    Then I should see 'relative spaces: <a href="../evil%20spaces.html">Spaces Relative</a>'
 
   Scenario: link_to relative works with strip_index_file
     Given a fixture app "indexable-app"
@@ -113,7 +123,7 @@ Feature: link_to helper
     When I go to "/link_to/sub.html"
     Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
-  
+
   Scenario: link_to knows about directory indexes
     Given a fixture app "indexable-app"
     And a file named "source/link_to.html.erb" with:

data/features/markdown_redcarpet_in_slim.feature

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

data/features/sass_in_slim.feature

@@ -0,0 +1,40 @@
+Feature: Sass/SCSS support in Slim
+  In order to test support of the Slim sass and scss filters
+
+  Scenario: Sass filter in Slim works
+    Given a fixture app "sass-in-slim-app"
+    And a file named "config.rb" with:
+      """
+      activate :directory_indexes
+      """
+    And a file named "source/sass_filter.html.slim" with:
+      """
+      sass:
+        .sass
+          margin: 0
+      """
+    Given the Server is running at "sass-in-slim-app"
+    When I go to "/sass_filter/"
+    Then I should see "text/css"
+    Then I should see ".sass"
+    Then I should see "margin:0"
+
+
+  Scenario: SCSS filter in Slim works
+    Given a fixture app "sass-in-slim-app"
+    And a file named "config.rb" with:
+      """
+      activate :directory_indexes
+      """
+    And a file named "source/scss_filter.html.slim" with:
+      """
+      scss:
+        .scss {
+          margin: 0;
+        }
+      """
+    Given the Server is running at "sass-in-slim-app"
+    When I go to "/scss_filter/"
+    Then I should see "text/css"
+    Then I should see ".scss"
+    Then I should see "margin:0"

data/lib/middleman-core/application.rb

@@ -266,6 +266,8 @@ module Middleman
       # Evaluate a passed block if given
       config_context.instance_exec(&block) if block_given?
 
+      apply_cli_options
+
       execute_callbacks(:before_sitemap)
 
       # Initialize the Sitemap
@@ -276,8 +278,6 @@ module Middleman
       # Before config is parsed, before extensions get to it.
       execute_callbacks(:initialized)
 
-      apply_cli_options
-
       # Before config is parsed. Mostly used for extensions.
       execute_callbacks(:before_configuration)
 

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

@@ -12,13 +12,9 @@ class ::Slim::Template
 
   def initialize(file, line, opts, &block)
     if opts.key?(:context)
-      context_hack = {
-        context: opts[:context]
-      }
-
       ::Slim::Embedded::SassEngine.disable_option_validator!
       %w(sass scss markdown).each do |engine|
-        ::Slim::Embedded.options[engine.to_sym] = context_hack
+        (::Slim::Embedded.options[engine.to_sym] ||= {})[:context] = opts[:context]
       end
     end
 

data/lib/middleman-core/template_context.rb

@@ -127,30 +127,36 @@ module Middleman
     # @return [String]
     Contract String, Maybe[Bool] => Maybe[IsA['Middleman::SourceFile']]
     def locate_partial(partial_path, try_static=true)
-      return unless resource = sitemap.find_resource_by_destination_path(current_path)
+      partial_file = nil
+      lookup_stack = []
+      non_root     = partial_path.to_s.sub(/^\//, '')
+      non_root_no_underscore = non_root.sub(/^_/, '').sub(/\/_/, '/')
+
+      if resource = current_resource
+        current_dir  = resource.file_descriptor[:relative_path].dirname
+        relative_dir = current_dir + Pathname(non_root)
+        relative_dir_no_underscore = current_dir + Pathname(non_root_no_underscore)
+      end
 
-      # Look for partials relative to the current path
-      current_dir = resource.file_descriptor[:relative_path].dirname
-      non_root = partial_path.to_s.sub(/^\//, '')
-      relative_dir = current_dir + Pathname(non_root)
 
-      non_root_no_underscore = non_root.sub(/^_/, '').sub(/\/_/, '/')
-      relative_dir_no_underscore = current_dir + Pathname(non_root_no_underscore)
+      lookup_stack.push [ relative_dir.to_s,
+                          { preferred_engine: resource.file_descriptor[:relative_path]
+                                                      .extname[1..-1].to_sym }] if relative_dir
+      lookup_stack.push [ non_root ]
+      lookup_stack.push [ non_root,
+                          { try_static: try_static }]
+      lookup_stack.push [ relative_dir_no_underscore.to_s,
+                          { try_static: try_static }] if relative_dir_no_underscore
+      lookup_stack.push [ non_root_no_underscore,
+                          { try_static: try_static }]
 
-      partial_file = nil
 
-      [
-        [relative_dir.to_s, { preferred_engine: resource.file_descriptor[:relative_path].extname[1..-1].to_sym }],
-        [non_root],
-        [non_root, { try_static: try_static }],
-        [relative_dir_no_underscore.to_s, { try_static: try_static }],
-        [non_root_no_underscore, { try_static: try_static }]
-      ].each do |args|
+      lookup_stack.each do |args|
         partial_file = ::Middleman::TemplateRenderer.resolve_template(@app, *args)
         break if partial_file
       end
 
-      partial_file || nil
+      partial_file
     end
 
     def current_path

data/lib/middleman-core/util/paths.rb

@@ -118,7 +118,9 @@ module Middleman
       # relative path, since it only takes absolute url paths.
       dest_path = url_for(app, path, options.merge(relative: false))
 
-      result = if resource = app.sitemap.find_resource_by_destination_path(dest_path)
+      result = if resource = app.sitemap.find_resource_by_path(dest_path)
+        resource.url
+      elsif resource = app.sitemap.find_resource_by_destination_path(dest_path)
         resource.url
       else
         path = ::File.join(prefix, path)
@@ -158,8 +160,12 @@ module Middleman
       begin
         uri = URI(url)
       rescue ::URI::InvalidURIError
-        # Nothing we can do with it, it's not really a URI
-        return url
+        begin
+          uri = URI(::URI.encode(url))
+        rescue ::URI::InvalidURIError
+          # Nothing we can do with it, it's not really a URI
+          return url
+        end
       end
 
       relative = options[:relative]

data/lib/middleman-core/version.rb

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

data/middleman-core.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency('fast_blank')
   s.add_dependency('parallel')
   s.add_dependency('servolux')
+  s.add_dependency('dotenv')
 
   # Helpers
   s.add_dependency('activesupport', ['~> 4.2'])

data/spec/middleman-core/util_spec.rb

@@ -162,6 +162,13 @@ describe Middleman::Util do
       expect( Middleman::Util.asset_url( @mm, '/how/about/that.html' ) ).to eq '/how/about/that/'
     end
 
+    it "returns a resource url when asset_hash is on" do
+      Given.fixture 'asset-hash-app'
+      @mm = Middleman::Application.new
+
+      expect( Middleman::Util.asset_url( @mm, '100px.png', 'images') ).to match %r|/images/100px-[a-f0-9]+.png|
+    end
+
   end
 
   describe "::find_related_files" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.1.8
+  version: 4.1.9
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -405,6 +419,7 @@ files:
 - features/markdown_kramdown_in_slim.feature
 - features/markdown_redcarpet.feature
 - features/markdown_redcarpet_in_haml.feature
+- features/markdown_redcarpet_in_slim.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/missing-tilt-lib.feature
@@ -427,6 +442,7 @@ files:
 - features/relative_assets.feature
 - features/relative_assets_helpers_only.feature
 - features/sass-assets-paths.feature
+- features/sass_in_slim.feature
 - features/sass_partials.feature
 - features/scss-support.feature
 - features/sitemap_traversal.feature
@@ -1338,6 +1354,7 @@ files:
 - fixtures/sass-assets-path-app/config.rb
 - fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
 - fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
+- fixtures/sass-in-slim-app/config.rb
 - fixtures/scss-app/config.rb
 - fixtures/scss-app/source/stylesheets/layout.css.sass
 - fixtures/scss-app/source/stylesheets/site_scss.css.scss
@@ -1602,6 +1619,7 @@ test_files:
 - features/markdown_kramdown_in_slim.feature
 - features/markdown_redcarpet.feature
 - features/markdown_redcarpet_in_haml.feature
+- features/markdown_redcarpet_in_slim.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/missing-tilt-lib.feature
@@ -1624,6 +1642,7 @@ test_files:
 - features/relative_assets.feature
 - features/relative_assets_helpers_only.feature
 - features/sass-assets-paths.feature
+- features/sass_in_slim.feature
 - features/sass_partials.feature
 - features/scss-support.feature
 - features/sitemap_traversal.feature
@@ -2535,6 +2554,7 @@ test_files:
 - fixtures/sass-assets-path-app/config.rb
 - fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
 - fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
+- fixtures/sass-in-slim-app/config.rb
 - fixtures/scss-app/config.rb
 - fixtures/scss-app/source/stylesheets/layout.css.sass
 - fixtures/scss-app/source/stylesheets/site_scss.css.scss