Bug Fix and Feature Added #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

kedevlin wants to merge 47 commits into Ada-C4:master from kedevlin:master

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ config/mail.yml @@
     *~
     db/*.sqlite*
     db/schema.rb
+    db/db_test
+    db/db_development
     .*.swp
     .*.swo
     .DS_Store
@@ Expand All / @@ -21,5 +23,4 @@ tmp/* @@
     nbproject
     public/cache/*
     .rbenv-version
-    bin/
     .bundle/

Gemfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -57,4 +57,5 @@ group :development, :test do @@
       gem 'cucumber-rails-training-wheels'
       gem 'database_cleaner'
       gem 'capybara'
+      gem 'pry-nav'
     end

Gemfile.lock

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     GEM
-      remote: http://rubygems.org/
+      remote: https://rubygems.org/
       specs:
         RedCloth (4.2.9)
         abstract (1.0.0)
@@ Expand Down Expand Up / @@ -87,13 +87,22 @@ 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)
+        pry-nav (0.0.4)
+          pry (~> 0.9.7.4)
         rack (1.2.5)
         rack-mount (0.6.14)
           rack (>= 1.0.0)
@@ Expand Down Expand Up / @@ -141,17 +150,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)
@@ Expand Down Expand Up / @@ -193,6 +206,7 @@ DEPENDENCIES @@
       kaminari
       mini_magick (~> 1.3.3)
       pg
+      pry-nav
       rails (~> 3.0.10)
       rake (~> 0.9.2)
       recaptcha
@@ Expand All / @@ -205,3 +219,6 @@ DEPENDENCIES @@
       thin
       uuidtools (~> 2.1.1)
       webrat
+    BUNDLED WITH
+.11.2

app/controllers/admin/categories_controller.rb

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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,12 +47,11 @@ 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.')

        end

        redirect_to :action => 'new'

      end

    end

app/controllers/admin/content_controller.rb

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,14 +6,28 @@ class Admin::ContentController < Admin::BaseController
  
      cache_sweeper :blog_sweeper

      def merge

        unless current_user.admin?

          redirect_to admin_content_path

          flash[:error] = _("Error, you are not allowed to perform this action")

          return

        end

        first = Article.find(params[:id])

        merged = first.merge_with(params[:merge_with])

        if merged.nil?

          flash[:error] = _('Unable to perform merge.')

        end

        redirect_to admin_content_path

      end

      def auto_complete_for_article_keywords

        @items = Tag.find_with_char params[:article][:keywords].strip

        render :inline => "<%= raw auto_complete_result @items, 'name' %>"

      end

      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,7 +58,7 @@ 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

    @@ -77,7 +91,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 +106,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

    @@ -159,13 +173,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

    @@ -183,6 +197,7 @@ def new_or_edit
  
        render 'new'

      end

      def set_the_flash

        case params[:action]

        when 'new'

app/models/article.rb

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -71,6 +71,35 @@ def initialize(*args)
  
        end

      end

      def merge_with(other_article_id)

        return nil if (self.id == other_article_id) || !Article.exists?(other_article_id)

        first = self

        second = Article.find(other_article_id)

        merged = Article.new

        merged.title = first.title

        merged.body = first.body + " " + second.body

        merged.user_id = first.user_id

        merged.author = first.author

        merged.extended = first.extended ||= second.extended

        merged.excerpt = first.excerpt ||= second.excerpt

        merged.created_at = first.created_at

        merged.text_filter_id = first.text_filter_id ||= second.text_filter_id

        merged.whiteboard = first.whiteboard ||= second.whiteboard

        merged.name = first.name ||= second.name

        merged.published = first.published ||= second.published

        merged.published_at = first.published_at ||= second.published_at

        merged.allow_pings = first.allow_pings ||= second.allow_pings

        merged.allow_comments = first.allow_comments ||= second.allow_comments

        merged.parent_id = first.parent_id ||= second.parent_id

        merged.post_type = first.post_type

        merged.comments << first.comments

        merged.comments << second.comments

        merged.save

        first.destroy

        second.destroy

        return merged

      end

      def set_permalink

        return if self.state == 'draft'

        self.permalink = self.title.to_permalink if self.permalink.nil? or self.permalink.empty?

    @@ -104,10 +133,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

app/models/category.rb

Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,4 +84,3 @@ def set_permalink
		validates_presence_of :name
		validates_uniqueness_of :name, :on => :create
		end

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

-Original file line number
+Diff line change
@@ -1,3 +1,13 @@
     <% @page_heading = _('New article') %>
     <%= render "admin/shared/edit", { :form_type => "article", :form_action => { :action => "new", :id => @article.id , :class => ('autosave')} } %>
+    <% if current_user.admin? && !@article.id.nil? %>
+      <h3>Merge Articles</h3>
+      <%= form_tag merge_articles_path do %>
+        <p>
+          Article ID <%= number_field_tag 'merge_with', nil, min: 1 %>
+        </p>
+        <%= submit_tag(value = "Merge") %>
+      <% end %>
+    <% end %>

config/routes.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,9 @@ @@
         end
       end
+      # merge articles
+      match 'admin/content/:id/merge' => 'admin/content#merge', :as => :merge_articles
       # for CK Editor
       match 'fm/filemanager(/:action(/:id))', :to => 'Fm::Filemanager', :format => false
       match 'ckeditor/command', :to => 'ckeditor#command', :format => false
@@ Expand Down @@

db/schema.sqlite.sql

This file was deleted.

db/schema.sqlite3.sql

This file was deleted.

features/create_category.feature

-Original file line number
+Diff line change
@@ -0,0 +1,25 @@
+    Feature: Create Categories
+      As a blog administrator
+      In order to categorize my articles
+      I want to be able to create new categories
+      Background:
+         Given the blog is set up
+         And I am logged into the admin panel
+      Scenario: View Categories Page
+        Given I am on the admin dashboard page
+        When I follow "Categories"
+        Then I should see "Categories"
+      Scenario: Create New Category Requires Name
+        Given I am on the admin categories page
+        When I press "Save"
+        Then I should see "Category could not be saved."
+      Scenario: Create New Category Requires Unique Name
+        Given I am on the admin categories page
+        And a category named "test" already exists
+        When I enter "test" into the "category_name" input field
+        And I press "Save"
+        Then I should see "Category could not be saved."

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug Fix and Feature Added #17

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Bug Fix and Feature Added #17

Are you sure you want to change the base?

Uh oh!

Bug Fix and Feature Added #17

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!