coming_soon 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 604305adcaced9bcc6b8e032891a5f559278c8a4
-  data.tar.gz: 80d9cd8e88840c30f272703f5bda912034cc8fa9
+  metadata.gz: d4609b528968b24fdb6e01b8332ffdfb995e7bc0
+  data.tar.gz: 19bda5075a202ea7b60257bc35dbfaea4b8ca8cc
 SHA512:
-  metadata.gz: b49457dfdfd5e3f3368ccd611fdb13b3d0dc532574bc73dad6924bfc185f5183e32637c587eeb5ba1c6cf4855e5bb415a4af38b148d6402ba6fdc4c217b5e461
-  data.tar.gz: 9b6347e5814e553d38859f09751fe181c0ebe696d5570978e86bd4f9a2eb19d0be712c51015e10186c4be62f717eaecebfcae5e8bc4d1b67acd4bb3a53ca99a9
+  metadata.gz: 495b933ecd34601133b71938ea5ea4c6bce399c9e14e9b942535a4cf68324cb7d981963e4bbf8d4515aaa0f4e1c977be069cafea70fddd21369766bca1d21a0d
+  data.tar.gz: 1236e4ad31516bc8ebc18c6a0d44df87531a3ce02840fc07142bf21b078e6c914ea6f24185952a0acd6e92da889f0de4a3f3f147a138ad463bb7d4ab49951e58

data/bin/coming-soon

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+#shebang
 
 require "bundler/setup"
-require "coming_soon"
+require_relative "../lib/coming_soon"
 
 ComingSoon::CLI.new.call

data/config/environment.rb

@@ -1,6 +1,8 @@
 require 'nokogiri'
 require 'open-uri'
+require 'pry'
 
 require_relative '../lib/coming_soon/version'
 require_relative '../lib/coming_soon/movie'
 require_relative '../lib/coming_soon/cli'
+require_relative '../lib/coming_soon/scraper'

data/lib/coming_soon/cli.rb

@@ -1,35 +1,34 @@
 class ComingSoon::CLI
 
 	def call
-		get_and_list_movies
-		
-		menu_selection
-	end
-
-	def get_and_list_movies
 		puts ''
-		puts '               **********************'
-		puts '               * Movies Coming Soon *'
-		puts '               *   --------------   *'
-		puts '               *    Please wait!    *'
-		puts '               **********************'
+		puts '               **************************'
+		puts '               *   Movies Coming Soon   *'
+		puts '               *     --------------     *'
+		puts '               *      Please wait!      *'
+		puts '               **************************'
 		puts ''
 
-		@movies = ComingSoon::Movie.movies
+		ComingSoon::Scraper.scrape_movies
+		get_and_list_movies		
+		menu_selection
+	end
 
-		@movies.each.with_index(1) do |movie, i| # set the first index to 1 and use the index number for the movie number
+	def get_and_list_movies
+		
+		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 *'
-		puts '               **********************'
+		puts '               **************************'
+		puts '               *   Movies Coming Soon   *'
+		puts '               **************************'
 		puts ''
 
-		@movies.each.with_index(1) do |movie, i| # set the first index to 1 and use the index number for the movie number
+		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
@@ -41,11 +40,11 @@ class ComingSoon::CLI
 			puts ''
 			puts 'You may enter a movie number for more details or "list" to see the menu again or "exit"'
 
-			input = gets.strip
+			input = gets.strip.downcase
 
-			if input.to_i > 0 && input.to_i < @movies.size+1
-				puts "* #{@movies[input.to_i - 1].name} - #{@movies[input.to_i - 1].start_date} *"
-				puts @movies[input.to_i - 1].synopsis	
+			if input.to_i > 0 && input.to_i < ComingSoon::Movie.movies.size+1
+				puts "* #{ComingSoon::Movie.movies[input.to_i - 1].name} - #{ComingSoon::Movie.movies[input.to_i - 1].start_date} *"
+				puts ComingSoon::Movie.movies[input.to_i - 1].synopsis	
 			elsif input == 'list'
 				list_saved_movies
 			elsif input == 'exit'
@@ -59,11 +58,11 @@ class ComingSoon::CLI
 
 	def goodbye
 		puts ''
-		puts '               *************************'
-		puts '               * Thank you and goodbye *'
-		puts '               *   -----------------   *'
-		puts '               *    Come back soon!    *'
-		puts '               *************************'
+		puts '               ***************************'
+		puts '               *  Thank you and goodbye  *'
+		puts '               *    -----------------    *'
+		puts '               *     Come back soon!     *'
+		puts '               ***************************'
 		puts ''
 
 		exit

data/lib/coming_soon/movie.rb

@@ -2,66 +2,14 @@
 class ComingSoon::Movie
 	attr_accessor :name, :start_date, :url, :synopsis
 
-	def self.movies
-
-		self.scrape_movies
-
-		@movies
-
-	end
-
-	def self.scrape_movies
-
-		doc = Nokogiri::HTML(open("http://www.fandango.com/moviescomingsoon"))
-		# name: doc.css("li.visual-item a.visual-title").text.strip
-		# start_date: doc.css("li.visual-item span").text
-		# url: doc.css("li.visual-item a").attribute("href").value
-
-		movie_list = doc.css("li.visual-item")
-		@movies = []
-		count = 1
+	@@movies = []
 
-		movie_list.each do |movie| 
-			@soon = self.new
-			@soon.name = movie.css("a.visual-title").text.strip
-			@soon.start_date = movie.css("span").text
-			@soon.url = movie.css("a").attribute("href").value
+	def initialize
+		@@movies << self
+	end	
 
-			self.scrape_synopsis
-
-			@movies << @soon
-
-			count+=1
-			if count > 20 # Displays only 20 movies
-				break
-			end
-		end
-		
-	end
-
-	def self.scrape_synopsis
-
-		redirect_failed = false
-
-		begin
-			@doc_synop1 = Nokogiri::HTML(open(@soon.url)) # Uses the HTTP 'movieoverview' url
-		rescue
-			redirect_failed = true # An 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
-		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
-		end
-
-	end
+	def self.movies
+		@@movies
+	end	
 
 end

data/lib/coming_soon/scraper.rb

@@ -0,0 +1,54 @@
+class ComingSoon::Scraper
+
+	def self.scrape_movies
+
+		doc = Nokogiri::HTML(open("http://www.fandango.com/moviescomingsoon"))
+		# name: doc.css("li.visual-item a.visual-title").text.strip
+		# start_date: doc.css("li.visual-item span").text
+		# url: doc.css("li.visual-item a").attribute("href").value
+
+		movie_list = doc.css("li.visual-item")
+		
+		count = 0
+
+		movie_list.each do |movie| 
+			soon = ComingSoon::Movie.new
+			soon.name = movie.css("a.visual-title").text.strip
+			soon.start_date = movie.css("span").text
+			soon.url = movie.css("a").attribute("href").value
+
+			self.scrape_synopsis(soon)
+
+			count+=1
+			if count > 19 # Displays only 20 movies
+				break
+			end
+		end
+		
+	end
+
+	def self.scrape_synopsis(soon)
+
+		redirect_failed = false
+
+		begin
+			@doc_synop1 = Nokogiri::HTML(open(soon.url)) # Uses the HTTP 'movieoverview' url
+		rescue
+			redirect_failed = true # An 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
+		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
+		end
+
+	end
+end	

data/lib/coming_soon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coming_soon
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Terry Blue
@@ -103,6 +103,7 @@ files:
 - lib/coming_soon.rb
 - lib/coming_soon/cli.rb
 - lib/coming_soon/movie.rb
+- lib/coming_soon/scraper.rb
 - lib/coming_soon/version.rb
 - notes.md
 - spec.md