serving up movies in browse section with jquery. fixed nav

alexgraffeocohen · May 5, 2014 · 6debf6c · 6debf6c
1 parent 6d5bf25
commit 6debf6c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git a/app/assets/javascripts/movies.js b/app/assets/javascripts/movies.js
@@ -0,0 +1,7 @@
+$(document).ready(function(){
+  $('#browse-button').click(function(){
+    if($('.row').length > 1) {
+      $('.row').last().remove();
+    }
+  });
+});
diff --git a/app/assets/stylesheets/movie.css.scss b/app/assets/stylesheets/movie.css.scss
@@ -8,7 +8,6 @@
 }
 
 #movie-options {
-  width: 1000px;
   .poster-thumbnail {
     position: absolute;
     height: 292px;

diff --git a/app/helpers/movies_helper.rb b/app/helpers/movies_helper.rb
@@ -38,7 +38,7 @@ def find_choices_for(range, genre)
     max = range.max
     min = range.min
 
-    Movie.joins(:genre_movies).where("genre_id = #{Genre.first.id} AND filmetric >= #{min} AND filmetric <= #{max}")
+    Movie.joins(:genre_movies).where("genre_id = #{genre.id} AND filmetric >= #{min} AND filmetric <= #{max}")
   end
 
   def quality_of(movie)

diff --git a/app/views/layouts/_nav.html.erb b/app/views/layouts/_nav.html.erb
@@ -2,7 +2,9 @@
     <%= link_to_unless_current "Home", root_path do %>
       <p>Home</p>
     <% end %>
-    <%= link_to "Browse", browse_path %> 
+    <%= link_to_unless_current "Browse", browse_path do %>
+      <p>Browse</p>
+    <% end %>
     <%= link_to_unless_current "What the Hell Is This?", about_path do %>
       <p>What the Hell Is This?</p>
     <% end %>

diff --git a/app/views/movies/discover.html.erb → app/views/movies/_options.html.erb b/app/views/movies/discover.html.erb → app/views/movies/_options.html.erb
@@ -1,8 +1,8 @@
 <div class="row">
   <div id="movie-options">
     <% i = 0 %>
-    <% unless @choices.nil? || @choices.empty? %>
-      <% @choices.each do |movie| %>
+    <% unless choices.nil? || choices.empty? %>
+      <% choices.each do |movie| %>
         <a href="<%= movie_path(movie) %>"><img class="poster-thumbnail" src="<%= movie.poster_link %>"
         style="left: <%= 17 + i %>px;"></a>
         <% i += 250 %>

diff --git a/app/views/movies/browse.html.erb b/app/views/movies/browse.html.erb
@@ -2,7 +2,7 @@
   <%= render 'layouts/nav' %>
   <div id="search-container">
     <div class="form-group" id="search-box"> 
-        <%= form_tag discover_path, { :method => :get, :class => "form-inline" }  do %> 
+        <%= form_tag discover_path, { :method => :get, :class => "form-inline", :remote => true }  do %> 
           <p class="browse-form"> I want a </p>
 
           <%= label_tag :genre, "Genre", :class => "sr-only" %>
@@ -13,7 +13,7 @@
           <%= label_tag :filmetric_eval, "Flimetric", :class => "sr-only" %>
           <%= select_tag :filmetric_eval, options_from_collection_for_select(@filmetric_evals, "first", "second"), :class => "form-control input-lg", :id => "categories" %><br><br>
 
-          <%= submit_tag "Search", :class => "btn btn-lg btn-primary", :id => "search-button" %>
+          <%= submit_tag "Search", :class => "btn btn-lg btn-primary", :id => "browse-button" %>
         <% end %>
     </div>
   </div>

diff --git a/app/views/movies/discover.js.erb b/app/views/movies/discover.js.erb
@@ -0,0 +1 @@
+$("body").append("<%= j render(:partial => 'options', locals: {choices: @choices}) %>")
diff --git a/spec/models/imdb_scraper_spec.rb b/spec/models/imdb_scraper_spec.rb
@@ -17,13 +17,6 @@
     expect(scraper.ids.length).to_not eq(0)
   end
 
-  xit 'can scrape a specific figure\'s movies' do
-    url = IMDBScraper.find_page("Tom Cruise")
-    scraper.scrape
-
-    expect(scraper.ids).to include('0259711')
-  end
-
   it 'can generate valid urls' do
     new_url = scraper.generate_url(5)
     scraper.nokogiri_query(new_url)