what_to_watch 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ab76582498e810e9b39c700e7e7a0e7a364eb82624cdefac298f6956922fed5
-  data.tar.gz: 797a9fbe7264072c45630225cb5a42b4d29516f1a9234192d219c6df7fc1ccba
+  metadata.gz: 521f776ffe57dcfbe105147665f64ee75fd73a70ca238ad76f89ebf1559eb53c
+  data.tar.gz: f4604c401b13b9e33dcd4fbd64eb380bb3b3ab0b4378b65bf6e8e27efa31f070
 SHA512:
-  metadata.gz: 0fdb3956132b494e1c354488ab8ddb880ff3d27c5a32c162c5f6ca9ffaa98cefa5e6a2ffe0116eb675ce13a451a7e5769034560deddc2319a8d932febe3dfbeb
-  data.tar.gz: 997a43210c9196a1ccfae0dfb311ce0c6ed6fe0500677273e9bd0d532f11a8af3433aef621ef97d30cf86eb2547949f0ae135108c47579579bbbdf885a0d9c56
+  metadata.gz: 26bee8b947627793029065510a83a6b6808ef5477bb665f4723d5b6654a45bbac58f6a0f2c15344876ce0175c3ad81a33a8c6d12d50d3f182879f197378740e8
+  data.tar.gz: f2bfa8da7b51c7edf7726be8fab9f045c039e96180f25fdc9827d7508be45bbdb659dbe1bdc51328875ca98fc06bf973df122d2c057a5ee456f6c816943ee0bb

data/bin/console

@@ -10,9 +10,6 @@ def reload!
   puts "Reloading ..."
   load "./lib/what_to_watch.rb"
   load "./lib/what_to_watch/cli.rb"
-  load "./lib/what_to_watch/best_movies.rb"
-  load "./lib/what_to_watch/recently_added.rb"
-  load "./lib/what_to_watch/best_tv.rb"
   load "./lib/what_to_watch/scraper.rb"
   load "./lib/what_to_watch/show.rb"
 end

data/lib/what_to_watch.rb

@@ -12,7 +12,3 @@ require "what_to_watch/version"
 require "what_to_watch/cli"
 require "what_to_watch/scraper"
 require "what_to_watch/show"
-require "what_to_watch/best_movies"
-require "what_to_watch/best_tv"
-require "what_to_watch/recently_added"
-

data/lib/what_to_watch/cli.rb

@@ -1,5 +1,4 @@
 class WhatToWatch::CLI 
-  attr_accessor :input, :streaming_services
   
   def initialize 
    @input = ""
@@ -25,86 +24,43 @@ class WhatToWatch::CLI
    
   def start
     which_streaming_services
+    WhatToWatch::Scraper.scrape_vulture
     while !exit?
       catch(:main_menu) do
-      main_commands
-      while !exit?
-      case @input
-      when "1"
-        WhatToWatch::BestMovies.add_shows
-        WhatToWatch::BestMovies.list(@streaming_services)
-        options
-        while !exit?
-        if valid_number?(WhatToWatch::BestMovies.all)
-          WhatToWatch::BestMovies.print_item(@input)
-          item_options
+        main_commands
+        case @input
+        when "1", "2", "3", "4"
+          print_list
           while !exit?
-          if @input == "y"
             options
-            break
-          elsif @input == "n"
-            throw(:main_menu)
-          else 
-            invalid_command
-          end
-          end
-        else
-           invalid_command
-        end
-        end
-      when "2"
-        WhatToWatch::BestTV.add_shows
-        WhatToWatch::BestTV.list(@streaming_services)
-        options
-        while !exit?
-        if valid_number?(WhatToWatch::BestTV.all)
-          WhatToWatch::BestTV.print_item(@input)
-          item_options
-          while !exit?
-          if @input == "y"
-            options
-            break
-          elsif @input == "n"
-            throw(:main_menu)
-          else 
-            invalid_command
-          end
-          end
-        else
-           invalid_command
-        end
-        end
-      when "3"
-        WhatToWatch::RecentlyAdded.add_shows
-        WhatToWatch::RecentlyAdded.list(@streaming_services)
-        options
-        while !exit?
-        if valid_number?(WhatToWatch::RecentlyAdded.all)
-          WhatToWatch::RecentlyAdded.print_item(@input)
-          item_options
-          while !exit?
-          if @input == "y"
-            options
-            break
-          elsif @input == "n"
-            throw(:main_menu)
-          else 
-            invalid_command
-          end
+            if valid_number?(WhatToWatch::Show.filtered)
+              print_item
+              while !exit?
+              item_options
+                if @input == "y"
+                  break
+                elsif @input == "n"
+                  throw(:main_menu)
+                else 
+                invalid_command
+                end
+              end
+            else
+              invalid_command
+            end
           end
         else
-           invalid_command
-        end
+          invalid_command
         end
-      else
-        invalid_command
-      end
-      end
       end
     end
     exit
   end
+
+
+private
     
+  
   #CLI Dialogue Methods
   
   def main_commands
@@ -112,9 +68,10 @@ class WhatToWatch::CLI
     puts "---------"
     puts "MAIN MENU:"
     puts "---------"
-    puts "1. Enter 1 to see the Best-Reviewed MOVIES you can stream now."
+    puts "1. Enter 1 to see Recently-Added MOVIES/TELEVISION you can stream now."
     puts "2. Enter 2 to see the Best-Reviewed TELEVISION you can stream now."
-    puts "3. Enter 3 to see Recently-Added MOVIES/TELEVISION you can stream now."
+    puts "3. Enter 3 to see the Best-Reviewed MOVIES you can stream now."
+    puts "4. Enter 4 to see Leaving-Soon MOVIES/TELEVISION you can stream now."
     puts ""
     puts "Exit: Type exit"
     puts "---------------"
@@ -154,7 +111,6 @@ class WhatToWatch::CLI
     puts "I'm sorry, I don't recognize that Command."
     puts "Please Try Again"
     puts ""
-    @input = gets.strip.downcase
   end
   
   def exit 
@@ -162,6 +118,7 @@ class WhatToWatch::CLI
     puts "**********************************************************"
     puts "See You Next Time for More Great Movie/TV Recommendations!"
     puts "**********************************************************"
+    puts ""
   end
   
   def which_streaming_services
@@ -246,6 +203,79 @@ class WhatToWatch::CLI
     end
   end
   
+  #CLI Format Methods
+  
+  def format_services
+    services = @streaming_services.collect do |service, value| 
+      if value == "y" 
+        service.to_s.split('_').join(' ').capitalize
+      end
+    end
+    services.compact!
+    services
+  end
+  
+  #CLI Print Methods
+  
+  def print_list
+    category = ""
+    banner = ""
+    case @input
+    when "1" 
+      category = "added"
+      banner = "Recently-Added/Coming-Soon"
+    when "2" 
+      category = "tv"
+      banner = "Best Reviewed Television"
+    when "3" 
+      category = "movies"
+      banner = "Best Reviewed Movies"
+    when "4" 
+      category = "expiring"
+      banner = "Leaving Soon"
+    end 
+    puts ""
+    puts "============================"
+    puts " #{banner} "
+    puts "============================"
+    puts ""
+    WhatToWatch::Show.filter(category)
+    WhatToWatch::Show.filtered.each.with_index(1) do |recommendation, index|
+      if format_services.include?(recommendation.streaming_service)
+        puts ""
+        puts "Available! #{index}. #{recommendation.title.upcase}. Watch Now on #{recommendation.streaming_service.capitalize}."
+        puts ""
+      else
+        puts ""
+        puts "Sorry..... #{index}. #{recommendation.title.upcase}. Only on #{recommendation.streaming_service.capitalize}."
+        puts ""
+      end
+    end
+  end
+  
+   def print_item
+    item = WhatToWatch::Show.filtered[@input.to_i-1]
+    WhatToWatch::Scraper.scrape_imdb(item) if item.url == nil
+    puts ""
+    puts "===================================="
+    puts "     #{item.title.upcase}"
+    puts "===================================="
+    puts "#{item.genre_year}"
+    puts ""
+    puts "*** Available on #{item.streaming_service.upcase} ***"
+    puts ""
+    item.cast.each{|role, people| puts "#{role} #{people}"}
+    puts ""
+    puts "---Description---"
+    puts ""
+    puts "#{item.description}"
+    puts "[...]"
+    puts ""
+    puts "For more information"
+    puts ""
+    puts "===>  #{item.url}"
+  end
+  
   #CLI Logic Methods
   
   def exit?

data/lib/what_to_watch/scraper.rb

@@ -1,17 +1,19 @@
 class WhatToWatch::Scraper
  
  
- def self.scrape_vulture(model)
+ def self.scrape_vulture
     doc = Nokogiri::HTML(open("http://vulture.com/streaming"))
-    block = doc.css("div[data-editable='main']")[model.section]
-    block.css("div.column-item").each do |row|
-      row.css("section").drop(1).each do |item|
-        model.new(
-          item.css("div[itemprop='caption']").text.split("\n")[1].strip.gsub("  ", " "),
-          row.css("section")[0].css("h3").text.strip.capitalize
-        )
-      end
-    end 
+    doc.css("div[data-editable='main']").each do |section|
+      section.css("div.column-item").each do |row|
+        row.css("section").drop(1).each do |item|
+          WhatToWatch::Show.new(
+            item.css("div[itemprop='caption']").text.split("\n")[1].strip.gsub("  ", " "),
+            row.css("section")[0].css("h3").text.strip.capitalize,
+            section.css("h2.clay-subheader").text.strip.downcase
+          )
+        end
+      end 
+    end
   end
   
   #Scrape Search Page on imdb.com to determine the Item Page URL

data/lib/what_to_watch/show.rb

@@ -1,69 +1,28 @@
 class WhatToWatch::Show
-attr_accessor :title, :streaming_service, :url, :description, :genre_year, :cast
+attr_accessor :title, :streaming_service, :category, :url, :description, :genre_year, :cast
   
   # WhatToWatch::BestMovies.add_shows
   # WhatToWatch::BestMovies.list()
   # {netflix: "y", amazon_prime: "y", hbo_now: "y", hulu: "y", showtime: "y"}
   
-  def initialize(title="", streaming_service="")
+  @@all = []
+  @@filtered = []
+  
+  
+  def initialize(title="", streaming_service="", category= "")
     @title = title 
     @streaming_service = streaming_service
-    self.class.all << self
+    @category = category
+    @@all << self
   end
   
-  def self.add_shows
-    WhatToWatch::Scraper.scrape_vulture(self) if self.all == []
+  def self.filter(selection)
+    @@filtered = @@all.select{|object| object.category.include?("#{selection}")}
   end
   
-  #Determine Display Based On User Input Recorded in CLI.streaming_services
-  
-  def self.services(hash)
-    services = hash.collect do |service, value| 
-      if value == "y" 
-        service.to_s.split('_').join(' ').capitalize
-      end
-    end
-    services.compact!
-    services
+  def self.filtered
+    @@filtered
   end
-    
   
-  def self.print_list(hash)
-    self.all.each.with_index(1) do |object, index|
-      if self.services(hash).include?(object.streaming_service)
-        puts ""
-        puts "Available! #{index}. #{object.title.upcase}. Watch Now on #{object.streaming_service}."
-        puts ""
-      else
-        puts ""
-        puts "Sorry..... #{index}. #{object.title.upcase}. Only on #{object.streaming_service}."
-        puts ""
-      end
-    end
-  end
-  
-  
-  def self.print_item(input)
-    object = self.all[input.to_i-1]
-    WhatToWatch::Scraper.scrape_imdb(object) if object.url == nil
-    puts ""
-    puts "===================================="
-    puts "     #{object.title.upcase}"
-    puts "===================================="
-    puts "#{object.genre_year}"
-    puts ""
-    puts "*** Available on #{object.streaming_service.upcase} ***"
-    puts ""
-    object.cast.each{|role, people| puts "#{role} #{people}"}
-    puts ""
-    puts "---Description---"
-    puts ""
-    puts "#{object.description}"
-    puts "[...]"
-    puts ""
-    puts "For more information"
-    puts ""
-    puts "===>  #{object.url}"
-  end
   
 end

data/lib/what_to_watch/version.rb

@@ -1,3 +1,3 @@
 module WhatToWatch
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: what_to_watch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - "'George  Pianka'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,10 +89,7 @@ files:
 - bin/what_to_watch
 - lib/.DS_Store
 - lib/what_to_watch.rb
-- lib/what_to_watch/best_movies.rb
-- lib/what_to_watch/best_tv.rb
 - lib/what_to_watch/cli.rb
-- lib/what_to_watch/recently_added.rb
 - lib/what_to_watch/scraper.rb
 - lib/what_to_watch/show.rb
 - lib/what_to_watch/version.rb

data/lib/what_to_watch/best_movies.rb

@@ -1,23 +0,0 @@
-class WhatToWatch::BestMovies < WhatToWatch::Show
-  
-  @@all = []
-  
-  def self.all 
-    @@all 
-  end
-  
-  def self.section
-    3
-  end
-  
-  def self.list(hash)
-    puts ""
-    puts "======================"
-    puts " Best Reviewed Movies "
-    puts "======================"
-    puts ""
-    self.print_list(hash)
-  end
-end
-    
-        

data/lib/what_to_watch/best_tv.rb

@@ -1,22 +0,0 @@
-class WhatToWatch::BestTV < WhatToWatch::Show
-  
-  @@all = []
-  
-  def self.all 
-    @@all 
-  end
-  
-  def self.section
-    2
-  end
-  
-  def self.list(hash)
-    puts ""
-    puts "=========================="
-    puts " Best Reviewed Television "
-    puts "=========================="
-    puts ""
-    self.print_list(hash)
-  end
-
-end

data/lib/what_to_watch/recently_added.rb

@@ -1,22 +0,0 @@
-class WhatToWatch::RecentlyAdded < WhatToWatch::Show
-  
-  @@all = []
-  
-  def self.all 
-    @@all 
-  end
-  
-  def self.section
-    0
-  end
-  
-  def self.list(hash)
-    puts ""
-    puts "=========================="
-    puts " Recently Added Movies/TV "
-    puts "=========================="
-    puts ""
-    self.print_list(hash)
-  end
-  
-end