movie_helper 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfce5bb70b13d455cc3aacf68cdbd09790194c0c706a19e89005bea4c9da1e5c
-  data.tar.gz: 2ca69f3673ba16946e6ac60c6132dde123dc63439034d8b4d885cf4b391bad5f
+  metadata.gz: fa54b6f8a53c1c775d026a5767bc3637a2b7ac7d6f0cd758b4ad6f35773e7a49
+  data.tar.gz: 21efd0f5d55bcee6ab6d6faa14ac506c89e524387fc88fe4f3fe0ff18fe65a23
 SHA512:
-  metadata.gz: b6e695ad564f3f8c17e2cb6ae7b2456069259a5eb79ba9da39b988f6514dd44b83539ca1067de673712eecf797eaa3aec585b95f40d4a82975003a7144f53181
-  data.tar.gz: 7532951c1d9c0677d3150dfe17c8c911610cdf9e67fbb4c86b9479d54a94eaf0b307e92fdc810b69910479028812eaf51248ba5aae8d766da86ab0defc8c2b90
+  metadata.gz: c05b0fb4c23b76ffada37af8df019de5ddfa9d749a3bafec9afb05553694d7bd05a106d7eb4c672acf7189eab0c5c3211f2e5a6be3aea3d9bd4136de7af5d922
+  data.tar.gz: 4614cc2684a2ada4cb768cbbfba77e2f5dfd27f5163432d9634783763693813eb48c87299c4225d9766dc19e8824997214d8f7001473f38b49fbbcaa57a1a0d5

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.3
-before_install: gem install bundler -v 1.16.4
+  - 2.6.4
+before_install: gem install bundler -v 2.1.4

data/Gemfile.lock

@@ -1,45 +1,45 @@
 PATH
   remote: .
   specs:
-    movie_helper (0.1.0)
+    movie_helper (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    method_source (0.9.2)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1.4)
   movie_helper!
-  nokogiri
-  pry
-  rake (~> 10.0)
+  nokogiri (~> 1.10, >= 1.10.4)
+  pry (~> 0.13.1)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/Rakefile

@@ -1,6 +1,11 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "movie_helper"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :console do
+    Pry.start
+end

data/lib/movie_helper/cli.rb

@@ -17,9 +17,10 @@ class MovieHelper::CLI
     puts ""
     puts "Please select an option below:"
     puts "1. Random"
-    puts "2. Best Films"
-    puts "3. Latest Suggestions"
-    puts "4. Exit"
+    puts "2. Latest on Netflix"
+    puts "3. Latest on Amazon"
+    puts "4. Latest Elsewhere"
+    puts "5. Exit"
     selector
   end
 
@@ -29,10 +30,12 @@ class MovieHelper::CLI
     when "1"
       random
     when "2"
-      best_films
+      latest_netflix
     when "3"
-      latest_suggestions
-    when "4" || "exit" || "quit"
+      latest_amazon
+    when "4"
+      latest_elsewhere
+    when "5" || "exit" || "quit"
     else
       puts "Invalid request."
       puts ""
@@ -52,22 +55,50 @@ class MovieHelper::CLI
     more_info(movie)
   end
 
-  def best_films
+  def latest_netflix
+    if MovieHelper::Movie.latest_netflix.empty?
+      puts "Loading..."
+      latest_netflix_films = MovieHelper::Scraper.latest_netflix
+      MovieHelper::Movie.create_from_list(latest_netflix_films)
+      puts ""
+    end
+    puts "Here are our latest Netflix films:"
+    movies = MovieHelper::Movie.latest_netflix
+    movies.each.with_index do |movie, i|
+      puts "#{i+1}. #{movie.title}"
+    end
+    information(movies)
+  end
 
-    if MovieHelper::Movie.best_films.empty?
+  def latest_amazon
+    if MovieHelper::Movie.latest_amazon.empty?
       puts "Loading..."
-      best_films = MovieHelper::Scraper.best_films
-      MovieHelper::Movie.create_from_list(best_films)
+      latest_amazon_films = MovieHelper::Scraper.latest_amazon
+      MovieHelper::Movie.create_from_list(latest_amazon_films)
       puts ""
     end
-    puts "Here is a list of our best films:"
-    movies = MovieHelper::Movie.best_films
+    puts "Here are our latest Amazon films:"
+    movies = MovieHelper::Movie.latest_amazon
     movies.each.with_index do |movie, i|
       puts "#{i+1}. #{movie.title}"
     end
     information(movies)
   end
 
+  def latest_elsewhere
+    if MovieHelper::Movie.latest_elsewhere.empty?
+      puts "Loading..."
+      latest_elsewhere_films = MovieHelper::Scraper.latest_elsewhere
+      MovieHelper::Movie.create_from_list(latest_elsewhere_films)
+      puts ""
+    end
+    puts "Here are our latest films:"
+    movies = MovieHelper::Movie.latest_elsewhere
+    movies.each.with_index do |movie, i|
+      puts "#{i+1}. #{movie.title}"
+    end
+    information(movies)
+  end
 
   def information(movies)
     puts ""
@@ -85,20 +116,7 @@ class MovieHelper::CLI
     end
   end
 
-  def latest_suggestions
-    if MovieHelper::Movie.latest.empty?
-      puts "Loading..."
-      latest_films = MovieHelper::Scraper.latest
-      MovieHelper::Movie.create_from_list(latest_films)
-      puts ""
-    end
-    puts "Here are some of our latest suggestions:"
-    movies = MovieHelper::Movie.latest
-    movies.each.with_index do |movie, i|
-      puts "#{i+1}. #{movie.title}"
-    end
-    information(movies)
-  end
+  
 
   def more_info(movie)
     puts "Would you like more information about this movie?"
@@ -115,12 +133,11 @@ class MovieHelper::CLI
 
   def display(movie)
     puts "Title: #{movie.title} (#{movie.year})"
-    puts "Watch with #{movie.watch_with}"
-    puts "Watch when #{movie.watch_when}"
+    puts "Summary: #{movie.summary}"
     puts "Genre: #{movie.genre}"
-    puts "Selected review: #{movie.review}"
-    puts "Movie stars: #{movie.stars}"
-    puts "Movie rating: #{movie.rating}"
+    puts "Mood: #{movie.mood}"
+    puts "Movie actors: #{movie.actors}"
+    puts "Movie director: #{movie.director}"
     puts "Language: #{movie.language}"
   end
 

data/lib/movie_helper/movie.rb

@@ -1,5 +1,5 @@
 class MovieHelper::Movie
-  attr_accessor :title, :year, :watch_with, :watch_when, :genre, :review, :stars, :rating, :language, :url, :is_latest, :is_best
+  attr_accessor :title, :year, :summary, :genre, :mood, :actors, :director, :language, :language, :url, :is_netflix, :is_amazon, :is_elsewhere
 
   @@all = []
 
@@ -18,12 +18,16 @@ class MovieHelper::Movie
     @@all
   end
 
-  def self.best_films
-    @@all.select {|movie| movie.is_best == true}
+  def self.latest_netflix
+    @@all.select {|movie| movie.is_netflix == true}
   end
 
-  def self.latest
-    @@all.select {|movie| movie.is_latest == true}
+  def self.latest_amazon
+    @@all.select {|movie| movie.is_amazon == true}
+  end
+
+  def self.latest_elsewhere
+    @@all.select {|movie| movie.is_elsewhere == true}
   end
 
 

data/lib/movie_helper/scraper.rb

@@ -4,25 +4,25 @@ class MovieHelper::Scraper
     doc = Nokogiri::HTML(open(link))
 
     hash = {}
-
-    hash[:title] = doc.css("h1").children.first.text.strip
-    if doc.css("h1 span.movieyear").first != nil
-      hash[:year] = doc.css("h1 span.movieyear").first.text
-    end
-    hash[:watch_with] = doc.css("span[title='More movies to watch with']").children.text.strip
-    hash[:watch_when] = doc.css("span[title='More movies to watch when']").children.text.strip
+    
+    hash[:title] = doc.css("span.content-title").children.text.strip
+    hash[:year] = doc.css("span.single-year").children.text.strip
+    hash[:summary] = doc.css("div.wc-comment-text").children.text.strip
     hash[:genre] = doc.css("span[itemprop='genre']").children.text.strip
-    hash[:review] = doc.css(".review-block span p").text
-    hash[:stars] = doc.css("#agmtw-opened li.meta-item div.infom span").first.children.text
-    #e.g. for individual actor/actress: doc.css("#agmtw-opened li.meta-item div.infom span").first.children.first.attributes.first.last.value
-    hash[:rating] = doc.css("span[itemprop='contentRating']").children.text.strip
-    hash[:language] = doc.css("span[title='More from the language']").children.text.strip
+    if doc.css("div.infom span").count > 1
+      hash[:mood] = doc.css("div.infom span")[1].text.strip
+      hash[:actors] = doc.css("div.infom span")[2].text.strip
+      hash[:director] = doc.css("div.infom span")[3].text.strip
+      hash[:language] = doc.css("div.infom span")[4].text.strip
+    end
     hash[:url] = link
 
-    if category == "best"
-      hash[:is_best] =  true
-    elsif category == "latest"
-      hash[:is_latest] = true
+    if category == "netflix"
+      hash[:is_netflix] =  true
+    elsif category == "amazon"
+      hash[:is_amazon] = true
+    elsif category == "elsewhere"
+      hash[:is_elsewhere] = true
     end
 
     hash
@@ -32,23 +32,22 @@ class MovieHelper::Scraper
     scrape_movie("https://agoodmovietowatch.com/random/", nil)
   end
 
-  def self.best_films
-    doc = Nokogiri::HTML(open("https://agoodmovietowatch.com/best/"))
-    links = doc.css("h3").map {|movie| movie.elements.first.first.last}
-    best = links.map {|movie_link| scrape_movie(movie_link, "best")}
+  def self.latest_netflix
+    doc = Nokogiri::HTML(open("https://agoodmovietowatch.com/all/?on=USA-netflix&by=new"))
+    links = doc.css("span.content-title").map {|movie| movie.css("a").first.first.last}
+    best = links.map {|movie_link| scrape_movie(movie_link, "netflix")}
   end
 
-  def self.latest
-    doc = Nokogiri::HTML(open("https://agoodmovietowatch.com/all/new/"))
-    links = doc.css(".entry-title").map do |movie|
-      if movie.elements.first == nil
-        nil
-      else
-        movie.elements.first.first.last
-      end
-    end
-    links.delete(nil)
-    latest = links.map {|movie_link| scrape_movie(movie_link, "latest")}
+  def self.latest_amazon
+    doc = Nokogiri::HTML(open("https://agoodmovietowatch.com/all/?on=USA-amazon-prime&by=new"))
+    links = doc.css("span.content-title").map {|movie| movie.css("a").first.first.last}
+    best = links.map {|movie_link| scrape_movie(movie_link, "amazon")}
+  end
+
+  def self.latest_elsewhere
+    doc = Nokogiri::HTML(open("https://agoodmovietowatch.com/all/?by=new"))
+    links = doc.css("span.content-title").map {|movie| movie.css("a").first.first.last}
+    best = links.map {|movie_link| scrape_movie(movie_link, "elsewhere")}
   end
 
 

data/lib/movie_helper/version.rb

@@ -1,4 +1,4 @@
 module MovieHelper
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end
  

data/movie_helper.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "nokogiri"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency 'nokogiri', '~> 1.10', '>= 1.10.4'
+  spec.add_development_dependency "pry", '~> 0.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: movie_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - dlyons8
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,36 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
 description: This application scrapes data off of the website, https://agoodmovietowatch.com/,
   and uses it to feed a CLI app that helps you to find a movie to watch.
 email:
@@ -127,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Scrapes data off of website to help you find a movie to watch.