project_euler_cli 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97ef0fde2d2609a709c9e0c379142c31aee9435bb89ac68a630cc36d22a97e0c
-  data.tar.gz: 181d0ec818f088d4b42911b8431a2bdb6caa941b5f5932a5f5d744c8fb8ec153
+  metadata.gz: c0016fc054fcdc5ebc58a58ae77500b6a59776e38a8c2e55c4a6af7b69848007
+  data.tar.gz: dd93295b9e645b7038f8eed4de1ff68f6fce96151530e791d911e9a6cb1c5e86
 SHA512:
-  metadata.gz: 389f0c3c2234c1d506b507e9ec4625c1f72c743d94df9f992529ed9a8acf0209dcb2586541dbfa2232ba7c039fcd127b2343bcc1baf3c413130c80f105230f82
-  data.tar.gz: 49e66c02ae2811d72c5e51ce6a514a0aeecf74f4dae9f0b219f99b225387461dcd11fd3bb465e0a484ea1e3d83efffd40803c02aaa7d4c6b57bbaac85b692df8
+  metadata.gz: 775225f6b9fc001b3f5779ed6d1521b01914512d04494bfd2ed9feceafadb17555df1514f27b71039acf08c314f35782d396c5d70bf4485415fc2c8456caff85
+  data.tar.gz: 839bb873d2d478773011d8627ea3dbb57ee18e4e61bef37e6983cc8a17938de7db660e055ca10bbbe841f9b766a7a0a9a1b1db77908e570121a68e9c4c5f8cf1

data/Gemfile.lock

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

data/lib/project_euler_cli.rb

@@ -6,6 +6,7 @@ require 'pry'
 require "project_euler_cli/version"
 require "project_euler_cli/problem"
 require "project_euler_cli/page"
+require "project_euler_cli/concerns/scraper"
 require "project_euler_cli/archive_controller"
 require "project_euler_cli/archive_viewer"
 require "project_euler_cli/archive_searcher"

data/lib/project_euler_cli/archive_controller.rb

@@ -3,6 +3,7 @@ module ProjectEulerCli
 # Controller class that manages the archive system. It holds the archive data used
 # by ArchiveViewer and ArchiveSearcher.
 class ArchiveController
+  include Scraper
 
   def initialize
     lookup_totals
@@ -13,38 +14,6 @@ class ArchiveController
     @as = ArchiveSearcher.new(@problems)
   end
 
-  # call-seq:
-  #   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.
-  def get_page(id)
-    if id.between?(Problem.total - 9, Problem.total)
-      0
-    elsif id.between?(1, Problem.total - 10)
-      (id - 1) / 50 + 1
-    else
-      -1
-    end
-  end
-
-  # 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
-    # The last problem on the recent page has an ID that is one larger than the
-    # last problem in the archive pages. The total number of pages can be calculated
-    # from its ID.
-    Page.total = get_page(id_col.last.text.to_i - 1)
-  end
-
   def searching=(searching)
     @as.searching = searching
   end
@@ -77,6 +46,21 @@ class ArchiveController
     @av.display_problem(id)
   end
 
+  # call-seq:
+  #   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.
+  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
+  end
+
 end
 
 end

data/lib/project_euler_cli/archive_searcher.rb

@@ -2,6 +2,8 @@ module ProjectEulerCli
 
 # Handles searching the problems
 class ArchiveSearcher
+  include Scraper
+
   # Array of IDs corresponding to the problems found in last search
   attr_reader :results
   # Tracks whether there is an active search
@@ -19,39 +21,7 @@ class ArchiveSearcher
   def load_terms
     puts "updating keywords..."
 
-    # Loading each archive page
-    1.upto(Page.total) do |page|
-      unless Page.visited.include?(page)
-        html = open("https://projecteuler.net/archives;page=#{page}")
-        fragment = Nokogiri::HTML(html)
-
-        problem_links = fragment.css('#problems_table td a')
-
-        i = (page - 1) * 50 + 1
-        problem_links.each do |link|
-          @problems[i].title = link.text
-          i += 1
-        end
-
-        Page.visited << page
-      end
-    end
-
-    # Loading the recent problems
-    unless Page.visited.include?(0)
-      html = open("https://projecteuler.net/recent")
-      fragment = Nokogiri::HTML(html)
-
-      problem_links = fragment.css('#problems_table td a')
-
-      i = Problem.total
-      problem_links.each do |link|
-        @problems[i].title = link.text
-        i -= 1
-      end
-
-      Page.visited << 0
-    end
+    0.upto(Page.total) { |page| load_page(page, @problems) }
   end
 
   # Performs a simple search of the problems. It accepts multiple terms. Results

data/lib/project_euler_cli/archive_viewer.rb

@@ -2,82 +2,30 @@ module ProjectEulerCli
 
 # Handles the work of displaying information about the problems.
 class ArchiveViewer
+  include Scraper
 
   def initialize(problems)
     @problems = problems
   end
 
-  # Loads in all of the problem numbers and titles from the recent page.
-  def load_recent
-    html = open("https://projecteuler.net/recent")
-    fragment = Nokogiri::HTML(html)
-
-    problem_links = fragment.css('#problems_table td a')
-
-    i = Problem.total
-    problem_links.each do |link|
-      @problems[i].title = link.text
-      i -= 1
-    end
-
-    Page.visited << 0
-  end
-
   # Displays the 10 most recently added problems.
   def display_recent
-    load_recent unless Page.visited.include?(0)
+    load_recent(@problems)
 
     puts
 
-    (Problem.total).downto(Problem.total - 9) do |i|
-      puts "#{i} - #{@problems[i].title}"
-    end
-  end
-
-  # Loads the problem numbers and titles for an individual page of the archive.
-  def load_page(page)
-    html = open("https://projecteuler.net/archives;page=#{page}")
-    fragment = Nokogiri::HTML(html)
-
-    problem_links = fragment.css('#problems_table td a')
-
-    i = (page - 1) * 50 + 1
-    problem_links.each do |link|
-      @problems[i].title = link.text
-      i += 1
-    end
-
-    Page.visited << page
+    (Problem.total).downto(Problem.total - 9) { |i| puts "#{i} - #{@problems[i].title}" }
   end
 
   # Displays the problem numbers and titles for an individual page of the archive.
   def display_page(page)
-    load_page(page) unless Page.visited.include?(page)
+    load_page(page, @problems)
 
     puts
 
-    start = (page - 1) * 50 + 1
-    for i in start...start + 50
-      unless i >= Problem.total - 9
-        puts "#{i} - #{@problems[i].title}"
-      end
-    end
-  end
-
-  # Loads the details of an individual problem.
-  def load_problem_details(id)
-    html = open("https://projecteuler.net/problem=#{id}")
-    fragment = Nokogiri::HTML(html)
-
-    problem_info = fragment.css('div#problem_info span span')
-
-    details = problem_info.text.split(';')
-    @problems[id].published = details[0].strip
-    @problems[id].solved_by = details[1].strip
-
-    # recent problems do not have a difficult rating
-    if id < Problem.total - 9
-      @problems[id].difficulty = details[2].strip
+    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
     end
   end
 
@@ -85,7 +33,7 @@ class ArchiveViewer
   #
   # * +id+ - ID of the problem to be displayed
   def display_problem(id)
-    load_problem_details(id) if @problems[id].published.nil?
+    load_problem_details(id, @problems)
 
     puts
     puts "#{@problems[id].title}".upcase
@@ -103,7 +51,6 @@ class ArchiveViewer
   # * +list+ - Array of problem IDs
   def display_custom_page(list)
     puts
-
     list.each { |id| puts "#{id} - #{@problems[id].title}" }
   end
 

data/lib/project_euler_cli/cli.rb

@@ -76,7 +76,7 @@ class CLI
 
     input = prompt
 
-    if input.to_i.between?(50 * (page - 1) + 1, 50 * page)
+    if input.to_i.between?(Page::PROBLEMS_PER_PAGE * (page - 1) + 1, Page::PROBLEMS_PER_PAGE * page)
       problem_menu(input.to_i)
     elsif input == 'n'
       page_menu(page + 1)

data/lib/project_euler_cli/concerns/scraper.rb

@@ -0,0 +1,78 @@
+module ProjectEulerCli
+
+module Scraper
+
+  # 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
+  end
+
+  # Loads in all of the problem numbers and titles from the recent page.
+  def load_recent(problems)
+    return if Page.visited.include?(0)
+
+    html = open("https://projecteuler.net/recent")
+    fragment = Nokogiri::HTML(html)
+
+    problem_links = fragment.css('#problems_table td a')
+
+    i = Problem.total
+    problem_links.each do |link|
+      problems[i].title = link.text
+      i -= 1
+    end
+
+    Page.visited << 0
+  end
+
+  # Loads the problem numbers and titles for an individual page of the archive.
+  def load_page(page, problems)
+    return if Page.visited.include?(page)
+
+    html = open("https://projecteuler.net/archives;page=#{page}")
+    fragment = Nokogiri::HTML(html)
+
+    problem_links = fragment.css('#problems_table td a')
+
+    i = (page - 1) * Page::PROBLEMS_PER_PAGE + 1
+    problem_links.each do |link|
+      problems[i].title = link.text
+      i += 1
+    end
+
+    Page.visited << page
+  end
+
+  # Loads the details of an individual problem.
+  def load_problem_details(id, problems)
+    return unless problems[id].published.nil?
+
+    html = open("https://projecteuler.net/problem=#{id}")
+    fragment = Nokogiri::HTML(html)
+
+    problem_info = fragment.css('div#problem_info span span')
+
+    details = problem_info.text.split(';')
+    problems[id].published = details[0].strip
+    problems[id].solved_by = details[1].strip
+
+    # recent problems do not have a difficult rating
+    problems[id].difficulty = details[2].strip if id < Problem.total - 9
+  end
+
+end
+
+end

data/lib/project_euler_cli/page.rb

@@ -2,6 +2,8 @@ module ProjectEulerCli
 
 class Page
 
+  PROBLEMS_PER_PAGE = 50
+
   @@total = 0
   @@visited = []
 
@@ -17,10 +19,6 @@ class Page
     @@visited
   end
 
-  def self.visited=(visited)
-    @@visited = visited
-  end
-
 end
 
 end

data/lib/project_euler_cli/problem.rb

@@ -1,7 +1,7 @@
 module ProjectEulerCli
 
 class Problem
-  attr_accessor :id, :title, :published, :solved_by, :difficulty
+  attr_accessor :title, :published, :solved_by, :difficulty
 
   @@total = 0
 

data/lib/project_euler_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: project_euler_cli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - ecssiah
@@ -106,6 +106,7 @@ files:
 - lib/project_euler_cli/archive_searcher.rb
 - lib/project_euler_cli/archive_viewer.rb
 - lib/project_euler_cli/cli.rb
+- lib/project_euler_cli/concerns/scraper.rb
 - lib/project_euler_cli/page.rb
 - lib/project_euler_cli/problem.rb
 - lib/project_euler_cli/version.rb