Bug Fix and Feature Added

.gitignore

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

Gemfile

@@ -19,6 +19,8 @@ dbfile = File.expand_path("../config/database.yml", __FILE__)
 #  end
 #end
 
+gem 'pry-nav', group: [:development, :test]
+
 group :production do
   gem 'pg'
 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)
@@ -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)
@@ -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)
@@ -193,6 +206,7 @@ DEPENDENCIES
   kaminari
   mini_magick (~> 1.3.3)
   pg
+  pry-nav
   rails (~> 3.0.10)
   rake (~> 0.9.2)
   recaptcha
@@ -205,3 +219,6 @@ DEPENDENCIES
   thin
   uuidtools (~> 2.1.1)
   webrat
+
+BUNDLED WITH
+   1.11.2

app/controllers/admin/categories_controller.rb

@@ -1,13 +1,14 @@
+require 'pry'
 class Admin::CategoriesController < Admin::BaseController
   cache_sweeper :blog_sweeper
 
   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 +26,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 +48,12 @@ def new_or_edit
   end
 
   def save_category
-    if @category.save!
+    @category.save
+    if @category.errors.empty?
       flash[:notice] = _('Category was successfully saved.')
     else
       flash[:error] = _('Category could not be saved.')
     end
     redirect_to :action => 'new'
   end
-
 end

app/models/category.rb

@@ -84,4 +84,3 @@ def set_permalink
   validates_presence_of :name
   validates_uniqueness_of :name, :on => :create
 end
-

features/create_category.feature

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

features/step_definitions/web_steps.rb

@@ -55,6 +55,14 @@ def with_scope(locator)
   end
 end
 
+Given /^a category named "(.*?)" already exists$/ do |name|
+  Category.create!({:name => name})
+end
+
+When /^I enter "(.*?)" into the "(.*?)" input field$/ do |input, field|
+  fill_in(field, :with => input)
+end
+
 # Single-line step scoper
 When /^(.*) within (.*[^:])$/ do |step, parent|
   with_scope(parent) { When step }
@@ -250,7 +258,7 @@ def with_scope(locator)
     end
   end
 end
- 
+
 Then /^(?:|I )should be on (.+)$/ do |page_name|
   current_path = URI.parse(current_url).path
   if current_path.respond_to? :should
@@ -264,8 +272,8 @@ def with_scope(locator)
   query = URI.parse(current_url).query
   actual_params = query ? CGI.parse(query) : {}
   expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
-  
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+
   if actual_params.respond_to? :should
     actual_params.should == expected_params
   else

public/javascripts/ckeditor/config.bak

@@ -8,7 +8,7 @@ CKEDITOR.editorConfig = function( config )
   config.PreserveSessionOnFileBrowser = true;
   // Define changes to default configuration here. For example:
  	//config.language = '';
-  config.uiColor = '#E0ECFF';
+  config.uiColor = '#eee';
 	config.toolbar = 'Basic';
 	config.entities_greek = false;
 	config.entities_latin = false;

public/javascripts/ckeditor/config.js

@@ -8,7 +8,7 @@ CKEDITOR.editorConfig = function( config )
   config.PreserveSessionOnFileBrowser = true;
   // Define changes to default configuration here. For example:
  	//config.language = '';
-  config.uiColor = '#E0ECFF';
+  config.uiColor = '#eee';
 	config.toolbar = 'Basic';
 	config.entities_greek = false;
 	config.entities_latin = false;

spec/controllers/admin/categories_controller_spec.rb

@@ -16,6 +16,56 @@
     assert_response :redirect, :action => 'index'
   end
 
+  describe "GET 'new'" do
+    it "is successful" do
+      get :new
+      expect(response.status).to eq 200
+    end
+  end
+
+  describe "POST 'edit'" do
+    context "good params" do
+      it "creates a new category" do
+        expect {
+          post :edit, {"category"=>{"name"=>"test"}}
+        }.to change(Category, :count).by(1)
+      end
+    end
+
+    context "no name" do
+      it "creates flash error" do
+        post :edit, {"category"=>{"name"=>""}}
+        expect(flash[:error]).to be_present
+      end
+
+      it "does not create a new category" do
+        expect {
+          post :edit, {"category"=>{"name"=>""}}
+        }.to change(Category, :count).by(0)
+      end
+    end
+
+    context "category with name already exists" do
+      before(:each) do
+        Category.create!({:name => "test"})
+      end
+
+      let(:category_2) {Category.create!({:name => "second category"})}
+
+      it "creates flash error for new categories" do
+        post :edit, {"category"=>{"name"=>"test"}}
+        expect(flash[:error]).to be_present
+      end
+
+      it "does not create a new category" do
+        expect {
+          post :edit, {"category"=>{"name"=>"test"}}
+        }.to change(Category, :count).by(0)
+      end
+    end
+
+  end
+
   describe "test_edit" do
     before(:each) do
       get :edit, :id => Factory(:category).id
@@ -48,7 +98,7 @@
 
     it 'should render destroy template' do
       assert_response :success
-      assert_template 'destroy'      
+      assert_template 'destroy'
     end
   end
 
@@ -62,5 +112,5 @@
 
     assert_raise(ActiveRecord::RecordNotFound) { Category.find(test_id) }
   end
-  
+
 end

spec/controllers/categories_controller_spec.rb

@@ -73,14 +73,14 @@ def do_get
     do_get
     response.should render_template('articles/index')
   end
-  
+
   it 'should render personal when template exists' do
     pending "Stubbing #template_exists is not enough to fool Rails"
     controller.stub!(:template_exists?) \
       .and_return(true)
     do_get
     response.should render_template('personal')
-  end  
+  end
 
   it 'should show only published articles' do
     do_get
@@ -94,7 +94,7 @@ def do_get
 
   describe "when rendered" do
     render_views
-  
+
     it 'should have a canonical URL' do
       do_get
       response.should have_selector('head>link[href="http://myblog.net/category/personal/"]')
@@ -154,7 +154,7 @@ def do_get
 
     assert_tag :tag => "input",
       :attributes => { :id => "article_password" }
-  end  
+  end
 end
 
 describe CategoriesController, "SEO Options" do