refinerycms-blog 0.9.8.0.rc2 → 1.0.rc10

data/lib/generators/refinery_blog_generator.rb

@@ -0,0 +1,79 @@
+require 'rails/generators/migration'
+
+class RefineryBlogGenerator < Rails::Generators::NamedBase
+  include Rails::Generators::Migration
+
+  source_root File.expand_path('../refinery_blog/templates/', __FILE__)
+  argument :name, :type => :string, :default => 'blog_structure', :banner => ''
+
+  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')
+       ], :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
+     }]
+    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"))
+
+     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

data/lib/refinerycms-blog.rb

@@ -1,10 +1,14 @@
-require 'filters_spam' if defined?(Bundler)
+if defined?(Bundler) and !defined?(FiltersSpam)
+  # this will tell the user what to do
+  load(File.expand_path('../../Gemfile', __FILE__))
+  require 'filters_spam'
+end
 
 module Refinery
   module Blog
 
     class Engine < Rails::Engine
-      initializer 'blog serves assets' do
+      initializer 'blog serves assets' do |app|
         app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
       end
 
@@ -17,12 +21,28 @@ module Refinery
             :class => BlogPost
           }
         end
+
+        # refinery 0.9.8 had a bug that we later found through using this engine.
+        # the bug was that the plugin urls were not :controller => '/admin/whatever'
+        if Refinery.version == '0.9.8'
+          ::Refinery::Plugin.class_eval %{
+            alias_method :old_url, :url
+
+            def url
+              if (plugin_url = self.old_url).is_a?(Hash) and plugin_url[:controller] =~ %r{^admin}
+                plugin_url[:controller] = "/\#{plugin_url[:controller]}"
+              end
+
+              plugin_url
+            end
+          }
+        end
       end
     end if defined?(Rails::Engine)
 
     class << self
       def version
-        %q{0.9.8.0.rc2}
+        %q{1.0.rc10}
       end
     end
   end

data/public/javascripts/refinery/refinerycms-blog.js

@@ -1,6 +1,9 @@
 $(document).ready(function(){
   $('nav#actions.multilist > ul:not(.search_list) li a[href$=' + window.location.pathname + ']')
     .parent().addClass('selected');
+  if($('nav#actions.multilist > ul:not(.search_list) li.selected').length == 0) {
+    $('nav#actions.multilist > ul:not(.search_list) li a:nth(1)').parent().addClass('selected');
+  }
 
   $('nav#actions.multilist > ul:not(.search_list) li > a').each(function(i,a){
     if ($(this).data('dialog-title') == null) {
@@ -12,12 +15,19 @@ $(document).ready(function(){
 
   $('ul.collapsible_menu').each(function(i, ul) {
     (first_li = $(this).children('li:first')).after(div=$("<div></div>"));
+    
+    $("<span class='arrow'>&nbsp;</span>").appendTo(first_li)
+    
     if (($(this).children('li.selected')).length == 0) {
       div.hide();
+      first_li.addClass("closed");
     }
     $(this).children('li:not(:first)').appendTo(div);
-    
-    first_li.find('> a').click(function(e){
+
+    first_li.find('> a, > span.arrow').click(function(e){
+      $(this).parent().toggleClass("closed");
+      $(this).parent().toggleClass("open");
+
       $(this).parent().next('div').animate({
           opacity: 'toggle'
           , height: 'toggle'
@@ -32,8 +42,8 @@ $(document).ready(function(){
   $('.success_icon, .failure_icon').bind('click', function(e) {
     $.get($(this).attr('href'), $.proxy(function(data){
       $(this).css('background-image', null)
-             .toggleClass('success_icon')
-             .toggleClass('failure_icon');
+             .removeClass('failure_icon').removeClass('success_icon')
+             .addClass(data.enabled ? 'success_icon' : 'failure_icon');
     }, $(this)));
     e.preventDefault();
   });

data/public/stylesheets/refinery/refinerycms-blog.css

@@ -30,4 +30,22 @@
 }
 .page_add_icon {
   background-image: url('/images/refinerycms-blog/icons/page_add.png');
+}
+ul.collapsible_menu li {
+  position: relative;
+}
+ul.collapsible_menu li span.arrow {
+  background-repeat: no-repeat;
+  position: absolute;
+  right: 10px;
+  top: 13px;
+  width: 11px;
+  height: 7px;
+  cursor: pointer;
+}
+ul.collapsible_menu li span.arrow {
+  background-image: url('/images/refinerycms-blog/icons/up.gif');
+}
+ul.collapsible_menu li.closed span.arrow {
+  background-image: url('/images/refinerycms-blog/icons/down.gif');
 }

data/public/stylesheets/refinerycms-blog.css

@@ -13,4 +13,9 @@
 }
 .field.message_field label {
   vertical-align: top;
+}
+#rss_feed_subscribe {
+  display: block;
+  padding-left: 25px;
+  background: url('/images/refinerycms-blog/rss-feed.png') no-repeat;
 }

data/readme.md

@@ -1 +1,24 @@
-Blog plugin redux
+# About
+
+Simple blog engine for [Refinery CMS](http://refinerycms.com). It supports posts, categories and comments.
+
+Options:
+
+* Comment moderation
+* [ShareThis.com](http://sharethis.com) support on posts. Set your key in Refinery's settings area to enable this.
+
+# Install
+
+Open up your ``Gemfile`` and add at the bottom this line
+
+    gem 'refinerycms-blog', '= 1.0.rc9'
+
+Now run ``bundle install``
+
+Next to install the blog plugin run:
+
+    ruby script/generate refinery_blog
+
+Finally migrate your database and you're done.
+
+    rake db:migrate

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-blog
 version: !ruby/object:Gem::Version 
-  hash: 977940591
+  hash: -398340057
   prerelease: true
   segments: 
+  - 1
   - 0
-  - 9
-  - 8
-  - 0
-  - rc2
-  version: 0.9.8.0.rc2
+  - rc10
+  version: 1.0.rc10
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +12:00
+date: 2010-09-14 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +25,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
@@ -66,7 +64,9 @@ files:
 - app/controllers/admin/blog/comments_controller.rb
 - app/controllers/admin/blog/posts_controller.rb
 - app/controllers/admin/blog/settings_controller.rb
-- app/controllers/blog_posts_controller.rb
+- app/controllers/blog/categories_controller.rb
+- app/controllers/blog/posts_controller.rb
+- app/controllers/blog_controller.rb
 - app/models/blog_category.rb
 - app/models/blog_comment.rb
 - app/models/blog_post.rb
@@ -80,6 +80,7 @@ files:
 - app/views/admin/blog/comments/_comment.html.erb
 - app/views/admin/blog/comments/_sortable_list.html.erb
 - app/views/admin/blog/comments/index.html.erb
+- app/views/admin/blog/comments/show.html.erb
 - app/views/admin/blog/posts/_form.html.erb
 - app/views/admin/blog/posts/_post.html.erb
 - app/views/admin/blog/posts/_sortable_list.html.erb
@@ -87,11 +88,15 @@ files:
 - app/views/admin/blog/posts/index.html.erb
 - app/views/admin/blog/posts/new.html.erb
 - app/views/admin/blog/settings/notification_recipients.html.erb
-- app/views/blog_posts/_categories.html.erb
-- app/views/blog_posts/_comments.html.erb
-- app/views/blog_posts/_side_bar.html.erb
-- app/views/blog_posts/index.html.erb
-- app/views/blog_posts/show.html.erb
+- app/views/blog/categories/show.html.erb
+- app/views/blog/posts/_comment.html.erb
+- app/views/blog/posts/index.html.erb
+- app/views/blog/posts/index.rss.builder
+- app/views/blog/posts/show.html.erb
+- app/views/blog/shared/_categories.html.erb
+- app/views/blog/shared/_post.html.erb
+- app/views/blog/shared/_posts.html.erb
+- app/views/blog/shared/_rss_feed.html.erb
 - config/locales/en.yml
 - config/locales/nb.yml
 - config/locales/nl.yml
@@ -99,21 +104,27 @@ files:
 - Gemfile
 - Gemfile.lock
 - generators/refinery_blog/refinery_blog_generator.rb
-- generators/refinery_blog/templates/migration.rb
-- generators/refinery_blog/templates/seed.rb
+- generators/refinery_blog/templates/db/migrate/migration.rb
+- generators/refinery_blog/templates/db/seeds/seed.rb
 - lib/gemspec.rb
+- lib/generators/refinery_blog/templates/db/migrate/migration_number_create_singular_name.rb
+- lib/generators/refinery_blog/templates/db/seeds/seed.rb
+- lib/generators/refinery_blog_generator.rb
 - lib/refinerycms-blog.rb
 - public/images/refinerycms-blog/icons/cog.png
 - public/images/refinerycms-blog/icons/comment.png
 - public/images/refinerycms-blog/icons/comment_cross.png
 - public/images/refinerycms-blog/icons/comment_tick.png
 - public/images/refinerycms-blog/icons/comments.png
+- public/images/refinerycms-blog/icons/down.gif
 - public/images/refinerycms-blog/icons/folder.png
 - public/images/refinerycms-blog/icons/folder_add.png
 - public/images/refinerycms-blog/icons/folder_edit.png
 - public/images/refinerycms-blog/icons/page.png
 - public/images/refinerycms-blog/icons/page_add.png
 - public/images/refinerycms-blog/icons/page_copy.png
+- public/images/refinerycms-blog/icons/up.gif
+- public/images/refinerycms-blog/rss-feed.png
 - public/javascripts/refinery/refinerycms-blog.js
 - public/stylesheets/refinery/refinerycms-blog.css
 - public/stylesheets/refinerycms-blog.css

data/app/controllers/blog_posts_controller.rb

@@ -1,62 +0,0 @@
-class BlogPostsController < ApplicationController
-
-  before_filter :find_all_blog_posts, :find_all_blog_categories
-  before_filter :find_page
-  before_filter :find_blog_post, :only => [:show, :comment]
-
-  def index
-    # you can use meta fields from your model instead (e.g. browser_title)
-    # by swapping @page for @blogs in the line below:
-    present(@page)
-  end
-
-  def show
-    @blog_comment = BlogComment.new
-
-    # you can use meta fields from your model instead (e.g. browser_title)
-    # by swapping @page for @blogs in the line below:
-    present(@page)
-  end
-
-  def comment
-    if (@blog_comment = @blog_post.comments.create(params[:blog_comment])).valid?
-      if BlogComment::Moderation.enabled?
-        flash[:notice] = t('.comments.thank_you_moderated')
-        redirect_back_or_default blog_post_url(params[:id])
-      else
-        flash[:notice] = t('.comments.thank_you')
-        redirect_to blog_post_url(params[:id],
-                                  :anchor => "comment-#{@blog_comment.to_param}")
-      end
-    else
-      render :action => 'show'
-    end
-  end
-
-protected
-
-  def find_blog_post
-    @blog_post = BlogPost.live.find(params[:id])
-  end
-
-  def find_all_blog_posts
-    unless params[:category_id].present?
-      @blog_posts = BlogPost.live
-    else
-      if (category = BlogCategory.find(params[:category_id])).present?
-        @blog_posts = category.posts
-      else
-        error_404
-      end
-    end
-  end
-
-  def find_all_blog_categories
-    @blog_categories = BlogCategory.all
-  end
-
-  def find_page
-    @page = Page.find_by_link_url("/blog")
-  end
-
-end

data/app/views/blog_posts/_side_bar.html.erb

@@ -1,8 +0,0 @@
-<h2><%= t('.categories') %></h2>
-<ul class='categories'>
-  <% @blog_categories.each do |category| %>
-    <li>
-      <%= link_to category.title, blog_category_url(category) %>
-    </li>
-  <% end %>
-</ul>

data/app/views/blog_posts/index.html.erb

@@ -1,27 +0,0 @@
-<% content_for :body_content_left do %>
-  <%= @page[Page.default_parts.first.to_sym] %>
-
-  <ul id="blog_posts">
-    <% @blog_posts.each do |blog_post| %>
-      <li>
-        <h2><%= link_to blog_post.title, blog_post_url(blog_post) %></h2>
-        <%= blog_post.created_at.strftime('%d %B %Y') %>
-        <%= truncate(blog_post.body, 
-                     :length => RefinerySetting.find_or_set(:blog_post_teaser_length, 250), 
-                     :preserve_html_tags => true) %>
-        <%= link_to t('.read_more'), blog_post_url(blog_post) %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
-<% content_for :body_content_right do %>
-  <%= @page[Page.default_parts.second.to_sym] %>
-
-  <%= render :partial => "side_bar" %>
-<% end %>
-
-<%= render :partial => "/shared/content_page" %>
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'refinerycms-blog' %>
-<% end %>

data/app/views/blog_posts/show.html.erb

@@ -1,76 +0,0 @@
-<% content_for :body_content_title, @blog_post.title %>
-
-<% content_for :body_content_left do %>
-  <%= @blog_post.body %>
-
-  <% if (categories = @blog_post.categories).any? %>
-    <hr />
-    <div class='post_categories'>
-      <span class='filed_in'><%= t('.filed_in') %></span>
-      <ul>
-        <% categories.each_with_index do |category, index| %>
-          <li>
-            <%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
-          </li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <% if (comments = @blog_post.comments.approved).any? %>
-    <hr />
-    <h2><%= t('.comments.title') %></h2>
-    <% comments.each do |comment| %>
-      <div class='blog_comment_message'>
-        <p>
-          <%= comment.message.to_s.gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>") %>
-        </p>
-      </div>
-      <p class='blog_comment_author'>
-        <%= t('.comments.by', :who => comment.name) %>
-        <%= t('.comments.time_ago', :time => time_ago_in_words(comment.created_at)) %>
-      </p>
-    <% end %>
-  <% end %>
-
-  <% if BlogPost.comments_allowed? %>
-    <hr />
-    <% form_for [:blog_post, @blog_comment] do |f| %>
-      <div class='field'>
-        <%= f.label :name %>
-        <%= f.text_field :name %>
-      </div>
-      <div class='field'>
-        <%= f.label :email %>
-        <%= f.text_field :email %>
-      </div>
-      <div class='field message_field'>
-        <%= f.label :message %>
-        <%= f.text_area :message, :rows => 6 %>
-      </div>
-      <div class='field form-actions'>
-        <%= f.submit t('.submit') %>
-      </div>
-    <% end %>
-  <% end %>
-<% end %>
-
-<% content_for :body_content_right do %>
-  <h2><%= t('.created_at_title') %></h2>
-  <%= t('.created_at', :when => @blog_post.created_at.strftime('%d %B %Y')) %>
-  <%= render :partial => "side_bar" %>
-
-  <h2><%= t('.other') %></h2>
-  <ul id="blog_post">
-    <% @blog_posts.each do |blog_post| %>
-      <li>
-        <%= link_to blog_post.title, blog_post_url(blog_post) %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
-<%= render :partial => "/shared/content_page" %>
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'refinerycms-blog' %>
-<% end %>