project_euler_cli 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0016fc054fcdc5ebc58a58ae77500b6a59776e38a8c2e55c4a6af7b69848007
-  data.tar.gz: dd93295b9e645b7038f8eed4de1ff68f6fce96151530e791d911e9a6cb1c5e86
+  metadata.gz: 6779626e07ad722584aa34beb3a2f3f2d0db6be50e19c77d8d1cbad050befb23
+  data.tar.gz: 5247763643de597db2903e2973332e921d5dcb954d0af74d0f9fe104934439eb
 SHA512:
-  metadata.gz: 775225f6b9fc001b3f5779ed6d1521b01914512d04494bfd2ed9feceafadb17555df1514f27b71039acf08c314f35782d396c5d70bf4485415fc2c8456caff85
-  data.tar.gz: 839bb873d2d478773011d8627ea3dbb57ee18e4e61bef37e6983cc8a17938de7db660e055ca10bbbe841f9b766a7a0a9a1b1db77908e570121a68e9c4c5f8cf1
+  metadata.gz: 4d3dffe05c81249a33cf6a1eda98cd1df94d35da6280ae46e25068bcd22b0750705d4461486c0cc3df4b7fd37b405ef57185d902c72a3c0c1c6223d4b4e02e40
+  data.tar.gz: e70681145d9f1dfefa4528404b3e8ddedbd66332963f13a5c2f81818af94651da308311b170504815fdca67aac88199781e9b13ee6aa8c652827caa33f4d1abd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    project_euler_cli (1.1.1)
+    project_euler_cli (1.1.2)
       nokogiri (~> 1.8)
 
 GEM

data/lib/project_euler_cli/archive_controller.rb

@@ -1,7 +1,7 @@
 module ProjectEulerCli
 
-# Controller class that manages the archive system. It holds the archive data used
-# by ArchiveViewer and ArchiveSearcher.
+# Controller class that manages the archive system. It holds the archive data 
+# used by ArchiveViewer and ArchiveSearcher.
 class ArchiveController
   include Scraper
 
@@ -50,15 +50,9 @@ class ArchiveController
   #   get_page(id) => page
   #
   # Returns page number based on the ID of the problem. The recent page is
-  # considered page 0, invalid pages return -1.
+  # considered page 0.
   def get_page(id)
-    if id.between?(Problem.total - 9, Problem.total)
-      0
-    elsif id.between?(1, Problem.total - 10)
-      (id - 1) / Page::PROBLEMS_PER_PAGE + 1
-    else
-      -1
-    end
+    id.between?(1, Problem.total - 10) ? (id - 1) / Page::LENGTH + 1 : 0
   end
 
 end

data/lib/project_euler_cli/archive_viewer.rb

@@ -14,18 +14,21 @@ class ArchiveViewer
 
     puts
 
-    (Problem.total).downto(Problem.total - 9) { |i| puts "#{i} - #{@problems[i].title}" }
+    (Problem.total).downto(Problem.total - 9) do |i| 
+      puts "#{i} - #{@problems[i].title}" 
+    end
   end
 
-  # Displays the problem numbers and titles for an individual page of the archive.
+  # Displays the problem numbers and titles for an individual page of the 
+  # archive.
   def display_page(page)
     load_page(page, @problems)
 
     puts
 
-    start = (page - 1) * Page::PROBLEMS_PER_PAGE + 1
-    for i in start...start + Page::PROBLEMS_PER_PAGE
-      puts "#{i} - #{@problems[i].title}" unless i >= Problem.total - 9
+    i = (page - 1) * Page::LENGTH
+    Page::LENGTH.times do
+      puts "#{i += 1} - #{@problems[i].title}" unless i >= Problem.total - 9
     end
   end
 

data/lib/project_euler_cli/cli.rb

@@ -1,7 +1,7 @@
 module ProjectEulerCli #:nodoc:
 
-# Manages the command line interface for the program. It uses the ArchiveController
-# to access the site data.
+# Manages the command line interface for the program. It uses the 
+# ArchiveController to access the site data.
 class CLI
 
   def initialize
@@ -76,7 +76,10 @@ class CLI
 
     input = prompt
 
-    if input.to_i.between?(Page::PROBLEMS_PER_PAGE * (page - 1) + 1, Page::PROBLEMS_PER_PAGE * page)
+    first_problem = Page::LENGTH * (page - 1) + 1
+    last_problem = Page::LENGTH * page
+
+    if input.to_i.between?(first_problem, last_problem)
       problem_menu(input.to_i)
     elsif input == 'n'
       page_menu(page + 1)
@@ -113,6 +116,14 @@ class CLI
     end
   end
 
+  def search_menu
+    print "search: "
+
+    search_terms = gets.strip
+    @ac.search(search_terms)
+    search_results_menu
+  end
+
   def search_results_menu
     @ac.display_results
 
@@ -133,14 +144,6 @@ class CLI
     end
   end
 
-  def search_menu
-    print "search: "
-
-    search_terms = gets.strip
-    @ac.search(search_terms)
-    search_results_menu
-  end
-
 end
 
 end

data/lib/project_euler_cli/concerns/scraper.rb

@@ -2,22 +2,30 @@ module ProjectEulerCli
 
 module Scraper
 
-  # Pulls information from the recent page to determine the total number of problems
-  # and pages.
+  # Pulls information from the recent page to determine the total number of 
+  # problems and pages.
   def lookup_totals
-    html = open("https://projecteuler.net/recent")
-    fragment = Nokogiri::HTML(html)
-
-    id_col = fragment.css('#problems_table td.id_column')
-
-    # The newest problem is the first one listed on the recent page. The ID of this
-    # problem will always equal the total number of problems.
-    Problem.total = id_col.first.text.to_i
-    # There are ten problems on the recent page, so the last archive problem can be
-    # found by subtracting 10 from the total number of problems. This is used to
-    # calculate the total number of pages.
-    last_archive_id = Problem.total - 10
-    Page.total = (last_archive_id - 1) / Page::PROBLEMS_PER_PAGE + 1
+    begin
+      Timeout.timeout(4) do
+        html = open("https://projecteuler.net/recent")
+        fragment = Nokogiri::HTML(html)
+
+        id_col = fragment.css('#problems_table td.id_column')
+
+        # The newest problem is the first one listed on the recent page. The ID 
+        # of this problem will always equal the total number of problems.
+        Problem.total = id_col.first.text.to_i
+        # There are ten problems on the recent page, so the last archive problem 
+        # can be found by subtracting 10 from the total number of problems. This 
+        # is used to calculate the total number of pages.
+        last_archive_id = Problem.total - 10
+        Page.total = (last_archive_id - 1) / Page::LENGTH + 1
+      end
+    rescue Timeout::Error
+      puts "Project Euler is not responding."
+
+      exit(true)
+    end
   end
 
   # Loads in all of the problem numbers and titles from the recent page.
@@ -47,7 +55,7 @@ module Scraper
 
     problem_links = fragment.css('#problems_table td a')
 
-    i = (page - 1) * Page::PROBLEMS_PER_PAGE + 1
+    i = (page - 1) * Page::LENGTH + 1
     problem_links.each do |link|
       problems[i].title = link.text
       i += 1

data/lib/project_euler_cli/page.rb

@@ -2,7 +2,7 @@ module ProjectEulerCli
 
 class Page
 
-  PROBLEMS_PER_PAGE = 50
+  LENGTH = 50
 
   @@total = 0
   @@visited = []

data/lib/project_euler_cli/version.rb

@@ -1,3 +1,3 @@
 module ProjectEulerCli
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: project_euler_cli
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - ecssiah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler