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

data/features/{helpers_relative_link_to.feature → helpers_link_to.feature}

@@ -1,6 +1,6 @@
-Feature: relative_link_to helper
+Feature: link_to helper
 
-  Scenario: relative_link_to produces relative links
+  Scenario: link_to produces relative links
     Given a fixture app "indexable-app"
     And an empty file named "config.rb"
     And a file named "source/link_to.html.erb" with:
@@ -21,7 +21,7 @@ Feature: relative_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: relative_link_to produces relative links when :relative_links is set to true
+  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:
     """
@@ -47,7 +47,7 @@ Feature: relative_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: relative_link_to knows about directory indexes
+  Scenario: link_to knows about directory indexes
     Given a fixture app "indexable-app"
     And a file named "source/link_to.html.erb" with:
     """
@@ -65,4 +65,14 @@ Feature: relative_link_to helper
     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>'
+    Then I should see 'relative: <a href="../needs_index/">Relative</a>'
+
+  Scenario: link_to can take a Resource
+    Given a fixture app "indexable-app"
+    And a file named "source/link_to.html.erb" with:
+    """
+    <%= link_to "Needs Index", sitemap.find_resource_by_path("/needs_index.html") %>
+    """
+    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>'

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

@@ -1,22 +1,19 @@
 module Middleman
   module CoreExtensions
-    
-    # Forward the settings on config.rb and the result of registered 
+
+    # Forward the settings on config.rb and the result of registered
     # extensions to Compass
     module Compass
-  
+
       # Extension registered
       class << self
-    
+
         # Once registered
         def registered(app)
           # Require the library
           require "compass"
-      
-          # Where to look for fonts
-          app.set :fonts_dir, "fonts"
-      
-          # Hooks to manually update the compass config after we're 
+
+          # Hooks to manually update the compass config after we're
           # done with it
           app.define_hook :compass_config
 
@@ -35,14 +32,14 @@ module Middleman
               # Disable this initially, the cache_buster extension will
               # re-enable it if requested.
               config.asset_cache_buster :none
-              
+
               # Disable this initially, the relative_assets extension will
               # re-enable it if requested.
               config.relative_assets = false
-              
+
               # Default output style
               config.output_style = :nested
-              
+
               # No line-comments in test mode (changing paths mess with sha1)
               config.line_comments = false if ENV["TEST"]
 
@@ -50,10 +47,10 @@ module Middleman
                 config.asset_host(&asset_host)
               end
             end
-              
+
             # Call hook
             run_hook :compass_config, ::Compass.configuration
-            
+
             # Tell Tilt to use it as well (for inline sass blocks)
             ::Tilt.register 'sass', CompassSassTemplate
             ::Tilt.prefer(CompassSassTemplate)
@@ -67,7 +64,7 @@ module Middleman
       end
 
     end
-    
+
     # A Compass template for Tilt
     class CompassSassTemplate < ::Middleman::Renderers::Sass::SassPlusCSSFilenameTemplate
     private
@@ -75,13 +72,13 @@ module Middleman
         super.merge(::Compass.configuration.to_sass_engine_options)
       end
     end
-    
-    class CompassScssTemplate <  ::Middleman::Renderers::Sass::ScssPlusCSSFilenameTemplate
+
+    class CompassScssTemplate < ::Middleman::Renderers::Sass::ScssPlusCSSFilenameTemplate
     private
       def sass_options
         super.merge(::Compass.configuration.to_sass_engine_options)
       end
     end
-      
+
   end
-end
+end

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

@@ -124,8 +124,10 @@ module Middleman
             options = args[options_index] || {}
             relative = options.delete(:relative)
             
-
-            if url.include? '://'
+            # Handle Resources, which define their own url method
+            if url.respond_to? :url
+              args[url_arg_index] = url.url
+            elsif url.include? '://'
               raise "Can't use the relative option with an external URL" if relative
             else
               # Handle relative urls

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

@@ -32,7 +32,7 @@ module Middleman
         def manipulate_resource_list(resources)
           resources.each do |resource|
             next unless @exts.include? resource.ext
-            next if @ignore.any? { |r| resource.destination_path.match(r) }
+            next if @ignore.any? { |ignore| Middleman::Util.path_match(ignore, resource.destination_path) }
               
             if resource.template? # if it's a template, render it out
               digest = Digest::SHA1.hexdigest(resource.render)[0..7]

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

@@ -66,7 +66,7 @@ module Middleman
 
             headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
             response = [minified]
-          elsif path.end_with?('.css') && @ignore.none? {|ignore| path =~ ignore }
+          elsif path.end_with?('.css') && @ignore.none? {|ignore| Middleman::Util.path_match(ignore, path) }
             uncompressed_source = ::Middleman::Util.extract_response_text(response)
             minified_css = @compressor.compress(uncompressed_source)
 

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

@@ -75,7 +75,7 @@ module Middleman
 
               headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
               response = [minified]
-            elsif path.end_with?('.js') && @ignore.none? {|ignore| path =~ ignore }
+            elsif path.end_with?('.js') && @ignore.none? {|ignore| Middleman::Util.path_match(ignore, path) }
               uncompressed_source = ::Middleman::Util.extract_response_text(response)
               minified_js = @compressor.compress(uncompressed_source)
 

metadata

@@ -1,215 +1,203 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: middleman-more
-version: !ruby/object:Gem::Version 
-  hash: 15424119
+version: !ruby/object:Gem::Version
+  version: 3.0.0.rc.2
   prerelease: 6
-  segments: 
-  - 3
-  - 0
-  - 0
-  - rc
-  - 1
-  version: 3.0.0.rc.1
 platform: ruby
-authors: 
+authors:
 - Thomas Reynolds
 - Ben Hollis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-06 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15424119
-        segments: 
-        - 3
-        - 0
-        - 0
-        - rc
-        - 1
-        version: 3.0.0.rc.1
-  version_requirements: *id001
+date: 2012-06-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: middleman-core
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc.2
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
-  version_requirements: *id002
-  name: uglifier
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
-  version_requirements: *id003
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
   name: haml
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 1
-        - 7
-        version: 3.1.7
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
   name: sass
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.7
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 12
-        - 1
-        version: 0.12.1
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+- !ruby/object:Gem::Dependency
   name: compass
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.2.0
-  version_requirements: *id006
-  name: coffee-script
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
   name: coffee-script-source
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
-  version_requirements: *id008
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
   name: execjs
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  version_requirements: *id009
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
   name: maruku
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  version_requirements: *id010
+- !ruby/object:Gem::Dependency
   name: i18n
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 10
-        - 6
-        version: 0.10.6
-  version_requirements: *id011
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: padrino-helpers
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.6
   type: :runtime
-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.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.6
+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.
+email:
 - me@tdreyno.com
 - ben@benhollis.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - Rakefile
 - features/asset_hash.feature
@@ -229,9 +217,9 @@ files:
 - features/gzip.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
+- features/helpers_link_to.feature
 - features/helpers_lorem.feature
 - features/helpers_page_classes.feature
-- features/helpers_relative_link_to.feature
 - features/i18n_builder.feature
 - features/i18n_preview.feature
 - features/ignore.feature
@@ -591,43 +579,35 @@ files:
 - lib/middleman-more/extensions/relative_assets.rb
 - lib/middleman_extension.rb
 - middleman-more.gemspec
-has_rdoc: true
 homepage: http://middlemanapp.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1457809501983501963
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
-test_files: 
+test_files:
 - features/asset_hash.feature
 - features/asset_host.feature
 - features/asset_host_compass.feature
@@ -645,9 +625,9 @@ test_files:
 - features/gzip.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
+- features/helpers_link_to.feature
 - features/helpers_lorem.feature
 - features/helpers_page_classes.feature
-- features/helpers_relative_link_to.feature
 - features/i18n_builder.feature
 - features/i18n_preview.feature
 - features/ignore.feature
@@ -988,3 +968,4 @@ test_files:
 - fixtures/wildcard-directory-index-app/source/index.html.erb
 - fixtures/wildcard-directory-index-app/source/layouts/admin.erb
 - fixtures/wildcard-directory-index-app/source/layouts/layout.erb
+has_rdoc: