project_euler_cli 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c120e27b54ecb70be7838b2ff12a1908b0fe4324a34489502dab2a6c1c2477
-  data.tar.gz: eef16492a89722e73afa03a5cc090c5792e0623d88a02e0ef6993601c2b472cd
+  metadata.gz: 97ef0fde2d2609a709c9e0c379142c31aee9435bb89ac68a630cc36d22a97e0c
+  data.tar.gz: 181d0ec818f088d4b42911b8431a2bdb6caa941b5f5932a5f5d744c8fb8ec153
 SHA512:
-  metadata.gz: c01e65d898c336d7de472afc46ce60fe5f3dc20f9ac7233828c21ed30a4696eaf77231abf6e967330929eb65cd2107176ea41bbca12d766a0351c0c879228a01
-  data.tar.gz: a81c4f77115407f9ceff0c3caaae1e7315deca93e6600b3aff3656b2b1f579cdcd99a43f782df63e6b9b20ca7e1afb167263b96ca94233a8be3dac0cec967fbb
+  metadata.gz: 389f0c3c2234c1d506b507e9ec4625c1f72c743d94df9f992529ed9a8acf0209dcb2586541dbfa2232ba7c039fcd127b2343bcc1baf3c413130c80f105230f82
+  data.tar.gz: 49e66c02ae2811d72c5e51ce6a514a0aeecf74f4dae9f0b219f99b225387461dcd11fd3bb465e0a484ea1e3d83efffd40803c02aaa7d4c6b57bbaac85b692df8

data/Gemfile.lock

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

data/lib/project_euler_cli/archive_controller.rb

@@ -5,16 +5,12 @@ module ProjectEulerCli
 class ArchiveController
 
   def initialize
-    @archive_data = {}
-
     lookup_totals
 
-    @av = ArchiveViewer.new(@archive_data)
-    @as = ArchiveSearcher.new(@archive_data)
+    @problems = Array.new(Problem.total + 1) { Problem.new }
 
-    @archive_data[:visited_pages] = []
-    @archive_data[:problems] = Array.new(@archive_data[:num_problems] + 1, "")
-    @archive_data[:problem_details] = Array.new(@archive_data[:num_problems] + 1) { {} }
+    @av = ArchiveViewer.new(@problems)
+    @as = ArchiveSearcher.new(@problems)
   end
 
   # call-seq:
@@ -23,9 +19,9 @@ class ArchiveController
   # 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?(@archive_data[:num_problems] - 9, @archive_data[:num_problems])
+    if id.between?(Problem.total - 9, Problem.total)
       0
-    elsif id.between?(1, @archive_data[:num_problems] - 10)
+    elsif id.between?(1, Problem.total - 10)
       (id - 1) / 50 + 1
     else
       -1
@@ -42,19 +38,11 @@ class ArchiveController
 
     # 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.
-    @archive_data[:num_problems] = id_col.first.text.to_i
+    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.
-    @archive_data[:num_pages] = get_page(id_col.last.text.to_i - 1)
-  end
-
-  def num_pages
-    @archive_data[:num_pages]
-  end
-
-  def num_problems
-    @archive_data[:num_problems]
+    Page.total = get_page(id_col.last.text.to_i - 1)
   end
 
   def searching=(searching)

data/lib/project_euler_cli/archive_searcher.rb

@@ -7,8 +7,8 @@ class ArchiveSearcher
   # Tracks whether there is an active search
   attr_accessor :searching
 
-  def initialize(archive_data)
-    @archive_data = archive_data
+  def initialize(problems)
+    @problems = problems
 
     @results = []
     @searching = false
@@ -20,8 +20,8 @@ class ArchiveSearcher
     puts "updating keywords..."
 
     # Loading each archive page
-    1.upto(@archive_data[:num_pages]) do |page|
-      unless @archive_data[:visited_pages].include?(page)
+    1.upto(Page.total) do |page|
+      unless Page.visited.include?(page)
         html = open("https://projecteuler.net/archives;page=#{page}")
         fragment = Nokogiri::HTML(html)
 
@@ -29,28 +29,28 @@ class ArchiveSearcher
 
         i = (page - 1) * 50 + 1
         problem_links.each do |link|
-          @archive_data[:problems][i] = link.text
+          @problems[i].title = link.text
           i += 1
         end
 
-        @archive_data[:visited_pages] << page
+        Page.visited << page
       end
     end
 
     # Loading the recent problems
-    unless @archive_data[:visited_pages].include?(0)
+    unless Page.visited.include?(0)
       html = open("https://projecteuler.net/recent")
       fragment = Nokogiri::HTML(html)
 
       problem_links = fragment.css('#problems_table td a')
 
-      i = @archive_data[:num_problems]
+      i = Problem.total
       problem_links.each do |link|
-        @archive_data[:problems][i] = link.text
+        @problems[i].title = link.text
         i -= 1
       end
 
-      @archive_data[:visited_pages] << 0
+      Page.visited << 0
     end
   end
 
@@ -69,8 +69,8 @@ class ArchiveSearcher
     @searching = true
 
     terms.downcase.split(' ').each do |term|
-      for i in 1..@archive_data[:num_problems]
-        if @archive_data[:problems][i].downcase.include?(term.downcase)
+      for i in 1..Problem.total
+        if @problems[i].title.downcase.include?(term.downcase)
           @results << i
         end
       end

data/lib/project_euler_cli/archive_viewer.rb

@@ -3,8 +3,8 @@ module ProjectEulerCli
 # Handles the work of displaying information about the problems.
 class ArchiveViewer
 
-  def initialize(archive_data)
-    @archive_data = archive_data
+  def initialize(problems)
+    @problems = problems
   end
 
   # Loads in all of the problem numbers and titles from the recent page.
@@ -14,23 +14,23 @@ class ArchiveViewer
 
     problem_links = fragment.css('#problems_table td a')
 
-    i = @archive_data[:num_problems]
+    i = Problem.total
     problem_links.each do |link|
-      @archive_data[:problems][i] = link.text
+      @problems[i].title = link.text
       i -= 1
     end
 
-    @archive_data[:visited_pages] << 0
+    Page.visited << 0
   end
 
   # Displays the 10 most recently added problems.
   def display_recent
-    load_recent unless @archive_data[:visited_pages].include?(0)
+    load_recent unless Page.visited.include?(0)
 
     puts
 
-    (@archive_data[:num_problems]).downto(@archive_data[:num_problems] - 9) do |i|
-      puts "#{i} - #{@archive_data[:problems][i]}"
+    (Problem.total).downto(Problem.total - 9) do |i|
+      puts "#{i} - #{@problems[i].title}"
     end
   end
 
@@ -43,23 +43,23 @@ class ArchiveViewer
 
     i = (page - 1) * 50 + 1
     problem_links.each do |link|
-      @archive_data[:problems][i] = link.text
+      @problems[i].title = link.text
       i += 1
     end
 
-    @archive_data[:visited_pages] << page
+    Page.visited << page
   end
 
   # Displays the problem numbers and titles for an individual page of the archive.
   def display_page(page)
-    load_page(page) unless @archive_data[:visited_pages].include?(page)
+    load_page(page) unless Page.visited.include?(page)
 
     puts
 
     start = (page - 1) * 50 + 1
     for i in start...start + 50
-      unless i >= @archive_data[:num_problems] - 9
-        puts "#{i} - #{@archive_data[:problems][i]}"
+      unless i >= Problem.total - 9
+        puts "#{i} - #{@problems[i].title}"
       end
     end
   end
@@ -72,12 +72,12 @@ class ArchiveViewer
     problem_info = fragment.css('div#problem_info span span')
 
     details = problem_info.text.split(';')
-    @archive_data[:problem_details][id][:published] = details[0].strip
-    @archive_data[:problem_details][id][:solved_by] = details[1].strip
+    @problems[id].published = details[0].strip
+    @problems[id].solved_by = details[1].strip
 
     # recent problems do not have a difficult rating
-    if id < @archive_data[:num_problems] - 9
-      @archive_data[:problem_details][id][:difficulty] = details[2].strip
+    if id < Problem.total - 9
+      @problems[id].difficulty = details[2].strip
     end
   end
 
@@ -85,19 +85,15 @@ class ArchiveViewer
   #
   # * +id+ - ID of the problem to be displayed
   def display_problem(id)
-    load_problem_details(id) if @archive_data[:problem_details][id].empty?
+    load_problem_details(id) if @problems[id].published.nil?
 
     puts
-    puts "#{@archive_data[:problems][id]}".upcase
+    puts "#{@problems[id].title}".upcase
     puts "Problem #{id}"
     puts
-    puts @archive_data[:problem_details][id][:published]
-    puts @archive_data[:problem_details][id][:solved_by]
-
-    if id < @archive_data[:num_problems] - 9
-      puts @archive_data[:problem_details][id][:difficulty]
-    end
-
+    puts @problems[id].published
+    puts @problems[id].solved_by
+    puts @problems[id].difficulty if id < Problem.total - 9
     puts
     puts "https://projecteuler.net/problem=#{id}"
   end
@@ -108,9 +104,7 @@ class ArchiveViewer
   def display_custom_page(list)
     puts
 
-    list.each do |id|
-      puts "#{id} - #{@archive_data[:problems][id]}"
-    end
+    list.each { |id| puts "#{id} - #{@problems[id].title}" }
   end
 
 end

data/lib/project_euler_cli/cli.rb

@@ -58,7 +58,7 @@ class CLI
 
     input = prompt
 
-    if input.to_i.between?(@ac.num_problems - 9, @ac.num_problems)
+    if input.to_i.between?(Problem.total - 9, Problem.total)
       problem_menu(input.to_i)
     elsif input == 'x'
       return
@@ -68,11 +68,11 @@ class CLI
   end
 
   def page_menu(page)
-    page = [1, page, @ac.num_pages].sort[1] #clamp
+    page = [1, page, Page.total].sort[1] #clamp
     @ac.display_page(page)
 
     puts
-    puts "[#{page}/#{@ac.num_pages}] (n)ext (p)rev (g)oto e(x)it"
+    puts "[#{page}/#{Page.total}] (n)ext (p)rev (g)oto e(x)it"
 
     input = prompt
 

data/lib/project_euler_cli/page.rb

@@ -0,0 +1,26 @@
+module ProjectEulerCli
+
+class Page
+
+  @@total = 0
+  @@visited = []
+
+  def self.total
+    @@total
+  end
+
+  def self.total=(total)
+    @@total = total
+  end
+
+  def self.visited
+    @@visited
+  end
+
+  def self.visited=(visited)
+    @@visited = visited
+  end
+
+end
+
+end

data/lib/project_euler_cli/problem.rb

@@ -0,0 +1,18 @@
+module ProjectEulerCli
+
+class Problem
+  attr_accessor :id, :title, :published, :solved_by, :difficulty
+
+  @@total = 0
+
+  def self.total
+    @@total
+  end
+
+  def self.total=(total)
+    @@total = total
+  end
+
+end
+
+end

data/lib/project_euler_cli/version.rb

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

data/lib/project_euler_cli.rb

@@ -4,6 +4,8 @@ require 'nokogiri'
 require 'pry'
 
 require "project_euler_cli/version"
+require "project_euler_cli/problem"
+require "project_euler_cli/page"
 require "project_euler_cli/archive_controller"
 require "project_euler_cli/archive_viewer"
 require "project_euler_cli/archive_searcher"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: project_euler_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - ecssiah
@@ -106,6 +106,8 @@ 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/page.rb
+- lib/project_euler_cli/problem.rb
 - lib/project_euler_cli/version.rb
 - project_euler_cli.gemspec
 - spec.md