middleman-more 3.0.0.rc.2 → 3.0.0.rc.3

data/features/former_padrino_helpers.feature

@@ -6,7 +6,22 @@ Feature: Built-in macro view helpers
     When I go to "/former_padrino_test.html"
     And I should see 'href="test2.com"'
     And I should see 'src="/images/test2.png"'
+    And I should see 'src="/images/100px.png"'
     And I should see 'src="/javascripts/test1.js"'
     And I should see 'href="/stylesheets/test1.css"'
     And I should see '1 KB'
+
+  Scenario: Setting http_prefix
+    Given a fixture app "padrino-helpers-app"
+    And a file named "config.rb" with:
+    """
+    set :http_prefix, "/foo"
+    """
+    And the Server is running at "padrino-helpers-app"
+    When I go to "/former_padrino_test.html"
+    And I should see 'src="/foo/images/test2.png"'
+    And I should see 'src="/foo/images/100px.png"'
+    And I should see 'src="/foo/javascripts/test1.js"'
+    And I should see 'href="/foo/stylesheets/test1.css"'
+
                 

data/features/helpers_link_to.feature

@@ -61,11 +61,11 @@ Feature: link_to helper
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to/"
-    Then I should see 'absolute: <a href="needs_index/">Needs Index</a>'
-    Then I should see 'relative: <a href="needs_index/">Relative</a>'
-    When I go to "/link_to/sub/"
     Then I should see 'absolute: <a href="../needs_index/">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index/">Relative</a>'
+    When I go to "/link_to/sub/"
+    Then I should see 'absolute: <a href="../../needs_index/">Needs Index</a>'
+    Then I should see 'relative: <a href="../../needs_index/">Relative</a>'
 
   Scenario: link_to can take a Resource
     Given a fixture app "indexable-app"
@@ -76,3 +76,18 @@ Feature: link_to helper
     And the Server is running at "indexable-app"
     When I go to "/link_to/"
     Then I should see '<a href="/needs_index/">Needs Index</a>'
+
+  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/link_to.html.erb" with:
+    """
+    <%= link_to "Needs Index", "/needs_index.html" %>
+    """
+    And the Server is running at "indexable-app"
+    When I go to "/link_to.html"
+    Then I should see '<a href="/foo/needs_index.html">Needs Index</a>'
+

data/features/relative_assets.feature

@@ -88,4 +88,15 @@ Feature: Relative Assets
     Given "relative_assets" feature is "enabled"
     And the Server is running at "fonts-app"
     When I go to "/stylesheets/fonts.css"
-    Then I should see "url('../fonts/StMarie-Thin.otf"
+    Then I should see "url('../fonts/StMarie-Thin.otf"
+
+  Scenario: Relative assets via image_tag
+    Given a fixture app "relative-assets-app"
+    Given "relative_assets" feature is "enabled"
+    And a file named "source/sub/image_tag.html.erb" with:
+      """
+      <%= image_tag '/img/blank.gif' %>
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/sub/image_tag.html"
+    Then I should see '<img src="../img/blank.gif" />'

data/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb

@@ -1,5 +1,6 @@
 <%= stylesheet_link_tag "test1" %>
 <%= javascript_include_tag "test1" %>
 <%= image_tag "test2.png", :alt => "alt" %>
+<%= image_tag "100px.png", :alt => "alt" %>
 <%= link_to "Has param", "test2.com", :class => "test" %>
 <%= number_to_human_size(1024) %>

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

@@ -31,13 +31,13 @@ module Middleman
           else # rewrite paths to use their destination path
             path = File.join(prefix, path)
             if resource = sitemap.find_resource_by_path(path)
-              path = resource.destination_path
+              resource.url
+            else
+              File.join(http_prefix, path)
             end
-
-            File.join(http_prefix, path)
           end
         end
       end
     end
   end
-end
+end

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

@@ -102,9 +102,10 @@ module Middleman
           source = source.to_s.gsub(/\s/, '')
           ignore_extension = (kind == :images) # don't append extension
           source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
-          result_path   = source if source =~ %r{^/} # absolute path
-          result_path ||= asset_url(source, asset_folder)
-          "#{result_path}"
+          if source =~ %r{^/} # absolute path
+            asset_folder = ""
+          end
+          asset_url(source, asset_folder)
         end
 
         # Overload the regular link_to to be sitemap-aware - if you
@@ -131,10 +132,11 @@ module Middleman
               raise "Can't use the relative option with an external URL" if relative
             else
               # Handle relative urls
-              current_dir = Pathname('/' + current_resource.path).dirname
+              current_source_dir = Pathname('/' + current_resource.path).dirname
+
               path = Pathname(url)
 
-              url = current_dir.join(path).to_s if path.relative?
+              url = current_source_dir.join(path).to_s if path.relative?
 
               resource = sitemap.find_resource_by_path(url)
               
@@ -148,6 +150,9 @@ module Middleman
               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

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

@@ -30,31 +30,13 @@ module Middleman
         # @param [String] prefix
         # @return [String]
         def asset_url(path, prefix="")
-          begin
-            prefix = images_dir if prefix == http_images_path
-          rescue
-          end
+          path = super(path, prefix)
 
-          if path.include?("://")
-            super(path, prefix)
-          elsif path[0,1] == "/"
+          if path.include?("//")
             path
           else
-            path = File.join(prefix, path) if prefix.length > 0
-            
-            request_path = current_path.dup
-            request_path << index_file if path.match(%r{/$})
-
-            parts = request_path.gsub(%r{^/}, '').split('/')
-
-            if parts.length > 1
-              arry = []
-              (parts.length - 1).times { arry << ".." }
-              arry << path
-              File.join(*arry)
-            else
-              path
-            end
+            current_dir = Pathname('/' + current_resource.destination_path).dirname
+            Pathname(path).relative_path_from(current_dir)
           end
         end
       end

data/middleman-more.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("middleman-core", Middleman::VERSION)
-  s.add_dependency("uglifier", ["~> 1.2.0"])
-  s.add_dependency("haml", [">= 3.1.0"])
-  s.add_dependency("sass", [">= 3.1.7"])
-  s.add_dependency("compass", [">= 0.12.1"])
+  s.add_dependency("uglifier", ["~> 1.2.6"])
+  s.add_dependency("haml", [">= 3.1.6"])
+  s.add_dependency("sass", [">= 3.1.20"])
+  s.add_dependency("compass", [">= 0.12.2"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("coffee-script-source", ["~> 1.3.3"])
   s.add_dependency("execjs", ["~> 1.3.2"])
   s.add_dependency("maruku", ["~> 0.6.0"])
   s.add_dependency("i18n", ["~> 0.6.0"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.6"])
+  s.add_dependency("padrino-helpers", ["0.10.7"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.2
+  version: 3.0.0.rc.3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000 Z
+date: 2012-07-03 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.0.rc.2
+        version: 3.0.0.rc.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.2
+        version: 3.0.0.rc.3
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: 3.1.20
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -177,17 +177,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 0.10.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 0.10.7
 description: A static site generator. Provides dozens of templating languages (Haml,
   Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
   busting, Yaml data (and more) an easy part of your development cycle.
@@ -594,7 +594,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1457809501983501963
+      hash: 2353221539578920153
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: