middleman-core 3.2.2 → 3.3.0

data/lib/middleman-core/extension.rb

@@ -0,0 +1,167 @@
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/class/attribute'
+
+module Middleman
+
+  class Extension
+    class_attribute :supports_multiple_instances, :instance_reader => false, :instance_writer => false
+    class_attribute :defined_helpers, :instance_reader => false, :instance_writer => false
+    class_attribute :ext_name, :instance_reader => false, :instance_writer => false
+
+    class << self
+      def config
+        @_config ||= ::Middleman::Configuration::ConfigurationManager.new
+      end
+
+      def option(key, default=nil, description=nil)
+        config.define_setting(key, default, description)
+      end
+
+      # Add helpers to the global Middleman application.
+      # This accepts either a list of modules to add on behalf
+      # of this extension, or a block whose contents will all
+      # be used as helpers in a new module.
+      def helpers(*m, &block)
+        self.defined_helpers ||= []
+
+        if block
+          mod = Module.new
+          mod.module_eval(&block)
+          m = [mod]
+        end
+
+        self.defined_helpers += m
+      end
+
+      def extension_name
+        self.ext_name || self.name.underscore.split('/').last.to_sym
+      end
+
+      def register(n=self.extension_name)
+        ::Middleman::Extensions.register(n, self)
+      end
+
+      def activate
+        new(::Middleman::Application)
+      end
+
+      def clear_after_extension_callbacks
+        @_extension_activation_callbacks = {}
+      end
+
+      def after_extension_activated(name, &block)
+        @_extension_activation_callbacks ||= {}
+        @_extension_activation_callbacks[name] ||= []
+        @_extension_activation_callbacks[name] << block if block_given?
+      end
+
+      def activated_extension(instance)
+        name = instance.class.extension_name
+        return unless @_extension_activation_callbacks && @_extension_activation_callbacks[name]
+        @_extension_activation_callbacks[name].each do |block|
+          block.arity == 1 ? block.call(instance) : block.call()
+        end
+      end
+    end
+
+    attr_accessor :options
+    attr_reader :app
+
+    delegate :after_extension_activated, :to => :"::Middleman::Extension"
+
+    def initialize(klass, options_hash={}, &block)
+      @_helpers = []
+      @klass = klass
+
+      setup_options(options_hash, &block)
+      setup_app_reference_when_available
+
+      # Bind app hooks to local methods
+      bind_before_configuration
+      bind_after_configuration
+      bind_before_build
+      bind_after_build
+    end
+
+    def app=(app)
+      @app = app
+
+      (self.class.defined_helpers || []).each do |m|
+        app.class.send(:include, m)
+      end
+    end
+
+  protected
+
+    def setup_options(options_hash, &block)
+      @options = self.class.config.dup
+      @options.finalize!
+
+      options_hash.each do |k, v|
+        @options[k] = v
+      end
+
+      yield @options if block_given?
+    end
+
+    def setup_app_reference_when_available
+      ext = self
+
+      @klass.initialized do
+        ext.app = self
+      end
+
+      @klass.instance_available do
+        ext.app ||= self
+      end
+    end
+
+    def bind_before_configuration
+      ext = self
+      if ext.respond_to?(:before_configuration)
+        @klass.before_configuration do
+          ext.before_configuration
+        end
+      end
+    end
+
+    def bind_after_configuration
+      ext = self
+      @klass.after_configuration do
+        if ext.respond_to?(:after_configuration)
+          ext.after_configuration
+        end
+
+        if ext.respond_to?(:manipulate_resource_list)
+          ext.app.sitemap.register_resource_list_manipulator(ext.class.extension_name, ext)
+        end
+      end
+    end
+
+    def bind_before_build
+      ext = self
+      if ext.respond_to?(:before_build)
+        @klass.before_build do |builder|
+          if ext.method(:before_build).arity === 1
+            ext.before_build(builder)
+          else
+            ext.before_build
+          end
+        end
+      end
+    end
+
+    def bind_after_build
+      ext = self
+      if ext.respond_to?(:after_build)
+        @klass.after_build do |builder|
+          if ext.method(:after_build).arity === 1
+            ext.after_build(builder)
+          else
+            ext.after_build
+          end
+        end
+      end
+    end
+  end
+end

data/lib/middleman-core/extensions.rb

@@ -1,6 +1,3 @@
-require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/module/delegation'
-
 module Middleman
 
   module Extensions
@@ -98,152 +95,6 @@ module Middleman
       File.exists?(full_path)
     end
   end
-
-  class Extension
-    class_attribute :supports_multiple_instances, :instance_reader => false, :instance_writer => false
-    class_attribute :defined_helpers, :instance_reader => false, :instance_writer => false
-    class_attribute :ext_name, :instance_reader => false, :instance_writer => false
-
-    class << self
-      def config
-        @_config ||= ::Middleman::Configuration::ConfigurationManager.new
-      end
-
-      def option(key, default=nil, description=nil)
-        config.define_setting(key, default, description)
-      end
-
-      # Add helpers to the global Middleman application.
-      # This accepts either a list of modules to add on behalf
-      # of this extension, or a block whose contents will all
-      # be used as helpers in a new module.
-      def helpers(*m, &block)
-        self.defined_helpers ||= []
-
-        if block
-          mod = Module.new
-          mod.module_eval(&block)
-          m = [mod]
-        end
-
-        self.defined_helpers += m
-      end
-
-      def extension_name
-        self.ext_name || self.name.underscore.split('/').last.to_sym
-      end
-
-      def register(n=self.extension_name)
-        ::Middleman::Extensions.register(n, self)
-      end
-
-      def activate
-        new(::Middleman::Application)
-      end
-
-      def clear_after_extension_callbacks
-        @_extension_activation_callbacks = {}
-      end
-
-      def after_extension_activated(name, &block)
-        @_extension_activation_callbacks ||= {}
-        @_extension_activation_callbacks[name] ||= []
-        @_extension_activation_callbacks[name] << block if block_given?
-      end
-
-      def activated_extension(instance)
-        name = instance.class.extension_name
-        return unless @_extension_activation_callbacks && @_extension_activation_callbacks[name]
-        @_extension_activation_callbacks[name].each do |block|
-          block.arity == 1 ? block.call(instance) : block.call()
-        end
-      end
-    end
-
-    attr_accessor :options
-    attr_reader :app
-
-    delegate :after_extension_activated, :to => :"::Middleman::Extension"
-
-    def initialize(klass, options_hash={}, &block)
-      @_helpers = []
-      @klass = klass
-
-      setup_options(options_hash, &block)
-      setup_app_reference_when_available
-
-      # Bind app hooks to local methods
-      bind_before_configuration
-      bind_after_configuration
-      bind_after_build
-    end
-
-    def app=(app)
-      @app = app
-
-      (self.class.defined_helpers || []).each do |m|
-        app.class.send(:include, m)
-      end
-    end
-
-  protected
-
-    def setup_options(options_hash, &block)
-      @options = self.class.config.dup
-      @options.finalize!
-
-      options_hash.each do |k, v|
-        @options[k] = v
-      end
-
-      yield @options if block_given?
-    end
-
-    def setup_app_reference_when_available
-      ext = self
-
-      @klass.initialized do
-        ext.app = self
-      end
-
-      @klass.instance_available do
-        ext.app ||= self
-      end
-    end
-
-    def bind_before_configuration
-      ext = self
-      if ext.respond_to?(:before_configuration)
-        @klass.before_configuration do
-          ext.before_configuration
-        end
-      end
-    end
-
-    def bind_after_configuration
-      ext = self
-      @klass.after_configuration do
-        if ext.respond_to?(:after_configuration)
-          ext.after_configuration
-        end
-
-        if ext.respond_to?(:manipulate_resource_list)
-          ext.app.sitemap.register_resource_list_manipulator(ext.class.extension_name, ext)
-        end
-      end
-    end
-
-    def bind_after_build
-      ext = self
-      if ext.respond_to?(:after_build)
-        @klass.after_build do |builder|
-          if ext.method(:after_build).arity === 1
-            ext.after_build(builder)
-          else
-            ext.after_build
-          end
-        end
-      end
-    end
-  end
 end
+
+require 'middleman-core/extension'

data/lib/middleman-core/logger.rb

@@ -1,12 +1,12 @@
 # Use the Ruby/Rails logger
 require 'active_support/notifications'
-require 'active_support/buffered_logger'
+require 'active_support/logger'
 require 'thread'
 
 module Middleman
 
   # The Middleman Logger
-  class Logger < ActiveSupport::BufferedLogger
+  class Logger < ActiveSupport::Logger
 
     def self.singleton(*args)
       if !@_logger || args.length > 0

data/lib/middleman-core/meta_pages/assets/config.css

@@ -25,6 +25,7 @@
 
 .value {
     color: #002B36;
+    white-space: pre-wrap;
 }
 
 .description {
@@ -33,4 +34,16 @@
 
 .extensions .settings {
     margin-left: 1em;
+}
+
+.inactive {
+    color: #999999;
+}
+
+.inactive:after {
+    content: "Inactive";
+    font-weight: bold;
+    color: #999999;
+    margin-left: 10px;
+    font-size: .7em;
 }

data/lib/middleman-core/meta_pages/assets/meta.css

@@ -168,6 +168,7 @@ body {
     padding-right: 1em;
     position: relative;
     margin-top: 2em;
+    margin-bottom: 2em;
 }
 .container:after {
     clear: both;
@@ -355,14 +356,29 @@ pre .tex .formula {
 #main {
     display: inline;
     float: left;
-    font-size: 120%;
+    font-size: 100%;
     margin-left: 0;
     margin-right: 1.20482%;
     width: 100%;
 }
 #main h1 {
-    font-size: 2em;
+    font-size: 3em;
+    font-weight: bold;
+    margin-bottom: .5em;
 }
 #main h2 {
-    font-size: 1.5em;
+    font-size: 2em;
+    line-height: 1.2;
+    margin-bottom: 0.75em;
+}
+
+.nav-list {
+    list-style: none;
+    margin: 0;
+    padding: 0;
 }
+
+.nav-list a {
+    font-size: 1.4em;
+    font-weight: bold;
+}

data/lib/middleman-core/meta_pages/assets/sitemap.css

@@ -9,7 +9,7 @@ details > details {
 }
 
 details.resource > summary {
-    
+
 }
 
 .resource-details {
@@ -27,6 +27,7 @@ summary > i {
 
 .resource-details th, .resource-details td {
     padding: 0;
+    vertical-align: top;
 }
 
 .resource-details th {
@@ -40,6 +41,22 @@ summary > i {
     font-family: "Arvo","andale mono","lucida console",monospace;
 }
 
+.ignored > summary {
+    color: #999999;
+}
+
+.ignored i {
+    opacity: 0.4;
+}
+
+.ignored > summary:after {
+    content: "Ignored";
+    font-weight: bold;
+    color: #999999;
+    margin-left: 10px;
+    font-size: .7em;
+}
+
 details > summary:before {
     content: "" !important;
     display: inline-block;