middleman-more 3.0.8 → 3.0.9

data/features/helpers_link_to.feature

@@ -21,6 +21,40 @@ Feature: link_to helper
     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 relative works with strip_index_file
+    Given a fixture app "indexable-app"
+    And a file named "config.rb" with:
+    """
+    set :relative_links, true
+    set :strip_index_file, true
+    helpers do
+      def menu_items(path='link_to.html')
+        sitemap.find_resource_by_destination_path(path).children
+      end
+    end
+    """
+    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) %>
+    <% 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) %>
+    <% end %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/link_to.html"
+    Then I should see '"link_to/sub.html"'
+    Then I should not see "/link_to/sub.html"
+    When I go to "/link_to/sub.html"
+    Then I should see '"sub.html"'
+    Then I should not see "/link_to/sub.html"
+
   Scenario: link_to produces relative links when :relative_links is set to true
     Given a fixture app "indexable-app"
     And a file named "config.rb" with:

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

@@ -129,8 +129,10 @@ module Middleman
 
             # Handle Resources, which define their own url method
             if url.respond_to? :url
-              args[url_arg_index] = url.url
-            elsif url.include? '://'
+              url = args[url_arg_index] = url.url
+            end
+
+            if url.include? '://'
               raise "Can't use the relative option with an external URL" if relative
             elsif current_resource
               # Handle relative urls

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -641,7 +641,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 747788437241973931
+      hash: -1092538238619179817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -650,7 +650,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 747788437241973931
+      hash: -1092538238619179817
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24