middleman-core 3.0.8 → 3.0.9

data/features/missing-tilt-lib.feature

@@ -0,0 +1,20 @@
+Feature: Tilt missing support libraries
+
+  Scenario: Rendering Textile and Wiki files
+    Given the Server is running at "missing-tilt-library-app"
+    When I go to "/danger-zone/more-wiki.html.wiki"
+    Then I should see "File Not Found"
+    When I go to "/danger-zone/more-wiki.html"
+    Then I should see "File Not Found"
+    When I go to "/safe-zone/my-wiki.html.wiki"
+    Then I should see "Safe"
+    When I go to "/safe-zone/my-wiki.html"
+    Then I should see "File Not Found"
+    When I go to "/textile-source.html.textile"
+    Then I should see "File Not Found"
+    When I go to "/textile-source.html"
+    Then I should see "File Not Found"
+    When I go to "/wiki-source.html.wiki"
+    Then I should see "Hola"
+    When I go to "/wiki-source.html"
+    Then I should see "File Not Found"

data/fixtures/missing-tilt-library-app/config.rb

@@ -0,0 +1,2 @@
+ignore "danger-zone/*"
+ignore "*.textile"

data/fixtures/missing-tilt-library-app/source/danger-zone/more-wiki.html.wiki

@@ -0,0 +1 @@
+More

data/fixtures/missing-tilt-library-app/source/safe-zone/my-wiki.html.wiki

@@ -0,0 +1 @@
+Safe

data/fixtures/missing-tilt-library-app/source/textile-source.html.textile

@@ -0,0 +1 @@
+Textx

data/fixtures/missing-tilt-library-app/source/wiki-source.html.wiki

@@ -0,0 +1 @@
+Hola

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

@@ -75,6 +75,19 @@ module Middleman
             app.register Middleman::Renderers::Stylus
           rescue LoadError
           end
+
+          # Clean up missing Tilt exts
+          app.after_configuration do
+            Tilt.mappings.each do |key, klasses|
+              begin
+                Tilt[".#{key}"]
+              rescue LoadError
+                Tilt.mappings.delete(key)
+              rescue NameError
+                Tilt.mappings.delete(key)
+              end
+            end
+          end
         end
 
         alias :included :registered

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.8' unless const_defined?(:VERSION)
+  VERSION = '3.0.9' unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
-  s.add_dependency("rack", ["~> 1.4.1"])
+  s.add_dependency("rack", ["1.4.1"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   
   # Builder

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -33,7 +33,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
@@ -41,7 +41,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
@@ -193,6 +193,7 @@ files:
 - features/ignore.feature
 - features/implied_extensions.feature
 - features/instance_vars.feature
+- features/missing-tilt-lib.feature
 - features/mount_rack.feature
 - features/preview_changes.feature
 - features/proxy_pages.feature
@@ -354,6 +355,11 @@ files:
 - fixtures/manual-layout/config.rb
 - fixtures/manual-layout/source/index.html.erb
 - fixtures/manual-layout/source/layouts/custom.erb
+- fixtures/missing-tilt-library-app/config.rb
+- fixtures/missing-tilt-library-app/source/danger-zone/more-wiki.html.wiki
+- fixtures/missing-tilt-library-app/source/safe-zone/my-wiki.html.wiki
+- fixtures/missing-tilt-library-app/source/textile-source.html.textile
+- fixtures/missing-tilt-library-app/source/wiki-source.html.wiki
 - fixtures/multiple-layouts/config.rb
 - fixtures/multiple-layouts/source/index.html.erb
 - fixtures/multiple-layouts/source/layout.erb
@@ -599,7 +605,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3449139748025586878
+      hash: -4170528226984264202
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -608,7 +614,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3449139748025586878
+      hash: -4170528226984264202
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -637,6 +643,7 @@ test_files:
 - features/ignore.feature
 - features/implied_extensions.feature
 - features/instance_vars.feature
+- features/missing-tilt-lib.feature
 - features/mount_rack.feature
 - features/preview_changes.feature
 - features/proxy_pages.feature
@@ -798,6 +805,11 @@ test_files:
 - fixtures/manual-layout/config.rb
 - fixtures/manual-layout/source/index.html.erb
 - fixtures/manual-layout/source/layouts/custom.erb
+- fixtures/missing-tilt-library-app/config.rb
+- fixtures/missing-tilt-library-app/source/danger-zone/more-wiki.html.wiki
+- fixtures/missing-tilt-library-app/source/safe-zone/my-wiki.html.wiki
+- fixtures/missing-tilt-library-app/source/textile-source.html.textile
+- fixtures/missing-tilt-library-app/source/wiki-source.html.wiki
 - fixtures/multiple-layouts/config.rb
 - fixtures/multiple-layouts/source/index.html.erb
 - fixtures/multiple-layouts/source/layout.erb