From 5a958007c5c4b3ef4af001464d75c4c00adfe870 Mon Sep 17 00:00:00 2001
From: Jamie Winsor <jamie@enmasse.com>
Date: Thu, 27 Oct 2011 18:12:32 -0700
Subject: Update blog generator to use Rails 3.1 base

Seeds will now follow Rails 3.1 conventions
---
 Rakefile                                       |  2 +-
 db/seeds.rb                                    | 20 ++++++++++++++++++++
 db/seeds/refinerycms_blog.rb                   | 20 --------------------
 lib/generators/blog_generator.rb               | 10 ----------
 lib/generators/refinery/blog/blog_generator.rb | 16 ++++++++++++++++
 lib/refinerycms-blog.rb                        |  3 ++-
 6 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 db/seeds.rb
 delete mode 100644 db/seeds/refinerycms_blog.rb
 delete mode 100644 lib/generators/blog_generator.rb
 create mode 100644 lib/generators/refinery/blog/blog_generator.rb

diff --git a/Rakefile b/Rakefile
index 5adcafe..8fb342e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,7 +5,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-ENGINE_ROOT = File.dirname(__FILE__)
+ENGINE_PATH = File.dirname(__FILE__)
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 
 if File.exists?(APP_RAKEFILE)
diff --git a/db/seeds.rb b/db/seeds.rb
new file mode 100644
index 0000000..19c4370
--- /dev/null
+++ b/db/seeds.rb
@@ -0,0 +1,20 @@
+Refinery::User.find(:all).each do |user|
+  if user.plugins.where(:name => 'refinerycms_blog').blank?
+    user.plugins.create(:name => "refinerycms_blog",
+                        :position => (user.plugins.maximum(:position) || -1) +1)
+  end
+end if defined?(Refinery::User)
+
+if defined?(Refinery::Page)
+  page = Refinery::Page.create(
+    :title => "Blog",
+    :link_url => "/blog",
+    :deletable => false,
+    :position => ((Refinery::Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
+    :menu_match => "^/blogs?(\/|\/.+?|)$"
+  )
+
+  Refinery::Page.default_parts.each do |default_page_part|
+    page.parts.create(:title => default_page_part, :body => nil)
+  end
+end
\ No newline at end of file
diff --git a/db/seeds/refinerycms_blog.rb b/db/seeds/refinerycms_blog.rb
deleted file mode 100644
index 19c4370..0000000
--- a/db/seeds/refinerycms_blog.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-Refinery::User.find(:all).each do |user|
-  if user.plugins.where(:name => 'refinerycms_blog').blank?
-    user.plugins.create(:name => "refinerycms_blog",
-                        :position => (user.plugins.maximum(:position) || -1) +1)
-  end
-end if defined?(Refinery::User)
-
-if defined?(Refinery::Page)
-  page = Refinery::Page.create(
-    :title => "Blog",
-    :link_url => "/blog",
-    :deletable => false,
-    :position => ((Refinery::Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
-    :menu_match => "^/blogs?(\/|\/.+?|)$"
-  )
-
-  Refinery::Page.default_parts.each do |default_page_part|
-    page.parts.create(:title => default_page_part, :body => nil)
-  end
-end
\ No newline at end of file
diff --git a/lib/generators/blog_generator.rb b/lib/generators/blog_generator.rb
deleted file mode 100644
index 8b09bb7..0000000
--- a/lib/generators/blog_generator.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'refinery/generators'
-
-module ::Refinery
-  class BlogGenerator < ::Refinery::Generators::EngineInstaller
-
-    source_root File.expand_path('../../../', __FILE__)
-    engine_name "refinerycms-blog"
-
-  end
-end
diff --git a/lib/generators/refinery/blog/blog_generator.rb b/lib/generators/refinery/blog/blog_generator.rb
new file mode 100644
index 0000000..34f6cd2
--- /dev/null
+++ b/lib/generators/refinery/blog/blog_generator.rb
@@ -0,0 +1,16 @@
+module Refinery
+  class BlogGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def append_load_seed_data
+      append_file 'db/seeds.rb', :verbose => true do
+        <<-EOH
+
+# Added by RefineryCMS Blog engine
+Refinery::Blog::Engine.load_seed
+        EOH
+      end
+    end
+
+  end
+end
diff --git a/lib/refinerycms-blog.rb b/lib/refinerycms-blog.rb
index 135b3e1..88b8afc 100644
--- a/lib/refinerycms-blog.rb
+++ b/lib/refinerycms-blog.rb
@@ -3,9 +3,10 @@ require 'bundler'
 Bundler.require
 
 require 'filters_spam'
-require File.expand_path('../generators/blog_generator', __FILE__)
 
 module Refinery
+  autoload :BlogGenerator, 'generators/refinery/blog/blog_generator'
+  
   module Blog
     autoload :Version, 'refinery/blog/version'
     autoload :Tab, 'refinery/blog/tabs'
-- 
cgit v1.2.3