From a2f655b55eb30a900020e8aff9601ed0606ce58f Mon Sep 17 00:00:00 2001
From: Philip Arndt <parndt@gmail.com>
Date: Fri, 3 Sep 2010 23:32:07 +1200
Subject: Hello rails3 support.

---
 .../refinery_blog/refinery_blog_generator.rb       | 28 ++++++++++------------
 .../templates/db/migrate/migration.rb              | 26 ++++++++++++++++++++
 .../refinery_blog/templates/db/seeds/seed.rb       | 16 +++++++++++++
 generators/refinery_blog/templates/migration.rb    | 26 --------------------
 generators/refinery_blog/templates/seed.rb         | 16 -------------
 5 files changed, 55 insertions(+), 57 deletions(-)
 create mode 100644 generators/refinery_blog/templates/db/migrate/migration.rb
 create mode 100644 generators/refinery_blog/templates/db/seeds/seed.rb
 delete mode 100644 generators/refinery_blog/templates/migration.rb
 delete mode 100644 generators/refinery_blog/templates/seed.rb

(limited to 'generators')

diff --git a/generators/refinery_blog/refinery_blog_generator.rb b/generators/refinery_blog/refinery_blog_generator.rb
index 2bf39d8..076f709 100644
--- a/generators/refinery_blog/refinery_blog_generator.rb
+++ b/generators/refinery_blog/refinery_blog_generator.rb
@@ -12,24 +12,22 @@ class RefineryBlogGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
-      if Rails.version < '3.0.0'
-        matches = Dir[
-          File.expand_path('../../../public/images/**/*', __FILE__),
-          File.expand_path('../../../public/stylesheets/**/*', __FILE__),
-          File.expand_path('../../../public/javascripts/**/*', __FILE__),
-        ]
-        matches.reject{|d| !File.directory?(d)}.each do |dir|
-          m.directory((%w(public) | dir.split('public/').last.split('/')).join('/'))
-        end
-        matches.reject{|f| File.directory?(f)}.each do |image|
-          path = (%w(public) | image.split('public/').last.split('/'))[0...-1].join('/')
-          m.template "../../../#{path}/#{image.split('/').last}", "#{path}/#{image.split('/').last}"
-        end
+      matches = Dir[
+        File.expand_path('../../../public/images/**/*', __FILE__),
+        File.expand_path('../../../public/stylesheets/**/*', __FILE__),
+        File.expand_path('../../../public/javascripts/**/*', __FILE__),
+      ]
+      matches.reject{|d| !File.directory?(d)}.each do |dir|
+        m.directory((%w(public) | dir.split('public/').last.split('/')).join('/'))
+      end
+      matches.reject{|f| File.directory?(f)}.each do |image|
+        path = (%w(public) | image.split('public/').last.split('/'))[0...-1].join('/')
+        m.template "../../../#{path}/#{image.split('/').last}", "#{path}/#{image.split('/').last}"
       end
 
-      m.template('seed.rb', 'db/seeds/refinerycms_blog.rb')
+      m.template('db/seeds/seed.rb', 'db/seeds/refinerycms_blog.rb')
 
-      m.migration_template('migration.rb', 'db/migrate',
+      m.migration_template('db/migrate/migration.rb', 'db/migrate',
         :migration_file_name => 'create_blog_structure',
         :assigns => {
           :migration_name => 'CreateBlogStructure',
diff --git a/generators/refinery_blog/templates/db/migrate/migration.rb b/generators/refinery_blog/templates/db/migrate/migration.rb
new file mode 100644
index 0000000..5ba29c6
--- /dev/null
+++ b/generators/refinery_blog/templates/db/migrate/migration.rb
@@ -0,0 +1,26 @@
+class <%= migration_name %> < ActiveRecord::Migration
+
+  def self.up<% tables.each do |table| %>
+    create_table :<%= table[:table_name] %>, :id => <%= table[:id].to_s %> do |t|
+<% table[:attributes].each do |attribute| -%>
+      t.<%= attribute.type %> :<%= attribute.name %>
+<% end -%>
+      <%= 't.timestamps' if table[:id] %>
+    end
+
+    <%= "add_index :#{table[:table_name]}, :id" if table[:id] %>
+<% end -%>
+    load(Rails.root.join('db', 'seeds', 'refinerycms_blog.rb').to_s)
+  end
+
+  def self.down
+    UserPlugin.destroy_all({:name => "refinerycms_blog"})
+
+    Page.delete_all({:link_url => "/blog"})
+
+<% tables.each do |table| -%>
+    drop_table :<%= table[:table_name] %>
+<% end -%>
+  end
+
+end
diff --git a/generators/refinery_blog/templates/db/seeds/seed.rb b/generators/refinery_blog/templates/db/seeds/seed.rb
new file mode 100644
index 0000000..228fc7b
--- /dev/null
+++ b/generators/refinery_blog/templates/db/seeds/seed.rb
@@ -0,0 +1,16 @@
+User.find(:all).each do |user|
+  user.plugins.create(:name => "<%= singular_name %>",
+                      :position => (user.plugins.maximum(:position) || -1) +1)
+end
+
+page = Page.create(
+  :title => "Blog",
+  :link_url => "/blog",
+  :deletable => false,
+  :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
+  :menu_match => "^/blogs?(\/|\/.+?|)$"
+)
+
+RefinerySetting.find_or_set(:default_page_parts, %w(Body Side\ Body)).each do |default_page_part|
+  page.parts.create(:title => default_page_part, :body => nil)
+end
diff --git a/generators/refinery_blog/templates/migration.rb b/generators/refinery_blog/templates/migration.rb
deleted file mode 100644
index 5ba29c6..0000000
--- a/generators/refinery_blog/templates/migration.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class <%= migration_name %> < ActiveRecord::Migration
-
-  def self.up<% tables.each do |table| %>
-    create_table :<%= table[:table_name] %>, :id => <%= table[:id].to_s %> do |t|
-<% table[:attributes].each do |attribute| -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
-<% end -%>
-      <%= 't.timestamps' if table[:id] %>
-    end
-
-    <%= "add_index :#{table[:table_name]}, :id" if table[:id] %>
-<% end -%>
-    load(Rails.root.join('db', 'seeds', 'refinerycms_blog.rb').to_s)
-  end
-
-  def self.down
-    UserPlugin.destroy_all({:name => "refinerycms_blog"})
-
-    Page.delete_all({:link_url => "/blog"})
-
-<% tables.each do |table| -%>
-    drop_table :<%= table[:table_name] %>
-<% end -%>
-  end
-
-end
diff --git a/generators/refinery_blog/templates/seed.rb b/generators/refinery_blog/templates/seed.rb
deleted file mode 100644
index 228fc7b..0000000
--- a/generators/refinery_blog/templates/seed.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-User.find(:all).each do |user|
-  user.plugins.create(:name => "<%= singular_name %>",
-                      :position => (user.plugins.maximum(:position) || -1) +1)
-end
-
-page = Page.create(
-  :title => "Blog",
-  :link_url => "/blog",
-  :deletable => false,
-  :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
-  :menu_match => "^/blogs?(\/|\/.+?|)$"
-)
-
-RefinerySetting.find_or_set(:default_page_parts, %w(Body Side\ Body)).each do |default_page_part|
-  page.parts.create(:title => default_page_part, :body => nil)
-end
-- 
cgit v1.2.3