Extension -> Plugin

History.txt

@@ -1,4 +1,6 @@
 == Edge
+  * Major Enhancements
+    * Proper plugin system (#19, #100)
   * Minor Enhancements
     * Inclusion/exclusion of future dated posts (#59)
     * Generation for a specific time (#59)

lib/jekyll.rb

@@ -35,8 +35,8 @@ require 'jekyll/filters'
 require 'jekyll/albino'
 require 'jekyll/static_file'
 
-#extensions
-require 'jekyll/extension'
+# extensions
+require 'jekyll/plugin'
 require 'jekyll/converter'
 require 'jekyll/generator'
 require_all 'jekyll/converters'

lib/jekyll/converter.rb

@@ -1,6 +1,6 @@
 module Jekyll
 
-  class Converter < Extension
+  class Converter < Plugin
     # Public: Get or set the pygments prefix. When an argument is specified,
     # the prefix will be set. If no argument is specified, the current prefix
     # will be returned.

lib/jekyll/generator.rb

@@ -1,6 +1,6 @@
 module Jekyll
 
-  class Generator < Extension
+  class Generator < Plugin
 
   end
 

lib/jekyll/plugin.rb

@@ -1,6 +1,6 @@
 module Jekyll
 
-  class Extension
+  class Plugin
     PRIORITIES = { :lowest => -100,
                    :low => -10,
                    :normal => 0,
@@ -49,7 +49,7 @@ module Jekyll
       PRIORITIES[other.priority] <=> PRIORITIES[self.priority]
     end
 
-    # Initialize a new extension. This should be overridden by the subclass.
+    # Initialize a new plugin. This should be overridden by the subclass.
     #
     # config - The Hash of configuration options.
     #