steam-upcoming 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60f01b9aab0c1d3bacfa0a33fab1b8de15e39770
-  data.tar.gz: b7d96181a097415fa89b3237e37a61cae653815c
+  metadata.gz: ebff50ee91419aa83a61668f696ad91dc901808a
+  data.tar.gz: 373c94cadf069e76f068cf2eadc277920a2f53f3
 SHA512:
-  metadata.gz: cea802dc82d096666bc4e5aacd30e7bf2db61c4023994bf1654f19c75297063dfe8d735df8dc1ec1883715dbd25fee56f1d397cf81440a5b42a49ef3f7460748
-  data.tar.gz: 657b0553e3bb5170b02d7af469bd2a673df95bafd06722b68d959e3da260f412389931ef6cd90e9049e04293c729a1b2a5effbb84fdc3f3b4fe075fd5985137d
+  metadata.gz: 663ad82a66246991b656f6d25c287564bae04414a0848c0e4798e7a5e3f5efa98c1d6f4727f22ff889b1322d53c36fd8e5ad99be506a7a4b760bbf6f6c33383e
+  data.tar.gz: c43cd262f128b4d2bab0c649165acd69e83b02a658a8aee46947e82749e0b64a596c662ab4ce4e27015e22495eb87d6f1e435da98e1b997a1ec7283586bf6e36

data/lib/steam-upcoming/cli.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 class SteamUpcoming::CLI
   attr_accessor :url
 
@@ -8,25 +10,29 @@ class SteamUpcoming::CLI
   end
 
   def run #run the program
-    puts "\nFetching latest games from the Steam Network...".colorize(:yellow)
+    puts "\nFetching latest games from the Steam Network...".colorize(:cyan)
     make_games(BASE_URL)
     pages
     start
   end
 
   def make_games(url) #creates the list of game objects from the chosen URL
-    game_array = SteamUpcoming::Scraper.scrape_index_page(url)
-    SteamUpcoming::Game.create_from_collection(game_array)
+    SteamUpcoming::Scraper.scrape_index_page(url)
   end
 
   def pages #generate list of page URLs as an array
-    pages = SteamUpcoming::Game.create_pages(SteamUpcoming::Scraper.page_count(BASE_URL)) 
+    SteamUpcoming::Scraper.create_pages_with_urls(BASE_URL)
+  end
+
+  def number_of_results
+    results = SteamUpcoming::Scraper.get_number_of_results(BASE_URL)
   end
 
   def change_page #allow the users to select another page
     print "Enter a page number > "
-    input = gets.chomp.strip
-    if @url = pages[input.to_i-1] #use the users input to select the corresponding page URL from the #pages array
+    input = gets.chomp
+    @url = pages[input.to_i-1] #use the users input to select the corresponding page URL from the #pages array
+    if  @url 
       SteamUpcoming::Game.reset #clear out the class variable so it can be populated with a new list of games
       make_games(@url) #create the games with the new chosen URL
       list
@@ -36,18 +42,17 @@ class SteamUpcoming::CLI
   end
 
   def list_game(game) #list a game's details
-    attributes = SteamUpcoming::Scraper.scrape_game_page(game.url)
-    game.add_game_attributes(attributes)
+    SteamUpcoming::Scraper.scrape_game_page(game.url)
     puts "\n//-------------- #{game.name} --------------//\n".colorize(:yellow)
-    puts "About #{game.name}".colorize(:light_blue)
+    puts "About #{game.name}".colorize(:yellow)
     puts game.about
-    puts "\nTags:".colorize(:light_blue)
+    puts "\nTags:".colorize(:yellow)
     game.tags.each {|tag| puts " - #{tag}"}
-    puts "\nDetails:".colorize(:light_blue)
+    puts "\nDetails:".colorize(:yellow)
     game.details.each {|detail| puts " - #{detail}"}
-    puts "\nRelease Date:".colorize(:light_blue)
+    puts "\nRelease Date:".colorize(:yellow)
     puts " - #{game.release_date}" 
-    puts "\nPlatforms:".colorize(:light_blue)
+    puts "\nPlatforms:".colorize(:yellow)
     game.platforms.each {|platform| puts " - #{platform}"}
     puts ""
   end
@@ -57,13 +62,14 @@ class SteamUpcoming::CLI
     SteamUpcoming::Game.all.each.with_index do |game, index|
       puts "#{index+1}. #{game.name}"
     end
-    puts "\nPage #{current_page} of #{pages.count}".colorize(:yellow)
+    puts "\nPage #{current_page} of #{pages.count}".colorize(:white)
+    puts "\n#{number_of_results} results".colorize(:white)
   end
 
   def current_page
     url = @url[-2,2] #return the last two characters of the URL string
     array = url.split("").map {|x| x.to_i} #split the two characters into an array
-    array[0] == 0 ? current_page = array[0] + array[1] : current_page = "#{array[0]}".concat("#{array[1]}")
+    array[0] == 0 ? current_page = array[0] + array[1] : current_page = "#{array[0]}".concat("#{array[1]}").to_i
       #if the first element is a letter (it converts to 0), add it to the second element
       #if the both elements are numbers, concatenate them and return the new string
   end
@@ -73,9 +79,9 @@ class SteamUpcoming::CLI
     input = nil
     while input != "exit" #loop user input until user types 'exit'
       puts "\nLearn more about a game by typing a name or number.\n".colorize(:yellow)
-      puts "Enter \'list\'' to list games.".colorize(:light_blue)
-      puts "Enter \'exit\' to exit.".colorize(:light_blue)
-      puts "Enter \'page\' to switch pages.".colorize(:light_blue)
+      puts "Enter \'list\'' to list games.".colorize(:yellow)
+      puts "Enter \'exit\' to exit.".colorize(:yellow)
+      puts "Enter \'page\' to switch pages.".colorize(:yellow)
       print "\n > "
       input = gets.chomp.strip
       if input == "list"

data/lib/steam-upcoming/game.rb

@@ -1,36 +1,15 @@
-# The SteamUpcoming::Game class is responsible for taking informatino scraped from the Steam website
-# and creating new Game objects with attributes. 
+# The SteamUpcoming::Game class is responsible for creating new Game objects with the information 
+# collected from the SteamUpcoming::Scraper class.
 
 class SteamUpcoming::Game
   attr_accessor :name, :release_date, :platforms, :url, :about, :tags, :details 
 
   @@all = []
 
-  def initialize(game_hash)
-    game_hash.each {|key, value| self.send(("#{key}="), value)}
+  def initialize
     @@all << self
   end
 
-  def self.create_from_collection(games_hash_array) #create game objects from an array of hashes
-    games_hash_array.each do |game|
-      object = SteamUpcoming::Game.new(game)
-    end
-  end
-
-  def add_game_attributes(game_attributes_hash) #add attributes to the Game object
-    game_attributes_hash.each {|key, value| self.send(("#{key}="), value)} 
-  end
-
-  def self.create_pages(page_count) #Create the page urls
-    i = 1
-    pages = []
-    while i <= page_count.to_i
-      pages << "http://store.steampowered.com/search/?filter=comingsoon&sort_order=0&filter=comingsoon&page=#{i}"
-      i += 1
-    end
-    pages
-  end
-
   private
   def self.all #show all games
     @@all

data/lib/steam-upcoming/scraper.rb

@@ -1,33 +1,26 @@
-#The SteamUpcoming::Scraper class is responsible for scraping information off of the target webpage
-#and outputting hashes of information to be used by the SteamUpcoming::Game class. 
+# The SteamUpcoming::Scraper class is responsible for scraping information off of the target webpage
+# and creating the SteamUpcoming::Game objects in the process. 
+#
+# When the program is first run, ::Scraper will only collect information from the index page. When a game
+# is selected by the user, Scraper will then scrape the remaining attributes from the game page, add them 
+# to the selected ::Game object, and then output the information to the terminal.  
 
 class SteamUpcoming::Scraper
-  attr_accessor :name, :release_date, :platforms, :url
-
-  def self.scrape_index_page(index_url) #scrape the page and create an array of hashes (1 hash for each game)
+  def self.scrape_index_page(index_url) #scrape the page and create game objects with scraped properties
     doc = Nokogiri::HTML(open(index_url))
-    game_array = []
     doc.css(".search_result_row").each do |game|
-      game_hash = {
-        :name=> game.css(".title").text, 
-        :release_date=> game.css(".search_released").text,  
-        :platforms=> self.convert_platforms(gather_platforms(game.css(".search_name p"))), 
-        :url=> game.first[1]
-      }
-      game_array << game_hash
+      game_object = SteamUpcoming::Game.new
+      game_object.name = game.css(".title").text
+      game_object.release_date = game.css(".search_released").text  
+      game_object.platforms = gather_and_convert_platforms(game.css(".search_name p")) 
+      game_object.url = game.first[1]
     end
-    game_array
   end
 
-  def self.gather_platforms(parent) #gather a list of platforms, then return an array of actual platforms
-    platforms = parent.children.map do |platform|
-      platform.attr('class')
-    end
-    platforms.select {|platform| platform != nil} 
-  end
-
-  def self.convert_platforms(platform_array) #convert the platform array items into actual names, because the source is an image, not text
-    platforms = platform_array.map! do |platform|
+  def self.gather_and_convert_platforms(parent) #gather platforms and convert the items into actual names, because the source is an image, not text
+    platforms = parent.children.map {|platform| platform.attr('class')}
+    platforms.delete_if {|platform| platform == nil}
+    platforms.map! do |platform|
       if platform.include?("win")
         platform = "Windows"
       elsif platform.include?("mac")
@@ -40,27 +33,42 @@ class SteamUpcoming::Scraper
         platform = "HTC Vive"
       elsif platform.include?("oculusrift")
         platform = "Oculus Rift"
-      else
-        platform = nil
+      else 
+        next
       end
     end
-    platforms.select {|platform| platform != nil}
   end
 
   def self.scrape_game_page(game_url) #scrape the page and create a hash of game attributes
     doc = Nokogiri::HTML(open(game_url))
-    about = doc.css(".game_description_snippet")
+    about = doc.css(".game_area_description")
     tags = doc.css(".glance_tags a").map {|tag| tag.text}
     details = doc.css(".game_area_details_specs")
-    game_attributes_hash = {
-      :about => about.text.match(/\r|\n|\t/) ? about.text.delete("\t").delete("\r").delete("\n") : about.text,
-      :tags => tags.map {|tag| tag.match(/\r|\n|\t/) ? tag.delete("\t").delete("\r").delete("\n") : tag },
-      :details => details.map {|child| child.text} 
-    }
+    SteamUpcoming::Game.all.each do |game|
+       if game_url == game.url
+        game.about = about.text.match(/\r|\n|\t/) ? about.text.delete("\t").delete("\r").delete("\n") : about.text
+        game.tags = tags.map {|tag| tag.match(/\r|\n|\t/) ? tag.delete("\t").delete("\r").delete("\n") : tag }
+        game.details = details.map {|child| child.text}
+        return game
+      end
+    end
   end
 
-  def self.page_count(index_url) #scrape the pages to get the total number of pages
+  def self.create_pages_with_urls(index_url) #scrape the pages to get the total number of pages
     doc = Nokogiri::HTML(open(index_url))
     page_count = doc.css(".search_pagination_right").first.children[5].text.to_i
+    i = 1
+    pages = []
+    while i <= page_count.to_i
+      pages << "http://store.steampowered.com/search/?filter=comingsoon&sort_order=0&filter=comingsoon&page=#{i}"
+      i += 1
+    end
+    pages
+  end
+
+  def self.get_number_of_results(index_url)
+    doc = Nokogiri::HTML(open(index_url))
+    results = doc.css(".search_pagination_left").first.children.text
+    results.match(/\d{3,}/).to_s
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steam-upcoming
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Matt Cassara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler