From 6aeda854c0911e489f511d32c6b1e41c6d1bc258 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 20 Dec 2015 12:48:01 -0800
Subject: [PATCH] Update local extension template

---
 middleman-cli/lib/middleman-cli/extension.rb  |  2 +-
 .../templates/extension/lib/lib.rb            | 40 ++-----------------
 .../templates/extension/lib/lib/extension.rb  | 31 ++++++++++++++
 .../extension/lib/middleman_extension.rb      |  1 -
 4 files changed, 36 insertions(+), 38 deletions(-)
 create mode 100644 middleman-cli/lib/middleman-cli/templates/extension/lib/lib/extension.rb
 delete mode 100644 middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb

diff --git a/middleman-cli/lib/middleman-cli/extension.rb b/middleman-cli/lib/middleman-cli/extension.rb
index 1b079f4d..fd6c6f26 100644
--- a/middleman-cli/lib/middleman-cli/extension.rb
+++ b/middleman-cli/lib/middleman-cli/extension.rb
@@ -30,8 +30,8 @@ module Middleman::Cli
       template 'extension/Rakefile', File.join(name, 'Rakefile')
       template 'extension/gemspec', File.join(name, "#{name}.gemspec")
       template 'extension/Gemfile', File.join(name, 'Gemfile')
-      template 'extension/lib/middleman_extension.rb', File.join(name, 'lib', 'middleman_extension.rb')
       template 'extension/lib/lib.rb', File.join(name, 'lib', "#{name}.rb")
+      template 'extension/lib/lib/extension.rb', File.join(name, 'lib', name, "extension.rb")
       template 'extension/features/support/env.rb', File.join(name, 'features', 'support', 'env.rb')
       empty_directory File.join(name, 'fixtures')
     end
diff --git a/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb
index 8a3c5dc6..48038a71 100644
--- a/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb
+++ b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb
@@ -1,38 +1,6 @@
-# Require core library
-require 'middleman-core'
+require "middleman-core"
 
-# Extension namespace
-class MyExtension < ::Middleman::Extension
-  option :my_option, 'default', 'An example option'
-
-  def initialize(app, options_hash={}, &block)
-    # Call super to build options from the options_hash
-    super
-
-    # Require libraries only when activated
-    # require 'necessary/library'
-
-    # set up your extension
-    # puts options.my_option
-  end
-
-  def after_configuration
-    # Do something
-  end
-
-  # A Sitemap Manipulator
-  # def manipulate_resource_list(resources)
-  # end
-
-  # helpers do
-  #   def a_helper
-  #   end
-  # end
+Middleman::Extensions.register :<%= name %> do
+  require "my-extension/extension"
+  MyExtension
 end
-
-# Register extensions which can be activated
-# Make sure we have the version of Middleman we expect
-# Name param may be omited, it will default to underscored
-# version of class name
-
-# MyExtension.register(:my_extension)
diff --git a/middleman-cli/lib/middleman-cli/templates/extension/lib/lib/extension.rb b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib/extension.rb
new file mode 100644
index 00000000..f831386f
--- /dev/null
+++ b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib/extension.rb
@@ -0,0 +1,31 @@
+# Require core library
+require 'middleman-core'
+
+# Extension namespace
+class MyExtension < ::Middleman::Extension
+  option :my_option, 'default', 'An example option'
+
+  def initialize(app, options_hash={}, &block)
+    # Call super to build options from the options_hash
+    super
+
+    # Require libraries only when activated
+    # require 'necessary/library'
+
+    # set up your extension
+    # puts options.my_option
+  end
+
+  def after_configuration
+    # Do something
+  end
+
+  # A Sitemap Manipulator
+  # def manipulate_resource_list(resources)
+  # end
+
+  # helpers do
+  #   def a_helper
+  #   end
+  # end
+end
diff --git a/middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb b/middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb
deleted file mode 100644
index 6fba3c06..00000000
--- a/middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb
+++ /dev/null
@@ -1 +0,0 @@
-require '<%= name %>'