This is just a bandaid PR so the main PR only reflects changes made during week 2.

.gitignore

@@ -17,3 +17,4 @@
 
 coverage
 .DS_Store
+.env

Gemfile

@@ -30,6 +30,10 @@ gem 'httparty'
 
 # OmniAuth Gems
 gem 'omniauth'
+gem 'omniauth-instagram'
+
+# OAuth
+gem 'twitter'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
@@ -73,4 +77,3 @@ end
 group :production do
   gem 'pg'
 end
-

Gemfile.lock

@@ -36,6 +36,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.3.8)
     arel (6.0.2)
     autoprefixer-rails (5.2.1.1)
       execjs
@@ -49,6 +50,7 @@ GEM
     bootstrap-sass (3.3.5.1)
       autoprefixer-rails (>= 5.0.0.1)
       sass (>= 3.3.0)
+    buftok (0.2.0)
     builder (3.2.2)
     byebug (5.0.0)
       columnize (= 0.9.0)
@@ -68,16 +70,22 @@ GEM
     dotenv-rails (2.0.2)
       dotenv (= 2.0.2)
       railties (~> 4.0)
+    equalizer (0.0.11)
     erubis (2.7.0)
     execjs (2.5.2)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
     hashie (3.4.2)
+    http (0.6.4)
+      http_parser.rb (~> 0.6.0)
+    http_parser.rb (0.6.0)
     httparty (0.13.5)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -90,21 +98,38 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
+    jwt (1.5.1)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
     mime-types (2.6.1)
     mini_portile (0.6.2)
     minitest (5.7.0)
     multi_json (1.11.2)
     multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    naught (1.0.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)
+    omniauth-instagram (1.0.1)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.0)
+    omniauth-oauth2 (1.3.1)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
     pg (0.18.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -168,6 +193,7 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    simple_oauth (0.3.1)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -187,6 +213,17 @@ GEM
     tilt (1.4.1)
     turbolinks (2.5.3)
       coffee-rails
+    twitter (5.14.0)
+      addressable (~> 2.3)
+      buftok (~> 0.2.0)
+      equalizer (~> 0.0.9)
+      faraday (~> 0.9.0)
+      http (~> 0.6.0)
+      http_parser.rb (~> 0.6.0)
+      json (~> 1.8)
+      memoizable (~> 0.4.0)
+      naught (~> 1.0)
+      simple_oauth (~> 0.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.1)
@@ -213,6 +250,7 @@ DEPENDENCIES
   jbuilder (~> 2.0)
   jquery-rails
   omniauth
+  omniauth-instagram
   pg
   pry-rails
   rails (= 4.2.3)
@@ -223,6 +261,7 @@ DEPENDENCIES
   spring
   sqlite3
   turbolinks
+  twitter
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
 

app/assets/javascripts/instagram_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/instagrams.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/tweets.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/custom.css.scss

@@ -1,2 +1,21 @@
 @import "bootstrap-sprockets";
 @import "bootstrap";
+
+.content {
+  padding-top: 35px;
+  // background: image-url("notso-2.png") no-repeat;
+}
+
+.center {
+  text-align: center;
+  margin: auto;
+  float: none;
+}
+
+.header {
+  font-size: 60px;
+}
+
+a:hover {
+  text-decoration: none;
+}

app/assets/stylesheets/instagram_posts.scss

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

app/assets/stylesheets/instagrams.scss

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

app/assets/stylesheets/tweets.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the twitters 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

@@ -1,5 +1,27 @@
+require 'twitter'
+require 'twit'
+
 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
+  before_filter :twit
+
+  INSTAGRAM_URI = "https://api.instagram.com/v1/"
+  MESSAGES = {
+    no_username: "There's no user by that name. Search again.",
+    success: "Success!",
+    follow_error: "Oops. Something went wrong.",
+    login_required: "You have to be logged in to do that!"
+  }
+
+  def twit
+    @twitter ||= Twit.new
+  end
+
+  def require_login
+    unless session[:user_id]
+      redirect_to root_path, flash: { error: MESSAGES[:login_required] }
+    end
+  end
 end

app/controllers/feeds_controller.rb

@@ -1,7 +1,42 @@
+require 'httparty'
+
 class FeedsController < ApplicationController
 
   def index
     @user = User.find_by(id: session[:user_id])
-
+    @posts = []
+    if @user && @user.instagrams
+      @user.instagram_posts.each do |post|
+        @posts << HTTParty.get(INSTAGRAM_URI + "media/" + post.post_id + "?access_token=#{session[:access_token]}")
+      end
+      @posts.sort_by! { |post| post["data"]["created_time"]}
+      @posts.reverse!
+    end
+
+    if @user && @user.tweets
+      @people = []
+      # @people << Instagram.find(@user.instagram_ids)
+      @people << Tweet.find(@user.tweet_ids)
+      @people.flatten!
+      @people.sort_by! { |person| person.username.downcase }
+
+      @feed = []
+      @people.each do |person|
+        username = person.username
+        @feed << @twitter.client.user_timeline(username, count: 10)
+        @feed.flatten!
+        @feed.sort_by { |tweet| tweet.created_at.strftime("%m/%d/%Y") }
+      end
+    end
+  end
+
+  def search; end
+
+  def people
+    @user = User.find_by(id: session[:user_id])
+    if @user
+      @people = Instagram.find(@user.instagram_ids) +  Tweet.find(@user.tweet_ids)
+    end
   end
+
 end

app/controllers/instagram_posts_controller.rb

@@ -0,0 +1,42 @@
+require 'httparty'
+
+class InstagramPostsController < ApplicationController
+  before_action :require_login, only: [:create]
+
+  def create
+    user = User.find_by(id: session[:user_id])
+    if user && user.instagrams
+      get_posts(user)
+
+      # Check if db table includes each post;
+      # if not, create new InstagramPost
+      @all_posts.each do |post|
+        params[:instagram_post] = {
+          post_id: post[:post_id],
+          instagram_id: post[:ig_id]
+        }
+        InstagramPost.find_or_create_by(instagram_post_params)
+      end
+    end
+    redirect_to root_path
+  end
+
+  private
+
+  def get_posts(user)
+    # Get an array of all recent post ids associated with
+    # all followed instagram users
+    @all_posts = []
+    user.instagrams.each do |gram|
+      ig_user_posts = HTTParty.get(INSTAGRAM_URI + "users/#{gram.provider_id}/media/recent?count=10&access_token=#{session[:access_token]}")
+      all_post_ids = ig_user_posts["data"].each do |post|
+        @all_posts << { ig_id: gram.id, post_id: post["id"]}
+      end
+    end
+    return @all_posts
+  end
+
+  def instagram_post_params
+    params.require(:instagram_post).permit(:post_id, :instagram_id)
+  end
+end

app/controllers/instagrams_controller.rb

@@ -0,0 +1,52 @@
+require 'httparty'
+
+class InstagramsController < ApplicationController
+  before_action :require_login, only: [:create]
+
+  CALLBACK_URL = "http://localhost:3000/auth/instagram/callback"
+
+  def search
+    if params[:instagram].present?
+      instagram_search = params[:instagram][:username]
+      response = HTTParty.get(INSTAGRAM_URI + "users/search?q=#{instagram_search}&client_id=#{ENV["INSTAGRAM_ID"]}")
+
+      @users = response["data"]
+
+      return render "feeds/search"
+    else
+      redirect_to root_path, flash: { error: MESSAGES[:no_username] }
+    end
+  end
+
+  def create
+    @instagram_person = Instagram.find_or_create_by(instagram_params)
+    @person = @instagram_person.username
+    @instagram_person.users << User.find(session[:user_id])
+
+    if @instagram_person.save
+      return redirect_to root_path, flash: { alert: MESSAGES[:success] }
+    else
+      return render "feeds/search", flash: { error: MESSAGES[:follow_error] }
+    end
+    redirect_to search_path
+    # add flash: no search results were found for 'username'
+  end
+
+  def destroy
+    user = User.find_by(id: session[:user_id])
+    instagramer = Instagram.find(params[:id])
+
+    if instagramer
+       user.instagrams.destroy(instagramer)
+    end
+
+    redirect_to people_path, flash: { alert: MESSAGES[:success] }
+  end
+
+  private
+
+  def instagram_params
+    params.require(:instagram).permit(:username, :provider_id, :image_url)
+  end
+
+end

app/controllers/sessions_controller.rb

@@ -3,9 +3,12 @@ class SessionsController < ApplicationController
 
   def create
     auth_hash = request.env['omniauth.auth'] || params
-    @user = User.find_or_create_from_omniauth_developer(auth_hash)
+    @user = User.find_or_create_from_omniauth(auth_hash)
     session[:user_id] = @user.id
 
+    # NOTE: SM added. Gets the user's access_token from Instagram
+    session[:access_token] = auth_hash[:credentials][:token]
+
     redirect_to root_path
   end