+ <%= f.label :category %>
+ <%= f.collection_select(:category_id, Category.where(user_id: session[:user_id]).sort_by(&:get_fqcn), :id, :get_fqcn) %>
+
+
+
<% if session[:user_id] %>
+
+
<%= button_to 'Logout', logout_path, method: :delete %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index bdaa0df..810f3c1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,14 +1,13 @@
Rails.application.routes.draw do
- resources :documents
+ root 'documents#index', as: 'documents_index'
- root 'users#index', as: 'users_index'
+ resources :categories
+ resources :documents
+ resources :users
controller :sessions do
get 'login' => :new
post 'login' => :create
delete 'logout' => :destroy
end
-
- resources :users
- # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
end
diff --git a/db/migrate/20161124182250_create_categories.rb b/db/migrate/20161124182250_create_categories.rb
new file mode 100644
index 0000000..e173243
--- /dev/null
+++ b/db/migrate/20161124182250_create_categories.rb
@@ -0,0 +1,10 @@
+class CreateCategories < ActiveRecord::Migration[5.0]
+ def change
+ create_table :categories do |t|
+ t.string :name
+ t.references :parent
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20161124182924_add_user_to_category.rb b/db/migrate/20161124182924_add_user_to_category.rb
new file mode 100644
index 0000000..3c0ba53
--- /dev/null
+++ b/db/migrate/20161124182924_add_user_to_category.rb
@@ -0,0 +1,5 @@
+class AddUserToCategory < ActiveRecord::Migration[5.0]
+ def change
+ add_reference :categories, :user, index: true
+ end
+end
diff --git a/db/migrate/20161124223446_add_category_to_document.rb b/db/migrate/20161124223446_add_category_to_document.rb
new file mode 100644
index 0000000..be09466
--- /dev/null
+++ b/db/migrate/20161124223446_add_category_to_document.rb
@@ -0,0 +1,5 @@
+class AddCategoryToDocument < ActiveRecord::Migration[5.0]
+ def change
+ add_reference :documents, :category, index: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5536e32..54f52a8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,17 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20161124174721) do
+ActiveRecord::Schema.define(version: 20161124223446) do
+
+ create_table "categories", force: :cascade do |t|
+ t.string "name"
+ t.integer "parent_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "user_id"
+ t.index ["parent_id"], name: "index_categories_on_parent_id"
+ t.index ["user_id"], name: "index_categories_on_user_id"
+ end
create_table "documents", force: :cascade do |t|
t.string "name"
@@ -22,6 +32,8 @@ ActiveRecord::Schema.define(version: 20161124174721) do
t.datetime "doc_updated_at"
t.string "doc_fingerprint"
t.integer "user_id"
+ t.integer "category_id"
+ t.index ["category_id"], name: "index_documents_on_category_id"
t.index ["doc_fingerprint"], name: "index_documents_on_doc_fingerprint"
t.index ["user_id"], name: "index_documents_on_user_id"
end
diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb
new file mode 100644
index 0000000..017eb06
--- /dev/null
+++ b/test/controllers/categories_controller_test.rb
@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class CategoriesControllerTest < ActionDispatch::IntegrationTest
+ setup do
+ @category = categories(:one)
+ end
+
+ test "should get index" do
+ get categories_url
+ assert_response :success
+ end
+
+ test "should get new" do
+ get new_category_url
+ assert_response :success
+ end
+
+ test "should create category" do
+ assert_difference('Category.count') do
+ post categories_url, params: { category: { name: @category.name } }
+ end
+
+ assert_redirected_to category_url(Category.last)
+ end
+
+ test "should show category" do
+ get category_url(@category)
+ assert_response :success
+ end
+
+ test "should get edit" do
+ get edit_category_url(@category)
+ assert_response :success
+ end
+
+ test "should update category" do
+ patch category_url(@category), params: { category: { name: @category.name } }
+ assert_redirected_to category_url(@category)
+ end
+
+ test "should destroy category" do
+ assert_difference('Category.count', -1) do
+ delete category_url(@category)
+ end
+
+ assert_redirected_to categories_url
+ end
+end
diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml
new file mode 100644
index 0000000..56066c6
--- /dev/null
+++ b/test/fixtures/categories.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ name: MyString
+
+two:
+ name: MyString
diff --git a/test/models/category_test.rb b/test/models/category_test.rb
new file mode 100644
index 0000000..4733541
--- /dev/null
+++ b/test/models/category_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CategoryTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end