refinerycms-blog 1.2 → 1.3

data/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

data/lib/generators/refinerycms_blog_generator.rb

@@ -1,87 +1,8 @@
-require 'rails/generators/migration'
+require 'refinery/generators'
 
-class RefinerycmsBlogGenerator < Rails::Generators::NamedBase
-  include Rails::Generators::Migration
+class RefinerycmsBlogGenerator < ::Refinery::Generators::EngineInstaller
 
-  source_root File.expand_path('../refinerycms_blog/templates/', __FILE__)
-  argument :name, :type => :string, :default => 'blog_structure', :banner => ''
+  source_root File.expand_path('../../../', __FILE__)
+  engine_name "refinerycms-blog"
 
-  def generate
-    # seed file
-    template 'db/seeds/seed.rb', Rails.root.join('db/seeds/refinerycms_blog.rb')
-
-    # migration file
-    @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
-     }]
-    unless Pathname.glob(Rails.root.join('db', 'migrate', "*_create_#{singular_name}.rb")).any?
-      next_migration_number = ActiveRecord::Generators::Base.next_migration_number(File.dirname(__FILE__))
-      template('db/migrate/migration_number_create_singular_name.rb',
-               Rails.root.join("db/migrate/#{next_migration_number}_create_#{singular_name}.rb"))
-    end
-    unless Pathname.glob(Rails.root.join('db', 'migrate', "*_add_user_id_to_blog_posts.rb")).any?
-      next_migration_number = ActiveRecord::Generators::Base.next_migration_number(File.dirname(__FILE__))
-      template('db/migrate/migration_number_add_user_id_to_blog_posts.rb',
-               Rails.root.join('db', 'migrate', "#{next_migration_number}_add_user_id_to_blog_posts.rb"))
-    end
-
-    puts "------------------------"
-    puts "Now run:"
-    puts "rake db:migrate"
-    puts "------------------------"
-  end
-end
-
-# Below is a hack until this issue:
-# https://rails.lighthouseapp.com/projects/8994/tickets/3820-make-railsgeneratorsmigrationnext_migration_number-method-a-class-method-so-it-possible-to-use-it-in-custom-generators
-# is fixed on the Rails project.
-
-require 'rails/generators/named_base'
-require 'rails/generators/migration'
-require 'rails/generators/active_model'
-require 'active_record'
-
-module ActiveRecord
-  module Generators
-    class Base < Rails::Generators::NamedBase #:nodoc:
-      include Rails::Generators::Migration
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
-    end
-  end
-end
+end

data/lib/refinerycms-blog.rb

@@ -38,7 +38,7 @@ module Refinery
 
     class << self
       def version
-        %q{1.2}
+        %q{1.3}
       end
     end
   end

data/readme.md

@@ -17,7 +17,7 @@ Refinery CMS version 0.9.8 or above.
 
 Open up your ``Gemfile`` and add at the bottom this line:
 
-    gem 'refinerycms-blog', '~> 1.1'
+    gem 'refinerycms-blog', '~> 1.3'
 
 Now, run ``bundle install``
 

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-blog
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 +13:00
+date: 2011-03-04 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,19 +105,16 @@ files:
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/routes.rb
+- db/migrate/1_create_blog_structure.rb
+- db/migrate/2_add_user_id_to_blog_posts.rb
+- db/seeds/refinerycms_blog.rb
 - features/authors.feature
 - features/support/factories/blog_categories.rb
 - features/support/factories/blog_comments.rb
 - features/support/factories/blog_posts.rb
 - features/support/paths.rb
 - features/support/step_definitions/authors_steps.rb
-- generators/refinerycms_blog/refinerycms_blog_generator.rb
-- generators/refinerycms_blog/templates/db/migrate/migration.rb
-- generators/refinerycms_blog/templates/db/seeds/seed.rb
 - lib/gemspec.rb
-- 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/seed.rb
 - lib/generators/refinerycms_blog_generator.rb
 - lib/refinerycms-blog.rb
 - public/images/refinerycms-blog/icons/cog.png
@@ -138,7 +135,6 @@ files:
 - public/javascripts/refinerycms-blog.js
 - public/stylesheets/refinery/refinerycms-blog.css
 - public/stylesheets/refinerycms-blog.css
-- rails/init.rb
 - readme.md
 - spec/models/blog_categories_spec.rb
 - spec/models/blog_comments_spec.rb
@@ -167,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails blogging engine for RefineryCMS.

data/generators/refinerycms_blog/refinerycms_blog_generator.rb

@@ -1,69 +0,0 @@
-class RefinerycmsBlogGenerator < Rails::Generator::NamedBase
-
-  def initialize(*runtime_args)
-    # set argument for the user.
-    runtime_args[0] = %w(refinerycms_blog)
-    super(*runtime_args)
-  end
-
-  def banner
-    'Usage: script/generate refinerycms_blog'
-  end
-
-  def manifest
-    record do |m|
-      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.directory('db/seeds')
-      m.template('db/seeds/seed.rb', 'db/seeds/refinerycms_blog.rb')
-
-      m.migration_template('db/migrate/migration.rb', 'db/migrate',
-        :migration_file_name => 'create_blog_structure',
-        :assigns => {
-          :migration_name => 'CreateBlogStructure',
-          :tables => [{
-            :table_name => 'blog_posts',
-            :attributes => [
-              Rails::Generator::GeneratedAttribute.new('title', 'string'),
-              Rails::Generator::GeneratedAttribute.new('body', 'text'),
-              Rails::Generator::GeneratedAttribute.new('draft', 'boolean'),
-              Rails::Generator::GeneratedAttribute.new('published_at', 'datetime')
-            ], :id => true
-          },{
-            :table_name => 'blog_comments',
-            :attributes => [
-              Rails::Generator::GeneratedAttribute.new('blog_post_id', 'integer'),
-              Rails::Generator::GeneratedAttribute.new('spam', 'boolean'),
-              Rails::Generator::GeneratedAttribute.new('name', 'string'),
-              Rails::Generator::GeneratedAttribute.new('email', 'string'),
-              Rails::Generator::GeneratedAttribute.new('body', 'text'),
-              Rails::Generator::GeneratedAttribute.new('state', 'string'),
-            ], :id => true
-          },{
-            :table_name => 'blog_categories',
-            :attributes => [
-              Rails::Generator::GeneratedAttribute.new('title', 'string')
-            ], :id => true
-          },{
-            :table_name => 'blog_categories_blog_posts',
-            :attributes => [
-              Rails::Generator::GeneratedAttribute.new('blog_category_id', 'integer'),
-              Rails::Generator::GeneratedAttribute.new('blog_post_id', 'integer')
-            ], :id => false
-          }]
-        })
-    end
-  end
-
-end if defined?(Rails::Generator::NamedBase)

data/generators/refinerycms_blog/templates/db/migrate/migration.rb

@@ -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

data/generators/refinerycms_blog/templates/db/seeds/seed.rb

@@ -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

data/lib/generators/refinerycms_blog/templates/db/migrate/migration_number_create_singular_name.rb

@@ -1,26 +0,0 @@
-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

data/rails/init.rb

@@ -1,10 +0,0 @@
-require File.expand_path('../../lib/refinerycms-blog', __FILE__)
-
-Refinery::Plugin.register do |plugin|
-  plugin.name = "refinerycms_blog"
-  plugin.url = {:controller => '/admin/blog/posts', :action => 'index'}
-  plugin.menu_match = /^\/?(admin|refinery)\/blog\/?(posts|comments|categories)?/
-  plugin.activity = {
-    :class => BlogPost
-  }
-end