middleman-core 3.0.0.rc.3 → 3.0.0.rc.4

data/features/implied_extensions.feature

@@ -2,6 +2,8 @@ Feature: Use default extensions when user doesn't supply them
 
   Scenario: Default extensions preview
     Given the Server is running at "implied-extensions-app"
+    When I go to "/"
+    Then I should see "hello: world"
     When I go to "/index.html"
     Then I should see "hello: world"
     When I go to "/index.erb"
@@ -9,13 +11,15 @@ Feature: Use default extensions when user doesn't supply them
     When I go to "/index"
     Then I should see "File Not Found"
     
-  Scenario: Default extensions preview  
+  Scenario: Override erb extension
     Given a fixture app "implied-extensions-app"
     And a file named "config.rb" with:
        """
        template_extensions :erb => :htm
        """
     And the Server is running
+    When I go to "/"
+    Then I should see "File Not Found"
     When I go to "/index.htm"
     Then I should see "hello: world"
     When I go to "/index.erb"
@@ -24,6 +28,19 @@ Feature: Use default extensions when user doesn't supply them
     Then I should see "File Not Found"
     When I go to "/index.html"
     Then I should see "File Not Found"
+    
+  Scenario: Override erb extension
+    Given a fixture app "implied-extensions-app"
+    And a file named "config.rb" with:
+       """
+       set :index_file, "index.htm"
+       template_extensions :erb => :htm
+       """
+    And the Server is running
+    When I go to "/"
+    Then I should see "hello: world"
+    When I go to "/index.htm"
+    Then I should see "hello: world"
   
   Scenario: Default extensions build
     Given a fixture app "implied-extensions-app"

data/fixtures/external-helpers/helpers/{three_helper.rb → derp.rb}

@@ -1,3 +1,3 @@
-module ThreeHelper
+module Derp
   def three; "Three"; end
 end

data/fixtures/external-helpers/helpers/{four_helper.rb → four_helpers.rb}

@@ -1,3 +1,3 @@
-module FourHelper
+module FourHelpers
   def four; "Four"; end
 end

data/fixtures/external-helpers/helpers/yet_another_thingy.rb

@@ -0,0 +1,3 @@
+module YetAnotherThingy
+  def two; "Two"; end
+end

data/lib/middleman-core/application.rb

@@ -217,6 +217,14 @@ module Middleman
       logging
     end
 
+    # Work around this bug: http://bugs.ruby-lang.org/issues/4521
+    # where Ruby will call to_s/inspect while printing exception
+    # messages, which can take a long time (minutes at full CPU)
+    # if the object is huge or has cyclic references, like this.
+    def to_s
+      "the Middleman application context"
+    end
+
     # Expand a path to include the index file if it's a directory
     #
     # @private

data/lib/middleman-core/core_extensions/external_helpers.rb

@@ -10,7 +10,7 @@ module Middleman
         def registered(app)
           # Setup a default helpers paths
           app.set :helpers_dir, "helpers"
-          app.set :helpers_filename_glob, "**/*_helper.rb"
+          app.set :helpers_filename_glob, "**/*.rb"
           app.set :helpers_filename_to_module_name_proc, Proc.new { |filename|
             basename = File.basename(filename, File.extname(filename))
             basename.camelcase

data/lib/middleman-core/core_extensions/rendering.rb

@@ -115,9 +115,13 @@ module Middleman
           # handles cases like `style.css.sass.erb`
           content = nil
           while ::Tilt[path]
-            opts[:template_body] = content if content
-            content = render_individual_file(path, locs, opts, context)
-            path = File.basename(path, File.extname(path))
+            begin
+              opts[:template_body] = content if content
+              content = render_individual_file(path, locs, opts, context)
+              path = File.basename(path, File.extname(path))
+            rescue LocalJumpError => e
+              raise "Tried to render a layout (calls yield) at #{path} like it was a template. Non-default layouts need to be in #{source}/layouts."
+            end
           end
       
           # Certain output file types don't use layouts

data/lib/middleman-core/renderers/less.rb

@@ -33,7 +33,6 @@ module Middleman
           if ::Less.const_defined? :Engine
             @engine = ::Less::Engine.new(data)
           else
-            $stderr.puts "HEEERE"
             parser  = ::Less::Parser.new(options.merge :filename => eval_file, :line => line, :paths => [".", File.dirname(eval_file)])
             @engine = parser.parse(data)
           end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.0.rc.3' unless const_defined?(:VERSION)
+  VERSION = '3.0.0.rc.4' unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.3
+  version: 3.0.0.rc.4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -237,10 +237,10 @@ files:
 - fixtures/extensionless-text-files-app/source/README
 - fixtures/extensionless-text-files-app/source/index.html
 - fixtures/external-helpers/config.rb
-- fixtures/external-helpers/helpers/four_helper.rb
+- fixtures/external-helpers/helpers/derp.rb
+- fixtures/external-helpers/helpers/four_helpers.rb
 - fixtures/external-helpers/helpers/one_helper.rb
-- fixtures/external-helpers/helpers/three_helper.rb
-- fixtures/external-helpers/helpers/two_helper.rb
+- fixtures/external-helpers/helpers/yet_another_thingy.rb
 - fixtures/external-helpers/lib/hello_helper.rb
 - fixtures/external-helpers/source/automatic.html.erb
 - fixtures/external-helpers/source/index.html.erb
@@ -530,7 +530,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4571590905911767496
+      hash: 362783579195130288
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -643,10 +643,10 @@ test_files:
 - fixtures/extensionless-text-files-app/source/README
 - fixtures/extensionless-text-files-app/source/index.html
 - fixtures/external-helpers/config.rb
-- fixtures/external-helpers/helpers/four_helper.rb
+- fixtures/external-helpers/helpers/derp.rb
+- fixtures/external-helpers/helpers/four_helpers.rb
 - fixtures/external-helpers/helpers/one_helper.rb
-- fixtures/external-helpers/helpers/three_helper.rb
-- fixtures/external-helpers/helpers/two_helper.rb
+- fixtures/external-helpers/helpers/yet_another_thingy.rb
 - fixtures/external-helpers/lib/hello_helper.rb
 - fixtures/external-helpers/source/automatic.html.erb
 - fixtures/external-helpers/source/index.html.erb

data/fixtures/external-helpers/helpers/two_helper.rb

@@ -1,3 +0,0 @@
-module TwoHelper
-  def two; "Two"; end
-end