Integration

.gitignore

@@ -11,3 +11,7 @@
 /log/*
 !/log/.keep
 /tmp
+models_setup.txt
+models_setup.txt~
+public/img/
+.byebug_history

.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

Gemfile

@@ -24,17 +24,26 @@ gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '~> 3.1.7'
 
 # Use Unicorn as the app server
 # gem 'unicorn'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
+  gem 'slim'
+
+  gem 'cancancan'
+
+  gem 'bootstrap-sass'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
+  gem 'rspec-rails'
+  gem 'faker'
+  gem 'factory_girl_rails'
 end
 
 group :development do
@@ -44,4 +53,3 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 end
-

Gemfile.lock

@@ -37,10 +37,17 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+    autoprefixer-rails (6.3.6)
+      execjs
+    bcrypt (3.1.11)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.2)
     byebug (8.2.2)
+    cancancan (1.13.1)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
@@ -50,8 +57,16 @@ GEM
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.1)
     debug_inspector (0.0.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.6.0)
+    factory_girl (4.7.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.7.0)
+      factory_girl (~> 4.7.0)
+      railties (>= 3.0.0)
+    faker (1.6.3)
+      i18n (~> 0.5)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
@@ -106,6 +121,23 @@ GEM
     rake (11.1.2)
     rdoc (4.2.2)
       json (~> 1.4)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.2)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -116,6 +148,9 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    slim (3.0.6)
+      temple (~> 0.7.3)
+      tilt (>= 1.3.3, < 2.1)
     spring (1.6.4)
     sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
@@ -124,6 +159,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    temple (0.7.6)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
@@ -143,18 +179,25 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
+  bootstrap-sass
   byebug
+  cancancan
   coffee-rails (~> 4.1.0)
+  factory_girl_rails
+  faker
   jbuilder (~> 2.0)
   jquery-rails
   pg (~> 0.15)
   rails (= 4.2.6)
+  rspec-rails
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  slim
   spring
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.2

app/assets/javascripts/comments.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/favourites.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/home.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/posts.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/sessions.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/users.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/bootstrap_and_overrides.scss

@@ -0,0 +1,4 @@
+body { padding-top: 70px; }
+
+@import "bootstrap-sprockets";
+@import "bootstrap"

app/assets/stylesheets/comments.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the comments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/favourites.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the favourites controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/home.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the home controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/posts.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the posts controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/sessions.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the sessions controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/users.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/application_controller.rb

@@ -2,4 +2,20 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
+  def authenticate_user!
+    redirect_to new_session_path, notice: "Please sign in!" unless user_signed_in?
+  end
+
+  def user_signed_in?
+    session[:user_id].present?
+  end
+  helper_method :user_signed_in?
+
+  # Cancancan's ability.rb will use this if it exsists, I think -- IDFS
+  def current_user
+    @current_user ||= User.find session[:user_id] if user_signed_in?
+  end
+  helper_method :current_user
+
 end

app/controllers/comments_controller.rb

@@ -0,0 +1,70 @@
+class CommentsController < ApplicationController
+
+  before_action :authenticate_user!
+  before_action(:find_comment, {only: [:show, :edit, :update, :destroy]})
+  before_action :authorize_comment, only: [:edit, :update, :destroy]
+
+
+  def index
+    @comments = Comment.all
+  end
+
+  def new
+    @comment = Comment.new
+  end
+
+  def create
+    @post = Post.find params[:post_id]
+    @comment = Comment.new(comment_params)
+    @comment.post = @post
+    @comment.user = current_user
+    respond_to do |format|
+      if @comment.save
+        flash[:notice] = "Comment Created"
+        format.html { redirect_to post_path(@post) }
+        format.js   { render :reload }
+      else
+        flash[:alert] = "Error! Comment not created"
+        format.html { render "/posts/show" }
+        format.js   { render :reload }
+      end
+    end
+  end
+
+  def edit
+  end
+
+  # def update
+  #   if @comment.update comment_params
+  #     redirect_to comment_path(@comment), notice: "Comment updated!"
+  #   else
+  #     render :edit
+  #   end
+  # end
+
+  def show
+  end
+
+  def destroy
+    @post = Post.find params[:post_id]
+    @comment.destroy
+    redirect_to post_path(@post), notice: "Your comment was deleted."
+  end
+
+
+  private
+
+  def find_comment
+     @comment = Comment.find params[:id]
+  end
+
+  def authorize_comment
+    flash[:alert] = "You do not have permission to manage this comment"
+    redirect_to root_path unless can? :manage, @comment
+  end
+
+  def comment_params
+    params.require(:comment).permit(:body)
+  end
+
+end

app/controllers/favourites_controller.rb

@@ -0,0 +1,40 @@
+class FavouritesController < ApplicationController
+  before_action :authenticate_user!
+  before_action :find_post, only: [:create, :destroy]
+
+  def create
+    favourite      = Favourite.new
+    favourite.post = @post
+    favourite.user = current_user
+    respond_to do |format|
+      if favourite.save
+        format.html { redirect_to post_path(@post), notice: "Thanks for favouriting!" }
+        format.js   { render :modify_favourite }
+      else
+        format.html { redirect_to post_path(@post), alert: "Can't favourite! Have you already favourited?" }
+        format.js   { render :modify_favourite }
+      end
+    end
+  end
+
+  def destroy
+    favourite = current_user.favourites.find params[:id]
+    favourite.destroy
+    respond_to do |format|
+      format.html { redirect_to post_path(@post), notice: "Favourite removed!" }
+      format.js   { render :modify_favourite }
+    end
+  end
+
+  def index
+    @favourites = current_user.favourites.all
+  end
+
+
+  private
+
+  def find_post
+    @post ||= Post.find params[:post_id]
+  end
+
+end

app/controllers/home_controller.rb

@@ -0,0 +1,11 @@
+# Home and static pages go in HomeController
+class HomeController < ApplicationController
+  def home
+
+  end
+
+  def about
+
+  end
+
+end