Admin user can merge two articles from edit page

.gitignore

@@ -3,6 +3,8 @@ config/mail.yml
 *~
 db/*.sqlite*
 db/schema.rb
+db/db_test
+db/db_development
 .*.swp
 .*.swo
 .DS_Store

Gemfile

@@ -57,4 +57,7 @@ group :development, :test do
   gem 'cucumber-rails-training-wheels'
   gem 'database_cleaner'
   gem 'capybara'
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'pry'
 end

Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
     abstract (1.0.0)
@@ -34,6 +34,11 @@ GEM
     addressable (2.3.2)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
+    better_errors (0.0.8)
+      coderay
+      erubis
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
     builder (2.1.2)
     capybara (1.1.2)
@@ -60,6 +65,7 @@ GEM
       cucumber-rails (>= 1.1.1)
     daemons (1.1.9)
     database_cleaner (0.8.0)
+    debug_inspector (0.0.2)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -87,13 +93,20 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.6.7)
+      ruby_parser (>= 2.3.1)
     mime-types (1.19)
     mini_magick (1.3.3)
       subexec (~> 0.0.4)
     multi_json (1.3.6)
     nokogiri (1.5.5)
     pg (0.14.1)
     polyglot (0.3.3)
+    pry (0.9.7.4)
+      coderay (~> 0.9.8)
+      method_source (~> 0.6.7)
+      ruby_parser (>= 2.3.1)
+      slop (~> 2.1.0)
     rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -141,17 +154,21 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    ruby_parser (3.8.1)
+      sexp_processor (~> 4.1)
     rubypants (0.2.0)
     rubyzip (0.9.9)
     selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+    sexp_processor (4.7.0)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    slop (2.1.0)
     sqlite3 (1.3.6)
     subexec (0.0.4)
     thin (1.5.0)
@@ -179,6 +196,8 @@ DEPENDENCIES
   acts_as_list
   acts_as_tree_rails3
   addressable (~> 2.1)
+  better_errors
+  binding_of_caller
   bluecloth (~> 2.1)
   capybara
   coderay (~> 0.9)
@@ -193,6 +212,7 @@ DEPENDENCIES
   kaminari
   mini_magick (~> 1.3.3)
   pg
+  pry
   rails (~> 3.0.10)
   rake (~> 0.9.2)
   recaptcha
@@ -205,3 +225,6 @@ DEPENDENCIES
   thin
   uuidtools (~> 2.1.1)
   webrat
+
+BUNDLED WITH
+   1.11.2

app/controllers/admin/categories_controller.rb

@@ -4,10 +4,10 @@ class Admin::CategoriesController < Admin::BaseController
   def index; redirect_to :action => 'new' ; end
   def edit; new_or_edit;  end
 
-  def new 
+  def new
     respond_to do |format|
       format.html { new_or_edit }
-      format.js { 
+      format.js {
         @category = Category.new
       }
     end
@@ -25,12 +25,16 @@ def destroy
 
   def new_or_edit
     @categories = Category.find(:all)
-    @category = Category.find(params[:id])
+    if params[:id].nil?
+      @category = Category.new
+    else
+      @category = Category.find(params[:id])
+    end
     @category.attributes = params[:category]
     if request.post?
       respond_to do |format|
         format.html { save_category }
-        format.js do 
+        format.js do
           @category.save
           @article = Article.new
           @article.categories << @category
@@ -43,7 +47,7 @@ def new_or_edit
   end
 
   def save_category
-    if @category.save!
+    if @category.save
       flash[:notice] = _('Category was successfully saved.')
     else
       flash[:error] = _('Category could not be saved.')

app/controllers/admin/content_controller.rb

@@ -13,7 +13,7 @@ def auto_complete_for_article_keywords
 
   def index
     @search = params[:search] ? params[:search] : {}
-    
+
     @articles = Article.search_with_pagination(@search, {:page => params[:page], :per_page => this_blog.admin_display_elements})
 
     if request.xhr?
@@ -44,14 +44,33 @@ def destroy
       flash[:error] = _("Error, you are not allowed to perform this action")
       return(redirect_to :action => 'index')
     end
-    
+
     return(render 'admin/shared/destroy') unless request.post?
 
     @record.destroy
     flash[:notice] = _("This article was deleted successfully")
     redirect_to :action => 'index'
   end
 
+  def merge
+    if current_user.admin?
+      id = params[:id]
+      merge_id = params[:merge_with][:merge_id]
+      if id == merge_id
+        flash[:error] = _("You cannot merge an article with itself")
+      elsif Article.exists?(merge_id) && Article.exists?(id)
+        record = Article.find(id)
+        record.merge_with(merge_id)
+        flash[:notice] = _("Articles merged successfully")
+      else
+        flash[:error] = _("Article not found")
+      end
+    else
+      flash[:error] = _("Error, you are not allowed to perform this action")
+    end
+    redirect_to :action => 'index'
+  end
+
   def insert_editor
     editor = 'visual'
     editor = 'simple' if params[:editor].to_s == 'simple'
@@ -77,7 +96,7 @@ def attachment_box_add
 
   def attachment_save(attachment)
     begin
-      Resource.create(:filename => attachment.original_filename, :mime => attachment.content_type.chomp, 
+      Resource.create(:filename => attachment.original_filename, :mime => attachment.content_type.chomp,
                       :created_at => Time.now).write_to_disk(attachment)
     rescue => e
       logger.info(e.message)
@@ -92,7 +111,7 @@ def autosave
     @article.text_filter = current_user.text_filter if current_user.simple_editor?
 
     get_fresh_or_existing_draft_for_article
-    
+
     @article.attributes = params[:article]
     @article.published = false
     set_article_author
@@ -144,7 +163,6 @@ def new_or_edit
     id = params[:article][:id] if params[:article] && params[:article][:id]
     @article = Article.get_or_build_article(id)
     @article.text_filter = current_user.text_filter if current_user.simple_editor?
-
     @post_types = PostType.find(:all)
     if request.post?
       if params[:article][:draft]
@@ -159,13 +177,13 @@ def new_or_edit
     @article.keywords = Tag.collection_to_string @article.tags
     @article.attributes = params[:article]
     # TODO: Consider refactoring, because double rescue looks... weird.
-        
+
     @article.published_at = DateTime.strptime(params[:article][:published_at], "%B %e, %Y %I:%M %p GMT%z").utc rescue Time.parse(params[:article][:published_at]).utc rescue nil
 
     if request.post?
       set_article_author
       save_attachments
-      
+
       @article.state = "draft" if @article.draft
 
       if @article.save

app/models/article.rb

@@ -104,10 +104,10 @@ def last_draft(article_id)
     end
 
     def search_with_pagination(search_hash, paginate_hash)
-      
+
       state = (search_hash[:state] and ["no_draft", "drafts", "published", "withdrawn", "pending"].include? search_hash[:state]) ? search_hash[:state] : 'no_draft'
-      
-      
+
+
       list_function  = ["Article.#{state}"] + function_search_no_draft(search_hash)
 
       if search_hash[:category] and search_hash[:category].to_i > 0
@@ -416,6 +416,17 @@ def access_by?(user)
     user.admin? || user_id == user.id
   end
 
+  def merge_with(other_article_id)
+    Article.find(other_article_id).comments.each do |comment|
+      comment.article_id = self.id
+      comment.save
+    end
+    merge_article = Article.find(other_article_id)
+    self.body += " " + merge_article.body
+    self.save
+    merge_article.destroy
+  end
+
   protected
 
   def set_published_at

app/views/admin/content/new.html.erb

@@ -1,3 +1,15 @@
 <% @page_heading = _('New article') %>
 
 <%= render "admin/shared/edit", { :form_type => "article", :form_action => { :action => "new", :id => @article.id , :class => ('autosave')} } %>
+
+<% if current_user.admin? && [email protected]? %>
+  <h3>Merge Articles</h3>
+  <%= form_tag :action=>"merge", :id => @article.id do %>
+  <%= error_messages_for 'article' %>
+    <label for="merge_with"><%= _("Article ID")%></label>
+    <div class='input'>
+      <%= text_field :merge_with, :merge_id  %>
+    </div>
+    <%= submit_tag("Merge") %>
+  <% end %>
+<% end %>

features/manage_categories.feature

@@ -0,0 +1,39 @@
+Feature: Manage Categories
+  As a blog administrator
+  In order to share my thoughts with the world
+  I want to be able to add categories to my blog
+
+  Background:
+    Given the blog is set up
+    And I am logged into the admin panel
+
+  Scenario: Successfully add categories
+    Given I am on the new category page
+    Then I should not see "fun"
+    When I fill in "category_name" with "fun"
+    And I fill in "category_keywords" with "friend, happy, song"
+    And I fill in "category_permalink" with "something"
+    And I fill in "category_description" with "cool beans"
+    And I press "Save"
+    Then I should be on the new category page
+    And I should see "fun"
+    And I should see "friend, happy, song"
+    And I should see "something"
+    And I should see "cool beans"
+    And I should have 2 categories
+
+  Scenario: Successfully edit categories
+    Given I am on the edit category page
+    Then I should see "general"
+    When I fill in "category_name" with "fun"
+    And I fill in "category_keywords" with "friend, happy, song"
+    And I fill in "category_permalink" with "something"
+    And I fill in "category_description" with "cool beans"
+    And I press "Save"
+    Then I should be on the new category page
+    Then I should not see "general"
+    And I should see "fun"
+    And I should see "friend, happy, song"
+    And I should see "something"
+    And I should see "cool beans"
+    And I should have 1 categories

features/merge_articles.feature

@@ -0,0 +1,29 @@
+Feature: Merge Articles
+  As a blog administrator
+  In order to share my thoughts with the world
+  I want to be able to merge similar articles on my blog
+
+  Background:
+    Given the blog is set up
+
+  Scenario: Non-admin cannot merge articles
+    Given I am logged in as a contributor
+    And I am on the edit articles page
+    Then I should not see "Merge Articles"
+
+  Scenario: Admin can successfully merge articles
+    Given I am logged into the admin panel
+    And I have two similar articles titled Cats, Dogs
+    And I am on the manage articles page
+    Then I should see "Cats"
+    And I should see "Dogs"
+    When I follow "Edit"
+    Then I should be on the edit articles page
+    And I should see "Merge Articles"
+    When I fill in "merge_with_merge_id" with "4"
+    And I press "Merge"
+    Then I should be on the manage articles page
+    And I should not see "Dogs"
+    And I should see "Cats"
+    When I follow "Show"
+    Then I should see "I love cats I love dogs"