middleman-core 4.0.0.alpha.3 → 4.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df87c14bd46ecb73f2fbfe74a09b83089bdac09a
-  data.tar.gz: 1e56eb3b6eee26c9b679db3eabde8a8f7a1fa6b4
+  metadata.gz: 5db48d5aece00a632a9abf5221484e4243768c24
+  data.tar.gz: ca012a5e8145471140495048a9e89cecba5e7371
 SHA512:
-  metadata.gz: c843a53d609564f5395f22c2d4ea4b52902a7e69fa3073c7d6dde9ca198bb2b9f0973eb37925bbc99e208cc04b84f831827787fda641f58ef092a88b88876109
-  data.tar.gz: 17ab0af69079b461b116e942f09d6143a556071ebc7189de70d6b57d111fa4c214a27cdeccb77f2774b1c0522ca2992c64c2277dbf50850b48433a4432788c82
+  metadata.gz: 1d8f21f528ba7b8d4fe101adc84137789a58650fdf96f8ae4bd6136507dad9b29c703aaae6e9b728f73098444d55a7a3408afdb3d482bab7b4ba792133cfbe67
+  data.tar.gz: 137b34399f69fe0085a5ccb13074abd1bef0a8d1b0e05391a30f87cc7ec2a364b6de1b453e2e504effff5b7993300b486d1185a7994b6e93ed42a46fa26633e1

data/lib/middleman-core/application.rb

@@ -80,7 +80,7 @@ module Middleman
 
     # Name of the source directory
     # @return [String]
-    config.define_setting :source,      'source', 'Name of the source directory'
+    config.define_setting :source, 'source', 'Name of the source directory'
 
     # Middleman mode. Defaults to :server, set to :build by the build process
     # @return [String]
@@ -255,12 +255,12 @@ module Middleman
           Tilt.mappings.delete(key)
         end
       end
+      
+      @extensions.activate_all
 
       run_hook :after_configuration
       config_context.execute_after_configuration_callbacks
 
-      @extensions.activate_all
-
       run_hook :ready
       @config_context.execute_ready_callbacks
     end

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

@@ -39,7 +39,11 @@ module Middleman
 
       def evaluate(scope, _)
         @output ||= begin
-          MiddlemanRedcarpetHTML.scope = ::Middleman::Renderers::Haml.last_haml_scope || scope
+          if defined?(::Middleman::Renderers::Haml)
+            MiddlemanRedcarpetHTML.scope = ::Middleman::Renderers::Haml.last_haml_scope || scope
+          else
+            MiddlemanRedcarpetHTML.scope = scope
+          end
 
           @engine.render(data)
         end

data/lib/middleman-core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.3
+  version: 4.0.0.alpha.4
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler