From a058a24e90d46cb0efd0654c7d3385db23ef3ba3 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Fri, 4 Mar 2011 12:25:18 +1300 Subject: Renamed seed and blog structure migration, removed name option from generator, regenerated gemspec. --- db/migrate/1_create_blog_structure.rb | 54 ++++++++++++++++++++++++++ db/migrate/1_create_singular_name.rb | 57 ---------------------------- db/seeds/refinerycms_blog.rb | 16 ++++++++ db/seeds/seed.rb | 16 -------- lib/generators/refinerycms_blog_generator.rb | 1 - refinerycms-blog.gemspec | 27 ++++--------- 6 files changed, 78 insertions(+), 93 deletions(-) create mode 100644 db/migrate/1_create_blog_structure.rb delete mode 100644 db/migrate/1_create_singular_name.rb create mode 100644 db/seeds/refinerycms_blog.rb delete mode 100644 db/seeds/seed.rb diff --git a/db/migrate/1_create_blog_structure.rb b/db/migrate/1_create_blog_structure.rb new file mode 100644 index 0000000..197efb1 --- /dev/null +++ b/db/migrate/1_create_blog_structure.rb @@ -0,0 +1,54 @@ +class CreateBlogStructure < ActiveRecord::Migration + + def self.up + create_table :blog_posts, :id => true do |t| + t.string :title + t.text :body + t.boolean :draft + t.datetime :published_at + t.timestamps + end + + add_index :blog_posts, :id + + create_table :blog_comments, :id => true do |t| + t.integer :blog_post_id + t.boolean :spam + t.string :name + t.string :email + t.text :body + t.string :state + t.timestamps + end + + add_index :blog_comments, :id + + create_table :blog_categories, :id => true do |t| + t.string :title + t.timestamps + end + + add_index :blog_categories, :id + + create_table :blog_categories_blog_posts, :id => false do |t| + t.integer :blog_category_id + t.integer :blog_post_id + end + + add_index :blog_categories_blog_posts, [:blog_category_id, :blog_post_id], :name => 'index_blog_categories_blog_posts_on_bc_and_bp' + + 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"}) + + drop_table :blog_posts + drop_table :blog_comments + drop_table :blog_categories + drop_table :blog_categories_blog_posts + end + +end diff --git a/db/migrate/1_create_singular_name.rb b/db/migrate/1_create_singular_name.rb deleted file mode 100644 index 9b93c96..0000000 --- a/db/migrate/1_create_singular_name.rb +++ /dev/null @@ -1,57 +0,0 @@ -@refinerycms_blog_tables = [{ - :table_name => 'blog_posts', - :attributes => [ - Rails::Generators::GeneratedAttribute.new('title', 'string'), - Rails::Generators::GeneratedAttribute.new('body', 'text'), - Rails::Generators::GeneratedAttribute.new('draft', 'boolean'), - Rails::Generators::GeneratedAttribute.new('published_at', 'datetime') - ], :id => true -},{ - :table_name => 'blog_comments', - :attributes => [ - Rails::Generators::GeneratedAttribute.new('blog_post_id', 'integer'), - Rails::Generators::GeneratedAttribute.new('spam', 'boolean'), - Rails::Generators::GeneratedAttribute.new('name', 'string'), - Rails::Generators::GeneratedAttribute.new('email', 'string'), - Rails::Generators::GeneratedAttribute.new('body', 'text'), - Rails::Generators::GeneratedAttribute.new('state', 'string') - ], :id => true -},{ - :table_name => 'blog_categories', - :attributes => [ - Rails::Generators::GeneratedAttribute.new('title', 'string') - ], :id => true -},{ - :table_name => 'blog_categories_blog_posts', - :attributes => [ - Rails::Generators::GeneratedAttribute.new('blog_category_id', 'integer'), - Rails::Generators::GeneratedAttribute.new('blog_post_id', 'integer') - ], :id => false -}] - -class Create<%= singular_name.camelize %> < ActiveRecord::Migration - - def self.up<% @refinerycms_blog_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"}) - -<% @refinerycms_blog_tables.each do |table| -%> - drop_table :<%= table[:table_name] %> -<% end -%> - end - -end diff --git a/db/seeds/refinerycms_blog.rb b/db/seeds/refinerycms_blog.rb new file mode 100644 index 0000000..f958fab --- /dev/null +++ b/db/seeds/refinerycms_blog.rb @@ -0,0 +1,16 @@ +User.find(:all).each do |user| + user.plugins.create(:name => "refinerycms_blog", + :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?(\/|\/.+?|)$" +) + +Page.default_parts.each do |default_page_part| + page.parts.create(:title => default_page_part, :body => nil) +end diff --git a/db/seeds/seed.rb b/db/seeds/seed.rb deleted file mode 100644 index f958fab..0000000 --- a/db/seeds/seed.rb +++ /dev/null @@ -1,16 +0,0 @@ -User.find(:all).each do |user| - user.plugins.create(:name => "refinerycms_blog", - :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?(\/|\/.+?|)$" -) - -Page.default_parts.each do |default_page_part| - page.parts.create(:title => default_page_part, :body => nil) -end diff --git a/lib/generators/refinerycms_blog_generator.rb b/lib/generators/refinerycms_blog_generator.rb index 3f3d35a..6fca607 100644 --- a/lib/generators/refinerycms_blog_generator.rb +++ b/lib/generators/refinerycms_blog_generator.rb @@ -3,7 +3,6 @@ require 'refinery/generators' class RefinerycmsBlogGenerator < ::Refinery::Generators::EngineInstaller source_root File.expand_path('../../../', __FILE__) - argument :name, :type => :string, :default => 'blog_structure', :banner => '' engine_name "refinerycms-blog" end \ No newline at end of file diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 1599f54..5d89423 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -1,8 +1,8 @@ Gem::Specification.new do |s| s.name = %q{refinerycms-blog} - s.version = %q{1.2} + s.version = %q{1.3} s.description = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.} - s.date = %q{2011-03-02} + s.date = %q{2011-03-04} s.summary = %q{Ruby on Rails blogging engine for RefineryCMS.} s.email = %q{info@refinerycms.com} s.homepage = %q{http://refinerycms.com} @@ -97,6 +97,12 @@ Gem::Specification.new do |s| config/locales/pt-BR.yml config/locales/ru.yml config/routes.rb + db + db/migrate + db/migrate/1_create_blog_structure.rb + db/migrate/2_add_user_id_to_blog_posts.rb + db/seeds + db/seeds/refinerycms_blog.rb features features/authors.feature features/support @@ -107,26 +113,11 @@ Gem::Specification.new do |s| features/support/paths.rb features/support/step_definitions features/support/step_definitions/authors_steps.rb - generators - generators/refinerycms_blog - generators/refinerycms_blog/refinerycms_blog_generator.rb - generators/refinerycms_blog/templates - generators/refinerycms_blog/templates/db - generators/refinerycms_blog/templates/db/migrate - generators/refinerycms_blog/templates/db/migrate/migration.rb - generators/refinerycms_blog/templates/db/seeds - generators/refinerycms_blog/templates/db/seeds/seed.rb lib lib/gemspec.rb lib/generators lib/generators/refinerycms_blog lib/generators/refinerycms_blog/templates - lib/generators/refinerycms_blog/templates/db - lib/generators/refinerycms_blog/templates/db/migrate - lib/generators/refinerycms_blog/templates/db/migrate/migration_number_add_user_id_to_blog_posts.rb - lib/generators/refinerycms_blog/templates/db/migrate/migration_number_create_singular_name.rb - lib/generators/refinerycms_blog/templates/db/seeds - lib/generators/refinerycms_blog/templates/db/seeds/seed.rb lib/generators/refinerycms_blog_generator.rb lib/refinerycms-blog.rb public @@ -155,8 +146,6 @@ Gem::Specification.new do |s| public/stylesheets/refinery public/stylesheets/refinery/refinerycms-blog.css public/stylesheets/refinerycms-blog.css - rails - rails/init.rb readme.md spec spec/models -- cgit v1.2.3