middleman-more 3.0.7 → 3.0.8.pre.1

data/features/helpers_link_to.feature

@@ -91,3 +91,28 @@ Feature: link_to helper
     When I go to "/link_to.html"
     Then I should see '<a href="/foo/needs_index.html">Needs Index</a>'
 
+  Scenario: link_to preserves query string and anchor and isn't messed up by them
+    Given a fixture app "indexable-app"
+    And a file named "source/link_to.html.erb" with:
+    """
+    <%= link_to "Needs Index Anchor", "/needs_index.html#foo" %>
+    <%= link_to "Needs Index Query", "/needs_index.html?foo" %>
+    <%= link_to "Needs Index Query and Anchor", "/needs_index.html?foo#foo" %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/link_to/"
+    Then I should see '<a href="/needs_index/#foo">Needs Index Anchor</a>'
+    Then I should see '<a href="/needs_index/?foo">Needs Index Query</a>'
+    Then I should see '<a href="/needs_index/?foo#foo">Needs Index Query and Anchor</a>'
+
+  Scenario: link_to accepts a :query option that appends a query string
+    Given a fixture app "indexable-app"
+    And a file named "source/link_to.html.erb" with:
+    """
+    <%= link_to "Needs Index String", "/needs_index.html", :query => "foo" %>
+    <%= link_to "Needs Index Hash", "/needs_index.html", :query => { :foo => :bar } %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/link_to/"
+    Then I should see '<a href="/needs_index/?foo">Needs Index String</a>'
+    Then I should see '<a href="/needs_index/?foo=bar">Needs Index Hash</a>'

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/to_query'
+
 module Middleman
   module CoreExtensions
     # Built-in helpers
@@ -113,6 +115,10 @@ module Middleman
         # set :relative_links, true
         #
         # to config.rb to have all links default to relative.
+        # 
+        # There is also a :query option that can be used to append a
+        # query string, which can be expressed as either a String,
+        # or a Hash which will be turned into URL parameters.
         def link_to(*args, &block)
           url_arg_index = block_given? ? 0 : 1
           options_index = block_given? ? 1 : 2
@@ -130,42 +136,59 @@ module Middleman
               # Handle relative urls
               current_source_dir = Pathname('/' + current_resource.path).dirname
 
-              path = Pathname(url)
+              begin
+                uri = URI(url)
+                url_path = uri.path
+              rescue
+              end
 
-              url = current_source_dir.join(path).to_s if path.relative?
+              if url_path
+                path = Pathname(url_path)
+                url_path = current_source_dir.join(path).to_s if path.relative?
 
-              resource = sitemap.find_resource_by_path(url)
+                resource = sitemap.find_resource_by_path(url_path)
 
-              # Allow people to turn on relative paths for all links with set :relative_links, true
-              # but still override on a case by case basis with the :relative parameter.
-              effective_relative = relative || false
-              if relative.nil? && relative_links
-                effective_relative = true
-              end
+                # Allow people to turn on relative paths for all links with config[:relative_links] = true
+                # but still override on a case by case basis with the :relative parameter.
+                effective_relative = relative || false
+                if relative.nil? && relative_links
+                  effective_relative = true
+                end
 
-              if resource
-                if effective_relative
-                  resource_url = resource.url
+                if resource
+                  if effective_relative
+                    resource_url = resource.url
 
-                  # Output urls relative to the destination path, not the source path
-                  current_dir = Pathname('/' + current_resource.destination_path).dirname
-                  new_url = Pathname(resource_url).relative_path_from(current_dir).to_s
+                    # Output urls relative to the destination path, not the source path
+                    current_dir = Pathname('/' + current_resource.destination_path).dirname
+                    new_url = Pathname(resource_url).relative_path_from(current_dir).to_s
 
-                  # Put back the trailing slash to avoid unnecessary Apache redirects
-                  if resource_url.end_with?('/') && !new_url.end_with?('/')
-                    new_url << '/'
+                    # Put back the trailing slash to avoid unnecessary Apache redirects
+                    if resource_url.end_with?('/') && !new_url.end_with?('/')
+                      new_url << '/'
+                    end
+                  else
+                    new_url = resource.url
                   end
+
+                  uri.path = new_url
+
+                  args[url_arg_index] = uri.to_s
                 else
-                  new_url = resource.url
+                  raise "No resource exists at #{url}" if relative
                 end
-
-                args[url_arg_index] = new_url
-              else
-                raise "No resource exists at #{url}" if relative
               end
             end
           end
 
+          # Support a :query option that can be a string or hash
+          query = options.delete(:query)
+          if query
+            uri = URI(args[url_arg_index])
+            uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
+            args[url_arg_index] = uri.to_s
+          end
+            
           super(*args, &block)
         end
       end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.7
-  prerelease: 
+  version: 3.0.8.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.8.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.8.pre.1
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -641,16 +641,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4377871555131630904
+      hash: 1566393867800215219
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4377871555131630904
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24