Don't merge - Review weds

app/assets/javascripts/Controller.js

@@ -1,15 +1,19 @@
-function Controller(view) {
-  this.view = view;
-  view.controller = this;
-}
+$(document).ready(function(){
+  $('.filter-form').on('submit', function(event) {
+    var movieName = $(event.target).serializeArray()[3].value.toLowerCase().split(' ').join('-')
+    Movie.findMovie("top-gun").then(function(cast) {
+      var movieObj = new Movie(cast.results[0].id, "top-gun")
+      var getCast = movieObj.credits()
+      getCast.then(function(){
+        return movieObj.cast
+        // debugger
+    })
+      .then(function() {
+      $.post("http://localhost:3000/filter_words", movieObj)
+      })
+    })
+  })
+    // findTv("the-expanse")
+    // findMovie(movieName)
+})
 
-
-
-
-
-
-// Controller.prototype.index = function() {
-//   Media.loadMedia().then(function(media){
-//     this.view.showFiftyTweets(media);
-//   }.bind(this));
-// }

app/assets/javascripts/Model.js

@@ -1,26 +1,24 @@
-var movieSearch = function(movie){
-  var url = 'http://api.themoviedb.org/3/',
-      mode = 'search/movie?query=',
-      input = movie,
-      key = '&api_key=e0c6c7bded5055b146501304684b8f94';
-
-    return $.get(url + mode + input + key).then(function(response){
-
-    movieCredits(response.results[0].id,response.results[0].original_title);
-    });
-  };
-
-var tvSearch = function(tv){
- var url = 'http://api.themoviedb.org/3/',
-     mode = 'search/tv?query=',
-     input = tv,
-     key = '&api_key=e0c6c7bded5055b146501304684b8f94';
-
- return $.get(url + mode + input + key).then(function(response){
-    tvCredits(response.results[0].id,response.results[0].name);
-  })
- }
+var Movie = function(id, title) {
+  // this.url = 'http://api.themoviedb.org/3/'
+  this.id = id
+  this.mode = 'movie/' + this.id + '/credits?query='
+  this.title = title
+  // this.key = '&api_key=e0c6c7bded5055b146501304684b8f94'
+  this.cast = []
+}
 
+Movie.prototype.credits = function() {
+  var movie = this
+  var cast = this.cast
+  return $.get('http://api.themoviedb.org/3/' + movie.mode + '&api_key=e0c6c7bded5055b146501304684b8f94')
+  .done(function(response){
+      response.cast.forEach(function(element){
+        cast.push(element.character, element.name)
+      })
+    }).done(function(response){
+      this.cast = cast;
+    })
+}
 
 var movieCredits = function(id,title){
  var url = 'http://api.themoviedb.org/3/',
@@ -34,22 +32,63 @@ var movieCredits = function(id,title){
     });
     return cast
   })
-  debugger
  }
 
+Movie.prototype.search = function() {
+  var movie = this;
+  var cast = this.cast;
+  return $.get('http://api.themoviedb.org/3/' + this.mode + '&api_key=e0c6c7bded5055b146501304684b8f94')
+  .then(function(response){
+    return movie.credits();
+  });
+}
 
-var tvCredits = function(id,title){
-  var url = 'http://api.themoviedb.org/3/',
-      mode = "tv/" + id + "/credits?query=",
-      key = '&api_key=e0c6c7bded5055b146501304684b8f94';
+Movie.findMovie = function(movieTitle) {
+  return $.get('http://api.themoviedb.org/3/search/movie?query=' + movieTitle + '&api_key=e0c6c7bded5055b146501304684b8f94')
+}
 
-  return $.get(url + mode + key).then(function(response){
-    var cast = [title]
-    response.cast.forEach(function(element){
-      cast.push(element.character, element.name)
-    });
-    return(cast)
+
+////////////////////////////////////////////////
+
+var Tv = function(id, title) {
+  this.url = 'http://api.themoviedb.org/3/'
+  this.id = id
+  this.title = title
+  this.mode = "tv/" + this.id + "/credits?query="
+  this.key = '&api_key=e0c6c7bded5055b146501304684b8f94'
+  this.cast = [title]
+}
+
+Tv.prototype.credits = function() {
+  var cast = this.cast
+    return $.get(this.url + this.mode + this.key).then(function(response){
+      response.cast.forEach(function(element){
+        cast.push(element.character, element.name)
+      });
+    }).done(function(response){
+      this.cast = cast;
+  })
+}
+
+Tv.prototype.search = function() {
+  var tv = this
+   return $.get(this.url + this.mode + this.key).then(function(response){
+    return tv.credits();
   })
 }
 
+// $(document).ready(function(){
+//   var movieOne = new Movie(744, "hello")
+//   var m1 = movieOne.search()
+//   m1.then(function(cast){
+//     // console.log(movieOne.cast)
+//     return movieOne.cast
+//   })
+//   var tvOne = new Tv(63639, "the-expanse")
+//   var searchTV = tvOne.search()
+//   searchTV.then(function(cast){
+//     // console.log(tvOne.cast)
+//     return tvOne.cast
+//   })
+// })
 

app/controllers/media_controller.rb

@@ -8,4 +8,16 @@ def index
       redirect_to root_path
     end
   end
+
+  def filtered_words
+    filters = Word.where(user: current_user)
+    render :json => filters
+  end
+
+  def add_filter_words
+    arr = Word.new(user: current_user, words: params[:cast])
+    if arr.save
+      redirect_to filtered_words_path
+    end
+  end
 end

app/models/word.rb

@@ -0,0 +1,4 @@
+class Word < ActiveRecord::Base
+  belongs_to :user
+
+end

app/views/media/index.html.erb

@@ -5,8 +5,10 @@
   <% @medias.each do |media| %>
     <li><%= media.title %></li>
     <%= form_for :preference, :html => {:class => "filter"}, url: user_preferences_path(current_user.id) do |t| %>
+    <%= form_for :preference, url: user_preferences_path(current_user.id), html: { class: "filter-form" } do |t| %>
       <%= t.hidden_field :media_id, value: media.id %>
-      <%= t.submit 'Add to filter' %>
+      <%= t.hidden_field :name, value: media.title %>
+      <%= t.submit 'Add to filter', class: "submit-btn"  %>
       <% end %>
     <%end%>
  <% else %>

config/initializers/assets.rb

@@ -8,4 +8,4 @@
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( search.js controller.js )

config/routes.rb

@@ -13,4 +13,6 @@
     resources :media, only: [:index, :create]
   end
   get '/user_logged_in', to: 'sessions#user_logged_in'
+  get '/filtered_words', to: 'media#filtered_words'
+  post '/filter_words', to: 'media#add_filter_words'
 end

db/migrate/20160111004419_create_words.rb

@@ -0,0 +1,10 @@
+class CreateWords < ActiveRecord::Migration
+  def change
+    create_table :words do |t|
+      t.string :words, null: false
+      t.references :user, null: false
+
+      t.timestamps null: false
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160108162120) do
+ActiveRecord::Schema.define(version: 20160111004419) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -22,6 +22,13 @@
     t.string   "category_type"
   end
 
+  create_table "filter_words", force: :cascade do |t|
+    t.string   "words",      null: false
+    t.integer  "user_id",    null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "media", force: :cascade do |t|
     t.string   "title",       null: false
     t.integer  "category_id", null: false
@@ -46,4 +53,11 @@
     t.datetime "updated_at"
   end
 
+  create_table "words", force: :cascade do |t|
+    t.string   "words",      null: false
+    t.integer  "user_id",    null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
 end

extension/content.js

@@ -1,9 +1,3 @@
-// $('div').hide()
-// $('body').append('<button id="show" type="button">Click to show content</button>')
-// $('#show').on('click', function(event){
-//   event.preventDefault();
-//   $('div').show();
-// })
 var loggedOn = false;
 function loggedIn() {
   $.get("http://localhost:3000/user_logged_in", function(data) {
@@ -14,6 +8,67 @@ function loggedIn() {
     else {
       sessionStorage.clear()
     }
+    if (data.active) {
+      chrome.storage.local.set({unspoiledOn: true})
+    }
+    else {
+      chrome.storage.local.set({unspoiledOn: false})
+    }
   })
 }
 
+function setFilter() {
+  $.get("http://localhost:3000/filtered_words", function(data) {
+    var filtered_words = [];
+    data.forEach(function(element) {
+      filtered_words += element.words;
+    });
+    var words = filtered_words.split(' ').replace("[", "")
+    chrome.storage.local.set({filter: words});
+    console.log("Filter set");
+    console.log(filtered_words)
+  });
+}
+
+var allTags = document.querySelectorAll('a, p, span, h1, h2, h3, h4, h5, h6, caption')
+var array_of_words = ["netflix", "streaming", "jon snow"]
+// var array_of_words = []
+// chrome.storage.local.get("filter", function(obj) {
+//   if (obj.filter) {
+//     array_of_words = obj.filter
+//   }
+// })
+
+function findMatch(string) {
+  var match = false
+  $.each(array_of_words, function(index, element) {
+    if (string.toLowerCase().search(array_of_words[index].toLowerCase()) != -1) {
+      match = true
+    }
+  })
+  return match
+}
+
+function hideWord(tags) {
+  $.each(tags, function(key, element) {
+    if (findMatch($(element).html())) {
+      // console.log($(element).html())
+      // $(element).hide()
+      // $(element).html("SPOILER ALERT!!!")
+      $(element).css("background-color", "red")
+    }
+  })
+}
+
+$(document).ready(function() {
+  setFilter()
+  loggedIn()
+  chrome.storage.local.get(function(obj) {
+    if (obj.unspoiledOn === true) {
+      if (obj.filter) {
+        hideWord(allTags)
+      }
+    }
+  })
+})
+

extension/manifest.json

@@ -8,6 +8,9 @@
     "default_icon": "tempicon.png",
     "default_popup": "popup.html"
   },
+  "permissions": [
+    "storage"
+  ],
   "author": ["Arcangelo Petretta", "Jack Huang", "Ryan Lesson", "Eliza Dunaway" ],
   "content_scripts": [
         {

extension/popup.js

@@ -1 +0,0 @@
-loggedIn();