project_euler_cli 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6779626e07ad722584aa34beb3a2f3f2d0db6be50e19c77d8d1cbad050befb23
-  data.tar.gz: 5247763643de597db2903e2973332e921d5dcb954d0af74d0f9fe104934439eb
+  metadata.gz: 44d8074a02474483217dd5fe84dbc2097e4c74eddefd9f1e5f15963bdccd8e56
+  data.tar.gz: 6bf1bb9012bf4513e88d3c5a879cc632e26ef965c5219729d0d5e7d7fedb739c
 SHA512:
-  metadata.gz: 4d3dffe05c81249a33cf6a1eda98cd1df94d35da6280ae46e25068bcd22b0750705d4461486c0cc3df4b7fd37b405ef57185d902c72a3c0c1c6223d4b4e02e40
-  data.tar.gz: e70681145d9f1dfefa4528404b3e8ddedbd66332963f13a5c2f81818af94651da308311b170504815fdca67aac88199781e9b13ee6aa8c652827caa33f4d1abd
+  metadata.gz: 20d4c42262c68b6ab3b2d8448fef4d6985fadb3462bcbb162e89735ba8363ade9142e4fcce4eb5dfce63e30d551de23939c3c39a65a47a9dbc39de13407f8bec
+  data.tar.gz: 1cc985f77f2406ce7a7a48d9e28030336eea05bc8d228882ac20418315b5fad8ee673983cf3deff16bfde45f3ddfd6f53cf6b92291f6fc36f82491e5773f7591

data/Gemfile.lock

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

data/lib/project_euler_cli/archive_searcher.rb

@@ -25,24 +25,18 @@ class ArchiveSearcher
   end
 
   # Performs a simple search of the problems. It accepts multiple terms. Results
-  # will contain *any* of the terms
+  # will contain *all* of the search terms.
   #
   # * +terms+ - String of search terms
   def search(terms)
-    if @initial_search
-      @initial_search = false
-      load_terms
-    end
+    load_terms if Page.visited != (0..Page.total).to_a
 
     puts "searching..."
-    @results.clear
     @searching = true
 
-    terms.downcase.split(' ').each do |term|
-      for i in 1..Problem.total
-        if @problems[i].title.downcase.include?(term.downcase)
-          @results << i
-        end
+    @results = (1..Problem.total).select do |i|
+      terms.downcase.split(' ').all? do |term|
+        @problems[i].title.downcase.include?(term)
       end
     end
   end

data/lib/project_euler_cli/archive_viewer.rb

@@ -26,9 +26,9 @@ class ArchiveViewer
 
     puts
 
-    i = (page - 1) * Page::LENGTH
-    Page::LENGTH.times do
-      puts "#{i += 1} - #{@problems[i].title}" unless i >= Problem.total - 9
+    start = (page - 1) * Page::LENGTH + 1
+    start.upto(start + Page::LENGTH - 1) do |i|
+      puts "#{i} - #{@problems[i].title}" unless i >= Problem.total - 9
     end
   end
 
@@ -38,6 +38,8 @@ class ArchiveViewer
   def display_problem(id)
     load_problem_details(id, @problems)
 
+    puts
+    puts "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
     puts
     puts "#{@problems[id].title}".upcase
     puts "Problem #{id}"
@@ -47,6 +49,8 @@ class ArchiveViewer
     puts @problems[id].difficulty if id < Problem.total - 9
     puts
     puts "https://projecteuler.net/problem=#{id}"
+    puts
+    puts "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
   end
 
   # Displays a custom page of problems given by an array of IDs.

data/lib/project_euler_cli/cli.rb

@@ -20,17 +20,17 @@ class CLI
 
   def banner
     puts
-    puts "  ---------------------------------- "
-    puts " [          Project Euler           ]"
-    puts " [            e^iπ = -1             ]"
-    puts "  ---------------------------------- "
+    puts "  ----------------------------------  "
+    puts " [          Project Euler           ] "
+    puts " [            e^iπ = -1             ] "
+    puts "  ----------------------------------  "
   end
 
   def main_menu
-    puts " -     List recent problems (r)     -"
-    puts " -    List archived problems (l)    -"
-    puts " -            Search (s)            -"
-    puts " -             Exit (x)             -"
+    puts " -     List recent problems (r)     - "
+    puts " -    List archived problems (l)    - "
+    puts " -            Search (s)            - "
+    puts " -             Exit (x)             - "
 
     input = prompt
 

data/lib/project_euler_cli/concerns/scraper.rb

@@ -1,5 +1,6 @@
 module ProjectEulerCli
 
+# Holds all of the methods related to accessing the site.
 module Scraper
 
   # Pulls information from the recent page to determine the total number of 

data/lib/project_euler_cli/version.rb

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

metadata

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