project_euler_cli 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d24479bc8b7da8a9224cd9fbed31f5719d55f8470631661ef1854aa4f72456c7
-  data.tar.gz: 1c2019b22c5b6f7dbac1f4831b51ffc1d16961a4294f20bf70965307e238ace7
+  metadata.gz: c66d200a7ebd8baa0a733e1ad106595280b60a1dace740083df802b6b2c6cfb0
+  data.tar.gz: 19437da2e5cf758d9a7f5476672e6889e8e25f46d3e8fab0902de80d70f39497
 SHA512:
-  metadata.gz: 9b407f362003ada505414c27c933abd6d92a2e60569e97eac901349a9d09a5751401f6ec8d936391a36b389b8019725638d190ff64b0fe9d0d59c84ddc93d7c7
-  data.tar.gz: 3f920320f2902c8e232c79fef65a3a03c90050600d3815e8c7c354740d44b066fa36ac7c47a70ac1d55f35339eff74f3074d6ee5434989a0102037789b93f50e
+  metadata.gz: 6c2fd76b1c7fee6762f642d980358a95a45190e39996886046bfd191b2002c074f2f633164f85d3b789d1afa8184957ef856c650452ad00f0740b23a75918d93
+  data.tar.gz: ce9fe335d2d88c0def96b18b85e0ffd8f9a4735f8ce85125eab05eff9643114a1811c1dbc1423c55a4879906ae9a86da2c14185c595a6f045b0f72a894a94ebf

data/Gemfile.lock

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

data/lib/project_euler_cli.rb

@@ -4,10 +4,9 @@ require 'nokogiri'
 require 'pry'
 
 require "project_euler_cli/version"
-require "project_euler_cli/problem"
 require "project_euler_cli/page"
+require "project_euler_cli/problem"
 require "project_euler_cli/concerns/scraper"
-require "project_euler_cli/archive_controller"
 require "project_euler_cli/archive_viewer"
 require "project_euler_cli/archive_searcher"
 require "project_euler_cli/cli"

data/lib/project_euler_cli/archive_searcher.rb

@@ -9,9 +9,7 @@ class ArchiveSearcher
   # Tracks whether there is an active search
   attr_accessor :searching
 
-  def initialize(problems)
-    @problems = problems
-
+  def initialize
     @results = []
     @searching = false
     @initial_search = true
@@ -21,27 +19,27 @@ class ArchiveSearcher
   def load_keywords
     puts "updating keywords..."
 
-    0.upto(Page.total) { |page| load_page(page, @problems) }
+    0.upto(Page.total) { |page| load_page(page) }
   end
 
   # Performs a simple search of the problems. It accepts multiple terms and
   # recognizes quoted phrases. Results will contain *all* of the search terms.
   #
   # * +terms+ - String of search terms
-  def search(terms_string)
+  def search(search_string)
     load_keywords if Page.visited != (0..Page.total).to_a
 
     puts "searching..."
     @searching = true
 
-    terms_string.downcase!
-    terms = terms_string.scan(/"[^"]*"/)
-    terms.each { |term| terms_string.slice!(term) }
+    search_string.downcase!
+    terms = search_string.scan(/"[^"]*"/)
+    terms.each { |term| search_string.slice!(term) }
     terms.collect! { |term| term.gsub("\"", '') }
-    terms += terms_string.split(' ')
+    terms += search_string.split(' ')
 
     @results = (1..Problem.total).select do |i|
-      terms.all? { |term| @problems[i].title.downcase.include?(term) }
+      terms.all? { |term| Problem[i].title.downcase.include?(term) }
     end
   end
 

data/lib/project_euler_cli/archive_viewer.rb

@@ -4,31 +4,31 @@ module ProjectEulerCli
 class ArchiveViewer
   include Scraper
 
-  def initialize(problems)
-    @problems = problems
+  def initialize
+    lookup_totals
   end
 
   # Displays the 10 most recently added problems.
   def display_recent
-    load_recent(@problems)
+    load_recent
 
     puts
 
     (Problem.total).downto(Problem.total - 9) do |i| 
-      puts "#{i} - #{@problems[i].title}" 
+      puts "#{i} - #{Problem[i].title}" 
     end
   end
 
   # Displays the problem numbers and titles for an individual page of the 
   # archive.
   def display_page(page)
-    load_page(page, @problems)
+    load_page(page)
 
     puts
 
     start = (page - 1) * Page::LENGTH + 1
     start.upto(start + Page::LENGTH - 1) do |i|
-      puts "#{i} - #{@problems[i].title}" unless i >= Problem.total - 9
+      puts "#{i} - #{Problem[i].title}" unless i >= Problem.total - 9
     end
   end
 
@@ -36,17 +36,17 @@ class ArchiveViewer
   #
   # * +id+ - ID of the problem to be displayed
   def display_problem(id)
-    load_problem_details(id, @problems)
+    load_problem_details(id)
 
     puts
     puts "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
     puts
-    puts "#{@problems[id].title}".upcase
+    puts Problem[id].title.upcase
     puts "Problem #{id}"
     puts
-    puts @problems[id].published
-    puts @problems[id].solved_by
-    puts @problems[id].difficulty if id < Problem.total - 9
+    puts Problem[id].published
+    puts Problem[id].solved_by
+    puts Problem[id].difficulty if id < Problem.total - 9
     puts
     puts "https://projecteuler.net/problem=#{id}"
     puts
@@ -58,7 +58,7 @@ class ArchiveViewer
   # * +list+ - Array of problem IDs
   def display_custom_page(list)
     puts
-    list.each { |id| puts "#{id} - #{@problems[id].title}" }
+    list.each { |id| puts "#{id} - #{Problem[id].title}" }
   end
 
 end

data/lib/project_euler_cli/cli.rb

@@ -1,11 +1,11 @@
 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.
 class CLI
 
   def initialize
-    @ac = ArchiveController.new
+    @av = ArchiveViewer.new
+    @as = ArchiveSearcher.new
   end
 
   def start
@@ -51,7 +51,7 @@ class CLI
   end
 
   def recent_menu
-    @ac.display_recent
+    @av.display_recent
 
     puts
     puts "e(x)it"
@@ -69,7 +69,7 @@ class CLI
 
   def page_menu(page)
     page = [1, page, Page.total].sort[1] #clamp
-    @ac.display_page(page)
+    @av.display_page(page)
 
     puts
     puts "[#{page}/#{Page.total}] (n)ext (p)rev (g)oto e(x)it"
@@ -95,7 +95,7 @@ class CLI
   end
 
   def problem_menu(id)
-    @ac.display_problem(id)
+    @av.display_problem(id)
 
     puts
     puts "(b)ack e(x)it"
@@ -103,10 +103,10 @@ class CLI
     input = prompt
 
     if input == 'b'
-      if @ac.searching
+      if @as.searching
         search_results_menu
       else
-        page = @ac.get_page(id)
+        page = Problem.page(id)
         page == 0 ? recent_menu : page_menu(page)
       end
     elsif input == 'x'
@@ -120,24 +120,24 @@ class CLI
     print "search: "
 
     search_terms = gets.strip
-    @ac.search(search_terms)
+    @as.search(search_terms)
     search_results_menu
   end
 
   def search_results_menu
-    @ac.display_results
+    @av.display_custom_page(@as.results)
 
     puts
     puts "(s)earch e(x)it"
 
     input = prompt
 
-    if @ac.results_include?(input.to_i)
+    if @as.results.include?(input.to_i)
       problem_menu(input.to_i)
     elsif input == 's'
       search_menu
     elsif input == 'x'
-      @ac.searching = false
+      @as.searching = false
       return
     else
       search_results_menu

data/lib/project_euler_cli/concerns/scraper.rb

@@ -15,12 +15,10 @@ module Scraper
 
         # 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
+        id_col.first.text.to_i.times { Problem.new }
         # 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
+        # can be found by subtracting 10 from the total number of problems.
+        Page.total = Problem.page(Problem.total - 10) 
       end
     rescue Timeout::Error
       puts "Project Euler is not responding."
@@ -30,7 +28,7 @@ module Scraper
   end
 
   # Loads in all of the problem numbers and titles from the recent page.
-  def load_recent(problems)
+  def load_recent
     return if Page.visited.include?(0)
 
     html = open("https://projecteuler.net/recent")
@@ -40,7 +38,7 @@ module Scraper
 
     i = Problem.total
     problem_links.each do |link|
-      problems[i].title = link.text
+      Problem[i].title = link.text
       i -= 1
     end
 
@@ -48,7 +46,7 @@ module Scraper
   end
 
   # Loads the problem numbers and titles for an individual page of the archive.
-  def load_page(page, problems)
+  def load_page(page)
     return if Page.visited.include?(page)
 
     html = open("https://projecteuler.net/archives;page=#{page}")
@@ -58,7 +56,7 @@ module Scraper
 
     i = (page - 1) * Page::LENGTH + 1
     problem_links.each do |link|
-      problems[i].title = link.text
+      Problem[i].title = link.text
       i += 1
     end
 
@@ -66,8 +64,8 @@ module Scraper
   end
 
   # Loads the details of an individual problem.
-  def load_problem_details(id, problems)
-    return unless problems[id].published.nil?
+  def load_problem_details(id)
+    return unless Problem[id].published.nil?
 
     html = open("https://projecteuler.net/problem=#{id}")
     fragment = Nokogiri::HTML(html)
@@ -75,11 +73,11 @@ module Scraper
     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
+    Problem[id].published = details[0].strip
+    Problem[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
+    Problem[id].difficulty = details[2].strip if id <= Problem.total - 10
   end
 
 end

data/lib/project_euler_cli/problem.rb

@@ -3,14 +3,31 @@ module ProjectEulerCli
 class Problem
   attr_accessor :title, :published, :solved_by, :difficulty
 
-  @@total = 0
+  @@all = []
+
+  def initialize
+    @@all << self
+  end
+
+  def self.[](id)
+    @@all[id - 1]
+  end
+
+  def self.[]=(id, value)
+    @@all[id - 1] = value
+  end
 
   def self.total
-    @@total
+    @@all.size
   end
 
-  def self.total=(total)
-    @@total = total
+  # call-seq:
+  #   get_page(id) => page
+  #
+  # Returns page number based on the ID of the problem. The recent page is
+  # considered page 0.
+  def self.page(id)
+    id.between?(1, total - 10) ? (id - 1) / Page::LENGTH + 1 : 0
   end
 
 end

data/lib/project_euler_cli/version.rb

@@ -1,3 +1,3 @@
 module ProjectEulerCli
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: project_euler_cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - ecssiah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,6 @@ files:
 - bin/project-euler-cli
 - bin/setup
 - lib/project_euler_cli.rb
-- lib/project_euler_cli/archive_controller.rb
 - lib/project_euler_cli/archive_searcher.rb
 - lib/project_euler_cli/archive_viewer.rb
 - lib/project_euler_cli/cli.rb

data/lib/project_euler_cli/archive_controller.rb

@@ -1,60 +0,0 @@
-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
-
-    @problems = Array.new(Problem.total + 1) { Problem.new }
-
-    @av = ArchiveViewer.new(@problems)
-    @as = ArchiveSearcher.new(@problems)
-  end
-
-  def searching=(searching)
-    @as.searching = searching
-  end
-
-  def searching
-    @as.searching
-  end
-
-  def search(terms)
-    @as.search(terms)
-  end
-
-  def results_include?(id)
-    @as.results.include?(id)
-  end
-
-  def display_recent
-    @av.display_recent
-  end
-
-  def display_page(page)
-    @av.display_page(page)
-  end
-
-  def display_results
-    @av.display_custom_page(@as.results)
-  end
-
-  def display_problem(id)
-    @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.
-  def get_page(id)
-    id.between?(1, Problem.total - 10) ? (id - 1) / Page::LENGTH + 1 : 0
-  end
-
-end
-
-end