landmarks-of-st-petersburg 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9023ae58fbd15aa6ee5b94f6bf323e1f1dc6c1d3
-  data.tar.gz: fd3042dda80c7a156cb0d839254361495a319ff2
+  metadata.gz: 7c6d24768794e3a8fdada5e76abc853ae5a5300c
+  data.tar.gz: 40daaac7fa4d53dd2960817841b2c4cacfc8f39f
 SHA512:
-  metadata.gz: 88472da707a682ce163740668111fc40811d5d843c7fffa70502e0aacb79bd79858107e72866fd3c98f76d4e44aedd84e933188579941620859afcf0bd9b6cde
-  data.tar.gz: 37e9726b43bb9f96413ae3492c8a24e04b96bbdffc5631979ed8c5d7fc47ba66f57c649d5b91f10d31cc500dfb3f8e88374b2976e26e1e7f2272452a4bc587e0
+  metadata.gz: 1f24987789579919f0644be16979886e1d2c4012c7f765e09bb9f5ac2d08e4328255e0cdaed1f8610da65035b73c27d94899db87275a7aa1ed5bd8d133f8f25a
+  data.tar.gz: 37ab460ceb55e8e04270bd42e2c9bcb99c7915000d9e294d0f5f311a36d2fc25455c8d4ba100daffb2199b1d6245bebf9fce3e6b8ff456add2ca9ae44ac6914b

data/lib/landmarks/cli.rb

@@ -1,13 +1,15 @@
+require 'pry'
+
 class Landmarks::CLI
 
   def call
     puts ""
     puts "WELCOME TO TOP 20 ST. PETERSBURG ARCHITECTURAL LANDMARKS!"
-    scraper = Landmarks::Landmark.scraper
-    scraper.print_the_title
-    scraper.scrape_landmarks_index
+    @scraper = Landmarks::Scraper.new
+    @scraper.print_the_title
+    @scraper.scrape_landmarks_index
     puts ""
-    scraper.print_landmarks_index
+    print_landmarks_index
     puts ""
     start
   end
@@ -15,57 +17,71 @@ class Landmarks::CLI
   def start
     puts "Please enter the number of the landmark you would like more information on:"
     input = gets.chomp.to_i
-    if !input.between?(1, 20)
-      puts "Please enter a number from 1 to 20!"
-      start
-    end
-    landmark = Landmarks::Landmark.find(input)
-    puts "\t\n"
-    puts landmark.name.strip.upcase
-    puts "\t\n"
-    puts "\t\t\t\t\t\t================== Description of the Landmark =================="
-    puts "\t\n"
-    puts landmark.description
-    puts "\t\n"
-    puts "\t\t\t\t\t\t================================================================="
-    puts "\t\n"
-    puts "Would you like to check the availability of directions, contact information and business hours? y/n"
-    answer = gets.chomp.downcase
+    if input.between?(1, 20)
 
-    if answer == "y"
+      landmark = Landmarks::Landmark.find(input)
+      # @scraper.scrape_additional_details(landmark)
+      puts "\t\n"
+      puts landmark.name.strip.upcase
       puts "\t\n"
-      puts "\t\t\t\t\t\t====== Directions, contact information and business hours ======"
+      puts "\t\t\t\t\t\t================== Description of the Landmark =================="
       puts "\t\n"
-      puts landmark.directions
+      puts landmark.description
       puts "\t\n"
       puts "\t\t\t\t\t\t================================================================="
       puts "\t\n"
-      puts "Would you like to find out more about another landmark? y/n"
-      response = gets.chomp.downcase
+      puts "Would you like to check the availability of directions, contact information and business hours? y/n"
+      answer = gets.chomp.downcase
 
-      if response == "y"
-        start
-      else
+      if answer == "y"
         puts "\t\n"
-        puts "Thank you for your interest! Have a great day, and welcome again in the future!"
+        puts "\t\t\t\t\t\t====== Directions, contact information and business hours ======"
         puts "\t\n"
-        puts "\t\t\t**************************"
+        puts landmark.directions
         puts "\t\n"
-      end
+        puts "\t\t\t\t\t\t================================================================="
+        puts "\t\n"
+        puts "Would you like to find out more about another landmark? y/n"
+        response = gets.chomp.downcase
+
+        if response == "y"
+          start
+        else
+          puts "\t\n"
+          puts "Thank you for your interest! Have a great day, and welcome again in the future!"
+          puts "\t\n"
+          puts "\t\t\t**************************"
+          puts "\t\n"
+        end
 
-    else
-      puts "\t\n"
-      puts "Would you like to find out more about another landmark? y/n"
-      response = gets.chomp.downcase
-      if response == "y"
-        start
       else
-        puts "Thank you for your interest! Have a great day, and welcome again in the future!"
-        puts "\t\n"
-        puts "\t\t\t**************************"
         puts "\t\n"
+        puts "Would you like to find out more about another landmark? y/n"
+        response = gets.chomp.downcase
+        if response == "y"
+          start
+        else
+          puts "Thank you for your interest! Have a great day, and welcome again in the future!"
+          puts "\t\n"
+          puts "\t\t\t**************************"
+          puts "\t\n"
+        end
+      end
+    else
+      puts "Please enter a number from 1 to 20!"
+      start
+    end
+  end
+
+  def print_landmarks_index
+    Landmarks::Landmark.all.each.with_index do |el, index|
+      if el.name.include?("\r\n")
+        puts "#{index+1}.#{el.name}".gsub("\r\n", "")
+      else
+        puts "#{index+1}.\t#{el.name}"
       end
     end
+    nil
   end
 
 end

data/lib/landmarks/scraper.rb

@@ -9,7 +9,9 @@ class Landmarks::Scraper
   end
 
   def scrape_landmarks_index
-    self.get_page.css("h2").each { |el| Landmarks::Landmark.new(el.text, "http://www.saint-petersburg.com"+el.css("a").attr("href").text) }
+    self.get_page.css("h2").each do |el|
+      Landmarks::Landmark.new(el.text, "http://www.saint-petersburg.com"+el.css("a").attr("href").text)
+    end
   end
 
 
@@ -17,16 +19,12 @@ class Landmarks::Scraper
     puts self.get_page.css("h1").text
   end
 
-  def print_landmarks_index
-    Landmarks::Landmark.all.each.with_index do |el, index|
-      if el.name.include?("\r\n")
-        puts "#{index+1}. #{el.name}".gsub("\r\n", "")
-      else
-        puts "#{index+1}.\t#{el.name}"
-      end
-    end
-    nil
-  end
+  # def print_landmarks_index
+  #   Landmarks::Landmark.all.each.with_index do |el, index|
+  #       puts "#{index+1}.\t#{el.name}"
+  #   end
+  #   nil
+  # end
 
   def print_landmarks_urls
     Landmarks::Landmark.all.each.with_index { |el, index| puts "#{index+1}.\t#{el.url}" }

data/lib/landmarks/version.rb

@@ -1,3 +1,3 @@
 module Landmarks
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landmarks-of-st-petersburg
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - "'Igor Eskin'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler