coming_soon 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4609b528968b24fdb6e01b8332ffdfb995e7bc0
-  data.tar.gz: 19bda5075a202ea7b60257bc35dbfaea4b8ca8cc
+  metadata.gz: 242f7827f948dbbd75f534ceaa60c661d1741731
+  data.tar.gz: 1387044856785ff15f6fa45a9f201bf3e8137f04
 SHA512:
-  metadata.gz: 495b933ecd34601133b71938ea5ea4c6bce399c9e14e9b942535a4cf68324cb7d981963e4bbf8d4515aaa0f4e1c977be069cafea70fddd21369766bca1d21a0d
-  data.tar.gz: 1236e4ad31516bc8ebc18c6a0d44df87531a3ce02840fc07142bf21b078e6c914ea6f24185952a0acd6e92da889f0de4a3f3f147a138ad463bb7d4ab49951e58
+  metadata.gz: 70ffb04bb8bfde73301e0f570f4254068bc67ac589e97088b549da333fb6196098339da2356869118b1127f5a9982e8fbf317b0b8181200518be70d4f720a38b
+  data.tar.gz: bdefe6ba38cf756f2e81260c9a4d5761f1c1f24a60b0b776cec30e614aecb8a8dae352239ec07bffa23535daa4be6f602c454d261530ee87f36f1ceb3c448d27

data/lib/coming_soon/cli.rb

@@ -1,6 +1,7 @@
 class ComingSoon::CLI
 
 	def call
+
 		puts ''
 		puts '               **************************'
 		puts '               *   Movies Coming Soon   *'
@@ -9,9 +10,10 @@ class ComingSoon::CLI
 		puts '               **************************'
 		puts ''
 
-		ComingSoon::Scraper.scrape_movies
+		ComingSoon::Scraper.new.scrape_movies
 		get_and_list_movies		
 		menu_selection
+
 	end
 
 	def get_and_list_movies
@@ -19,9 +21,11 @@ class ComingSoon::CLI
 		ComingSoon::Movie.movies.each.with_index(1) do |movie, i| # set the first index to 1 and use the index number for the movie number
 			puts "#{i}. #{movie.name} - #{movie.start_date}"
 		end
+
 	end
 
 	def list_saved_movies
+
 		puts ''
 		puts '               **************************'
 		puts '               *   Movies Coming Soon   *'
@@ -31,9 +35,11 @@ class ComingSoon::CLI
 		ComingSoon::Movie.movies.each.with_index(1) do |movie, i| # set the first index to 1 and use the index number for the movie number
 			puts "#{i}. #{movie.name} - #{movie.start_date}"
 		end
+
 	end
 
 	def menu_selection
+
 		input = ''
 
 		while input != 'exit'
@@ -53,10 +59,12 @@ class ComingSoon::CLI
 				puts 'Invalid selection!'
 				menu_selection
 			end	
-		end	
+		end
+
 	end
 
 	def goodbye
+
 		puts ''
 		puts '               ***************************'
 		puts '               *  Thank you and goodbye  *'
@@ -66,6 +74,7 @@ class ComingSoon::CLI
 		puts ''
 
 		exit
+		
 	end
 
 end	

data/lib/coming_soon/movie.rb

@@ -1,15 +1,20 @@
 
 class ComingSoon::Movie
+	
 	attr_accessor :name, :start_date, :url, :synopsis
 
 	@@movies = []
 
 	def initialize
+
 		@@movies << self
+
 	end	
 
 	def self.movies
+
 		@@movies
+
 	end	
 
 end

data/lib/coming_soon/scraper.rb

@@ -1,6 +1,6 @@
 class ComingSoon::Scraper
 
-	def self.scrape_movies
+	def scrape_movies
 
 		doc = Nokogiri::HTML(open("http://www.fandango.com/moviescomingsoon"))
 		# name: doc.css("li.visual-item a.visual-title").text.strip
@@ -17,38 +17,48 @@ class ComingSoon::Scraper
 			soon.start_date = movie.css("span").text
 			soon.url = movie.css("a").attribute("href").value
 
-			self.scrape_synopsis(soon)
+			scrape_details(soon)
 
 			count+=1
-			if count > 19 # Displays only 20 movies
+			if count > 19 # Scrapes only 20 movies
 				break
 			end
 		end
 		
 	end
 
-	def self.scrape_synopsis(soon)
-
+	def scrape_details(soon)
+		
 		redirect_failed = false
 
 		begin
-			@doc_synop1 = Nokogiri::HTML(open(soon.url)) # Uses the HTTP 'movieoverview' url
+			doc_synop1 = Nokogiri::HTML(open(soon.url)) # Uses the HTTP 'movieoverview' url
 		rescue
-			redirect_failed = true # An HTTP to HTTPS redirect failed
+			redirect_failed = true # A HTTP to HTTPS redirect failed
 		end
-		
-		if !@doc_synop1.css("a.movie-synopsis-link").any? && !redirect_failed &&
-			@doc_synop1.css("span#SynopsisTextLabel").any?
-			# If not a redirect failure and a READ FULL SYNOPSIS link is not
-			# present and any text is available, use the text for the synopsis
-			soon.synopsis = @doc_synop1.css("span#SynopsisTextLabel").text
+
+		if !redirect_failed
+			if !doc_synop1.css("a.movie-synopsis-link").any? &&
+				doc_synop1.css("span#SynopsisTextLabel").any?
+				# If a READ FULL SYNOPSIS link is not present and any
+				# text is available, use that text for the synopsis
+				soon.synopsis = doc_synop1.css("span#SynopsisTextLabel").text
+			else
+				scrape_plotsummary(soon)
+			end
 		else
-			# Scrape the synopsis using the HTTP 'plotsummary' url
-			# This is also executed after an HTTP to HTTPS redirect failed
-			synop_url = soon.url.sub(/movieoverview/, 'plotsummary')
-			doc_synop2 = Nokogiri::HTML(open(synop_url))
-			soon.synopsis = doc_synop2.css("p.subpage-descriptive-content").text
+			scrape_plotsummary(soon)
 		end
 
 	end
-end	
+
+	def scrape_plotsummary(soon)
+		# Scrape the synopsis using the HTTP 'plotsummary' url
+		# This is also executed after an HTTP to HTTPS redirect failed
+		synop_url = soon.url.sub(/movieoverview/, 'plotsummary')
+		doc_synop2 = Nokogiri::HTML(open(synop_url))
+		soon.synopsis = doc_synop2.css("p.subpage-descriptive-content").text
+		
+	end
+
+end

data/lib/coming_soon/version.rb

@@ -1,4 +1,4 @@
 
 module ComingSoon
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coming_soon
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Terry Blue