middleman 2.0.0.beta2 → 2.0.0.beta3

data/lib/middleman/features/default_helpers.rb

@@ -50,7 +50,7 @@ module Middleman::Features::DefaultHelpers
          else kind.to_s
        end
        source = source.to_s.gsub(/\s/, '')
-       ignore_extension = (asset_folder.to_s == kind.to_s) # don't append extension
+       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)

data/lib/middleman/features/front_matter.rb

@@ -6,12 +6,15 @@ module Middleman::Features::FrontMatter
     def registered(app)
       app.extend ClassMethods
       
+      ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register BlueClothTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RedClothTemplate, 'textile'
+      ::Tilt::register ERBTemplate,    'erb', 'rhtml'
+      ::Tilt::register ErubisTemplate, 'erb', 'rhtml', 'erubis'
     end
     alias :included :registered
   end
@@ -66,4 +69,13 @@ module Middleman::Features::FrontMatter
   class RedClothTemplate < ::Tilt::RedClothTemplate
     include Middleman::Features::FrontMatter::YamlAware
   end
+
+  # ERb
+  class ERBTemplate < ::Tilt::ERBTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+  
+  class ErubisTemplate < ::Tilt::ErubisTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
 end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.beta2"
+  VERSION = "2.0.0.beta3"
 end

data/middleman.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
   s.add_runtime_dependency("coffee-filter", ["~> 0.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.0"])
-  s.add_runtime_dependency("compass", ["~> 0.11.1"])
+  s.add_runtime_dependency("compass", ["0.11.2"])
   s.add_runtime_dependency("compass-susy-plugin", ["~> 0.9.0"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])

metadata

@@ -2,7 +2,7 @@
 name: middleman
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -161,9 +161,9 @@ dependencies:
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.11.1
+        version: 0.11.2
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency