middleman-more 3.0.11 → 3.0.12.pre.1

data/features/cache_buster.feature

@@ -25,3 +25,18 @@ Feature: Generate mtime-based query string for busting browser caches
     When I go to "/cache-buster.html"
     Then I should see "site.css?"
     Then I should see "blank.gif?"
+
+  Scenario: Rendering css with the feature and relative_assets enabled
+    Given "relative_assets" feature is "enabled"
+    Given "cache_buster" feature is "enabled"
+    And the Server is running at "cache-buster-app"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should see "blank.gif?"
+
+  Scenario: Rendering html with the feature and relative_assets enabled
+    Given "relative_assets" feature is "enabled"
+    Given "cache_buster" feature is "enabled"
+    And the Server is running at "cache-buster-app"
+    When I go to "/cache-buster.html"
+    Then I should see "site.css?"
+    Then I should see "blank.gif?"

data/features/helpers_form_tag.feature

@@ -0,0 +1,26 @@
+Feature: form_tag helper
+
+  Scenario: form_tag produces relative links
+    Given a fixture app "indexable-app"
+    And an empty file named "config.rb"
+    And a file named "source/form_tag.html.erb" with:
+    """
+    absolute: <% form_tag "/needs_index.html#absolute", :relative => true do %>
+    <% end %>
+    relative: <% form_tag "needs_index.html#relative", :relative => true do %>
+    <% end %>
+    """
+    And a file named "source/form_tag/sub.html.erb" with:
+    """
+    absolute: <% form_tag "/needs_index.html#absolute", :relative => true do %>
+    <% end %>
+    relative: <% form_tag "../needs_index.html#relative", :relative => true do %>
+    <% end %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/form_tag.html"
+    Then I should see 'action="needs_index.html#absolute"'
+    Then I should see 'action="needs_index.html#relative"'
+    When I go to "/form_tag/sub.html"
+    Then I should see 'action="../needs_index.html#absolute"'
+    Then I should see 'action="../needs_index.html#relative"'

data/features/helpers_url_for.feature

@@ -0,0 +1,152 @@
+Feature: url_for helper
+
+  Scenario: url_for produces relative links
+    Given a fixture app "indexable-app"
+    And an empty file named "config.rb"
+    And a file named "source/url_for.html.erb" with:
+    """
+    absolute: <%= url_for "/needs_index.html", :relative => true %>
+    relative: <%= url_for "needs_index.html", :relative => true %>
+    """
+    And a file named "source/url_for/sub.html.erb" with:
+    """
+    absolute: <%= url_for "/needs_index.html", :relative => true %>
+    relative: <%= url_for "../needs_index.html", :relative => true %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/url_for.html"
+    Then I should see 'absolute: needs_index.html'
+    Then I should see 'relative: needs_index.html'
+    When I go to "/url_for/sub.html"
+    Then I should see 'absolute: ../needs_index.html'
+    Then I should see 'relative: ../needs_index.html'
+
+  Scenario: url_for 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='url_for.html')
+        sitemap.find_resource_by_destination_path(path).children
+      end
+    end
+    """
+    And a file named "source/url_for.html.erb" with:
+    """
+    <% menu_items.each do |item| %>
+        "<%= url_for(item.url) %>"
+        "<%= url_for(item) %>"
+    <% end %>
+    """
+    And a file named "source/url_for/sub.html.erb" with:
+    """
+    <% menu_items.each do |item| %>
+        "<%= url_for(item.url) %>"
+        "<%= url_for(item) %>"
+    <% end %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/url_for.html"
+    Then I should see '"url_for/sub.html"'
+    Then I should not see "/url_for/sub.html"
+    When I go to "/url_for/sub.html"
+    Then I should see '"sub.html"'
+    Then I should not see "/url_for/sub.html"
+
+  Scenario: url_for produces relative links when :relative_links is set to true
+    Given a fixture app "indexable-app"
+    And a file named "config.rb" with:
+    """
+    set :relative_links, true
+    """
+    And a file named "source/url_for.html.erb" with:
+    """
+    absolute: <%= url_for "/needs_index.html" %>
+    relative: <%= url_for "needs_index.html", :relative => false %>
+    unknown: <%= url_for "foo.html" %>
+    """
+    And a file named "source/url_for/sub.html.erb" with:
+    """
+    absolute: <%= url_for "/needs_index.html" %>
+    relative: <%= url_for "../needs_index.html" %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/url_for.html"
+    Then I should see 'absolute: needs_index.html'
+    Then I should see 'relative: /needs_index.html'
+    Then I should see 'unknown: foo.html'
+    When I go to "/url_for/sub.html"
+    Then I should see 'absolute: ../needs_index.html'
+    Then I should see 'relative: ../needs_index.html'
+  
+  Scenario: url_for knows about directory indexes
+    Given a fixture app "indexable-app"
+    And a file named "source/url_for.html.erb" with:
+    """
+    absolute: <%= url_for "/needs_index.html", :relative => true %>
+    relative: <%= url_for "needs_index.html", :relative => true %>
+    """
+    And a file named "source/url_for/sub.html.erb" with:
+    """
+    absolute: <%= url_for "/needs_index.html", :relative => true %>
+    relative: <%= url_for "../needs_index.html", :relative => true %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/url_for/"
+    Then I should see 'absolute: ../needs_index/'
+    Then I should see 'relative: ../needs_index/'
+    When I go to "/url_for/sub/"
+    Then I should see 'absolute: ../../needs_index/'
+    Then I should see 'relative: ../../needs_index/'
+
+  Scenario: url_for can take a Resource
+    Given a fixture app "indexable-app"
+    And a file named "source/url_for.html.erb" with:
+    """
+    "<%= url_for sitemap.find_resource_by_path("/needs_index.html") %>"
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/url_for/"
+    Then I should see '"/needs_index/"'
+
+  Scenario: Setting http_prefix
+    Given a fixture app "indexable-app"
+    And a file named "config.rb" with:
+    """
+    set :http_prefix, "/foo"
+    """
+    And a file named "source/url_for.html.erb" with:
+    """
+    <%= url_for "/needs_index.html" %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/url_for.html"
+    Then I should see '/foo/needs_index.html'
+
+  Scenario: url_for preserves query string and anchor and isn't messed up by them
+    Given a fixture app "indexable-app"
+    And a file named "source/url_for.html.erb" with:
+    """
+    Needs Index Anchor <%= url_for "/needs_index.html#foo" %>
+    Needs Index Query <%= url_for "/needs_index.html?foo" %>
+    Needs Index Query and Anchor <%= url_for "/needs_index.html?foo#foo" %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/url_for/"
+    Then I should see 'Needs Index Anchor /needs_index/#foo'
+    Then I should see 'Needs Index Query /needs_index/?foo'
+    Then I should see 'Needs Index Query and Anchor /needs_index/?foo#foo'
+
+  Scenario: url_for accepts a :query option that appends a query string
+    Given a fixture app "indexable-app"
+    And a file named "source/url_for.html.erb" with:
+    """
+    Needs Index String <%= url_for "/needs_index.html", :query => "foo" %>
+    Needs Index Hash <%= url_for "/needs_index.html", :query => { :foo => :bar } %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/url_for/"
+    Then I should see 'Needs Index String /needs_index/?foo'
+    Then I should see 'Needs Index Hash /needs_index/?foo=bar'

data/features/i18n_preview.feature

@@ -103,6 +103,51 @@ Feature: i18n Preview
     Then I should see "Como Esta?"
     When I go to "/spanish/hola.html"
     Then I should see "Hola World"
+
+  Scenario: Running localize with a non-English mount config
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n, :mount_at_root => :es
+      """
+    Given the Server is running at "i18n-test-app"
+    When I go to "/en/index.html"
+    Then I should see "Howdy"
+    When I go to "/en/hello.html"
+    Then I should see "Hello World"
+    When I go to "/"
+    Then I should see "Como Esta?"
+    When I go to "/hola.html"
+    Then I should see "Hola World"
+    When I go to "/hello.html"
+    Then I should see "File Not Found"
+    When I go to "/es/index.html"
+    Then I should see "File Not Found"
+    When I go to "/es/hola.html"
+    Then I should see "File Not Found"
+
+  Scenario: Running localize with a non-English lang subset
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n, :langs => :es
+      """
+    Given the Server is running at "i18n-test-app"
+    When I go to "/en/index.html"
+    Then I should see "File Not Found"
+    When I go to "/en/hello.html"
+    Then I should see "File Not Found"
+    When I go to "/"
+    Then I should see "Como Esta?"
+    When I go to "/hola.html"
+    Then I should see "Hola World"
+    When I go to "/hello.html"
+    Then I should see "File Not Found"
+    When I go to "/es/index.html"
+    Then I should see "File Not Found"
+    When I go to "/es/hola.html"
+    Then I should see "File Not Found"
+    
     
   Scenario: Running localize with the no mount config
     Given a fixture app "i18n-test-app"

data/features/minify_css.feature

@@ -53,13 +53,11 @@ Feature: Minify CSS
     When I go to "/inline-css.html"
     Then I should see:
     """
-    <style type='text/css'>
-      /*<![CDATA[*/
-        body {
-          test: style;
-          good: deal;
-        }
-      /*]]>*/
+    <style>
+      body {
+        test: style;
+        good: deal;
+      }
     </style>
     """
    
@@ -83,7 +81,7 @@ Feature: Minify CSS
     When I go to "/inline-css.html"
     Then I should see:
     """
-    <style type='text/css'>
+    <style>
       body {
         test: style;
         good: deal; }
@@ -108,7 +106,7 @@ Feature: Minify CSS
     When I go to "/inline-css.html"
     Then I should see:
     """
-    <style type='text/css'>
+    <style>
       Hello
     </style>
     """
@@ -123,9 +121,7 @@ Feature: Minify CSS
     When I go to "/inline-css.html"
     Then I should see:
     """
-    <style type='text/css'>
-      /*<![CDATA[*/
-     body{test:style;good:deal}
-      /*]]>*/
+    <style>
+      body{test:style;good:deal}
     </style>
     """

data/features/minify_javascript.feature

@@ -10,15 +10,13 @@ Feature: Minify Javascript
     When I go to "/inline-js.html"
     Then I should see:
     """
-    <script type='text/javascript'>
-      //<![CDATA[
-        ;(function() {
-          this;
-          should();
-          all.be();
-          on = { one: line };
-        })();
-      //]]>
+    <script>
+      ;(function() {
+        this;
+        should();
+        all.be();
+        on = { one: line };
+      })();
     </script>
     <script>
       ;(function() {
@@ -61,15 +59,13 @@ Feature: Minify Javascript
     When I go to "/inline-js.html"
     Then I should see:
     """
-    <script type='text/javascript'>
-      //<![CDATA[
-        ;(function() {
-          this;
-          should();
-          all.be();
-          on = { one: line };
-        })();
-      //]]>
+    <script>
+      ;(function() {
+        this;
+        should();
+        all.be();
+        on = { one: line };
+      })();
     </script>
     <script>
       ;(function() {
@@ -110,10 +106,8 @@ Feature: Minify Javascript
     When I go to "/inline-js.html"
     Then I should see:
     """
-    <script type='text/javascript'>
-      //<![CDATA[
-    Hello
-      //]]>
+    <script>
+      Hello
     </script>
     <script>
       Hello
@@ -138,10 +132,8 @@ Feature: Minify Javascript
     When I go to "/inline-js.html"
     Then I should see:
     """
-    <script type='text/javascript'>
-      //<![CDATA[
-    (function(){this,should(),all.be(),on={one:line}})();
-      //]]>
+    <script>
+      (function(){this,should(),all.be(),on={one:line}})();
     </script>
     <script>
       (function(){this,should(),too()})();
@@ -177,12 +169,11 @@ Feature: Minify Javascript
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:
       """
-      require "coffee-filter"
       activate :minify_javascript, :inline => true
       """
     And the Server is running at "minify-js-app"
     When I go to "/inline-coffeescript.html"
-    Then I should see "6" lines
+    Then I should see "3" lines
   
   Scenario: Rendering external js (coffeescript) with the feature enabled
     Given a fixture app "minify-js-app"
@@ -198,8 +189,6 @@ Feature: Minify Javascript
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
-      require "coffee-filter"
-      
       module ::PassThrough
         def self.compress(data)
           data
@@ -214,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 "16" lines
+    Then I should see "13" lines
     
   Scenario: Rendering external js (coffeescript) with a passthrough minifier
     Given a fixture app "passthrough-app"

data/fixtures/coffeescript-app/config.rb

@@ -1 +0,0 @@
-require "coffee-filter"

data/fixtures/minify-js-app/config.rb

@@ -1 +0,0 @@
-require "coffee-filter"

data/fixtures/passthrough-app/source/inline-css.html.haml

@@ -1,5 +1,4 @@
-%style(type="text/css")
-  :sass
-    body
-      test: style
-      good: deal
+:sass
+  body
+    test: style
+    good: deal

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

@@ -64,7 +64,7 @@ module Middleman
           # If the basename of the request as no extension, assume we are serving a
           # directory and join index_file to the path.
           path = File.join(asset_dir, current_path)
-          path = path.gsub(File.extname(path), ".#{asset_ext}")
+          path = path.sub(/#{File.extname(path)}$/, ".#{asset_ext}")
 
           yield path if sitemap.find_resource_by_path(path)
         end
@@ -74,11 +74,11 @@ module Middleman
         # @return [String]
         def page_classes
           path = current_path.dup
-          path << index_file if path.match(%r{/$})
-          path = path.gsub(%r{^/}, '')
+          path << index_file if path.end_with?('/')
+          path = Util.strip_leading_slash(path)
 
           classes = []
-          parts = path.split('.')[0].split('/')
+          parts = path.split('.').first.split('/')
           parts.each_with_index { |path, i| classes << parts.first(i+1).join('_') }
 
           classes.join(' ')
@@ -90,22 +90,93 @@ module Middleman
         # @param [String] source The path to the file
         # @return [String]
         def asset_path(kind, source)
-          return source if source =~ /^http/
+          return source if source.to_s.include?('//')
           asset_folder  = case kind
             when :css    then css_dir
             when :js     then js_dir
             when :images then images_dir
             else kind.to_s
           end
-          source = source.to_s.gsub(/\s/, '')
+          source = source.to_s.tr(' ', '')
           ignore_extension = (kind == :images) # don't append extension
-          source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
-          if source =~ %r{^/} # absolute path
-            asset_folder = ""
-          end
+          source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}")
+          asset_folder = "" if source.start_with?('/') # absolute path
+
           asset_url(source, asset_folder)
         end
 
+        # Given a source path (referenced either absolutely or relatively)
+        # or a Resource, this will produce the nice URL configured for that
+        # path, respecting :relative_links, directory indexes, etc.
+        def url_for(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
+
+          begin
+            uri = URI(url)
+          rescue URI::InvalidURIError
+            # Nothing we can do with it, it's not really a URI
+            return url
+          end
+
+          relative = options.delete(:relative)
+          raise "Can't use the relative option with an external URL" if relative && uri.host
+
+          # 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
+          effective_relative = true if relative.nil? && relative_links
+
+          # Try to find a sitemap resource corresponding to the desired path
+          this_resource = current_resource # store in a local var to save work
+          if path_or_resource.is_a?(Sitemap::Resource)
+            resource = path_or_resource 
+            resource_url = url
+          elsif this_resource && uri.path
+            # Handle relative urls
+            url_path = Pathname(uri.path)
+            current_source_dir = Pathname('/' + this_resource.path).dirname
+            url_path = current_source_dir.join(url_path) if url_path.relative?
+            resource = sitemap.find_resource_by_path(url_path.to_s)
+            resource_url = resource.url if resource
+          end
+
+          if resource
+            # Switch to the relative path between this_resource and the given resource
+            # if we've been asked to.
+            if effective_relative
+              # Output urls relative to the destination path, not the source path
+              current_dir = Pathname('/' + this_resource.destination_path).dirname
+              relative_path = 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?('/') && !relative_path.end_with?('/')
+                relative_path << '/'
+              end
+
+              uri.path = relative_path
+            else
+              uri.path = resource_url
+            end
+          else
+            # If they explicitly asked for relative links but we can't find a resource...
+            raise "No resource exists at #{url}" if relative
+          end
+            
+          # Support a :query option that can be a string or hash
+          if query = options.delete(:query)
+            uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
+          end
+
+          # Support a :fragment or :anchor option just like Padrino
+          fragment = options.delete(:anchor) || options.delete(:fragment)
+          uri.fragment = fragment.to_s if fragment
+          
+          # Finally make the URL back into a string
+          uri.to_s
+        end
+
         # Overload the regular link_to to be sitemap-aware - if you
         # reference a source path, either absolutely or relatively,
         # you'll get that resource's nice URL. Also, there is a
@@ -123,75 +194,27 @@ module Middleman
           url_arg_index = block_given? ? 0 : 1
           options_index = block_given? ? 1 : 2
 
+          if block_given? && args.size > 2
+            raise ArgumentError.new("Too many arguments to link_to(url, options={}, &block)")
+          end
+
           if url = args[url_arg_index]
             options = args[options_index] || {}
-            relative = options.delete(:relative)
-
-            # Handle Resources, which define their own url method
-            if url.respond_to? :url
-              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
-              current_source_dir = Pathname('/' + current_resource.path).dirname
-
-              begin
-                uri = URI(url)
-                url_path = uri.path
-              rescue
-              end
-
-              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_path)
-
-                # 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
-
-                    # 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 << '/'
-                    end
-                  else
-                    new_url = resource.url
-                  end
-
-                  uri.path = new_url
-
-                  args[url_arg_index] = uri.to_s
-                else
-                  raise "No resource exists at #{url}" if relative
-                end
-              end
-            end
-
-            # Support a :query option that can be a string or hash
-            if query = options.delete(: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
+            raise ArgumentError.new("Options must be a hash") unless options.is_a?(Hash)
+            
+            # Transform the url through our magic url_for method
+            args[url_arg_index] = url_for(url, options)
           end
             
           super(*args, &block)
         end
+
+        # Modified Padrino form_for that uses Middleman's url_for
+        # to transform the URL.
+        def form_tag(url, options={}, &block)
+          url = url_for(url, options)
+          super
+        end
       end
     end
   end

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

@@ -26,9 +26,10 @@ module Middleman
 
         def initialize(app, options={})
           @app = app
-          @locales_glob = File.join(app.locales_dir, "**", "*.{rb,yml}")
+          @locales_glob = File.join(app.locales_dir, "**", "*.{rb,yml,yaml}")
 
-          regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml}", "rb|yml")
+          # File.fnmatch doesn't support brackets: {rb,yml}
+          regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml,yaml}", "rb|ya?ml")
           @locales_regex = %r{^#{regex}}
 
           @maps = {}
@@ -43,7 +44,7 @@ module Middleman
           @mount_at_root = @options.has_key?(:mount_at_root) ? @options[:mount_at_root] : langs.first
 
           if !@app.build?
-            logger.info "== Locales: #{langs.join(", ")}"
+            logger.info "== Locales: #{langs.join(", ")} (Default #{@mount_at_root})"
           end
 
           # Don't output localizable files
@@ -52,15 +53,20 @@ module Middleman
           @app.sitemap.provides_metadata_for_path do |url|
             if d = get_localization_data(url)
               lang, page_id = d
-              instance_vars = Proc.new {
-                ::I18n.locale = lang
-                @lang         = lang
-                @page_id      = page_id
-              }
-              { :blocks => [instance_vars] }
             else
-              {}
+              # Default to the @mount_at_root lang
+              page_id = nil
+              lang = @mount_at_root
             end
+
+            instance_vars = Proc.new do
+              ::I18n.locale = lang
+              @lang         = lang
+              @page_id      = page_id
+            end
+
+            locals = { :lang => lang, :page_id => page_id }
+            { :blocks => [instance_vars], :locals => locals }
           end
 
           @app.sitemap.register_resource_list_manipulator(
@@ -73,15 +79,17 @@ module Middleman
         end
 
         def on_file_changed(file)
-          if @locales_regex.match(file)
+          if @locales_regex =~ file
             ::I18n.reload!
           end
         end
 
         def langs
-          @options[:langs] || begin
+          if @options[:langs]
+            Array(@options[:langs]).map(&:to_sym)
+          else
             Dir[File.join(@app.root, @locales_glob)].map { |file|
-              File.basename(file).sub(/\.yml$/, "").sub(/\.rb$/, "")
+              File.basename(file).sub(/\.ya?ml$/, "").sub(/\.rb$/, "")
             }.sort.map(&:to_sym)
           end
         end

data/lib/middleman-more/extensions/automatic_image_sizes.rb

@@ -38,7 +38,7 @@ module Middleman
             params[:alt] ||= ""
 
             real_path = path
-            real_path = File.join(images_dir, real_path) unless real_path =~ %r{^/}
+            real_path = File.join(images_dir, real_path) unless real_path.start_with?('/')
             full_path = File.join(source_dir, real_path)
 
             if File.exists? full_path

data/lib/middleman-more/extensions/relative_assets.rb

@@ -32,11 +32,11 @@ module Middleman
         def asset_url(path, prefix="")
           path = super(path, prefix)
 
-          if path.include?("//")
+          if path.include?("//") || !current_resource
             path
           else
             current_dir = Pathname('/' + current_resource.destination_path)
-            Pathname(path).relative_path_from(current_dir.dirname)
+            Pathname(path).relative_path_from(current_dir.dirname).to_s
           end
         end
       end

data/middleman-more.gemspec

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
 require File.expand_path("../../middleman-core/lib/middleman-core/version.rb", __FILE__)
 
 Gem::Specification.new do |s|

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.11
-  prerelease: 
+  version: 3.0.12.pre.1
+  prerelease: 7
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-20 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.11
+        version: 3.0.12.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.11
+        version: 3.0.12.pre.1
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -219,9 +219,11 @@ files:
 - features/gzip.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
+- features/helpers_form_tag.feature
 - features/helpers_link_to.feature
 - features/helpers_lorem.feature
 - features/helpers_page_classes.feature
+- features/helpers_url_for.feature
 - features/i18n_builder.feature
 - features/i18n_preview.feature
 - features/ignore.feature
@@ -627,6 +629,8 @@ files:
 - lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss
 - lib/middleman_extension.rb
 - middleman-more.gemspec
+- spec/middleman-more/future_spec.rb
+- spec/spec_helper.rb
 homepage: http://middlemanapp.com
 licenses:
 - MIT
@@ -642,19 +646,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1634045275272907332
+      hash: -2224394918226240711
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1634045275272907332
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
@@ -676,9 +677,11 @@ test_files:
 - features/gzip.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
+- features/helpers_form_tag.feature
 - features/helpers_link_to.feature
 - features/helpers_lorem.feature
 - features/helpers_page_classes.feature
+- features/helpers_url_for.feature
 - features/i18n_builder.feature
 - features/i18n_preview.feature
 - features/ignore.feature