UrgentcareCLI 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d62d9e62ebcc0e1b2318252471997712e2f515b1144ae192cb464fe4b496307
-  data.tar.gz: a62a1ad60b8fbb783cb8bc21eb5d93a5d53665db357af52368b5f5795e4edb1d
+  metadata.gz: a14a0119b6b23342e667a36ec24f7fa392101ccd0bf4c0301c559fd47f596a13
+  data.tar.gz: 6e0de22214194db170cdf8a1380edd1843da5dbc3e0f6aff7539cd508a79bba2
 SHA512:
-  metadata.gz: 3637e6bd4dd19d26d5d71945d589883f3f5a65d999fd9f81fc184a84e884e1f2ea8f23286a85a0698e2cab51d6b7a8ed70f7b73c45899fbd684d6e3674589c1b
-  data.tar.gz: 76793ffbfcac85d94cc8e23a89814eb625a0f7419727436796aae16b9cebc6dc1559db607f08635d491b9d61f4c23b25b3d9e7f98da22586349f8cbc1c8bb5ab
+  metadata.gz: db7f73326afa9d948ffd554379bb90334c20fc622f42ad629746a9eafe8bb4477a8fea4c0946084ed27b4e6b932de84e72805f26b4557fcdda8f5e5e93d5e238
+  data.tar.gz: ae6275370f573733cc5892d925062490be2ad4d1632681a35e87794f4b5fe5c7bc7ef497718dd0562b4489b1fc8abdad5f461f2a3d4f35c951b65b34551931c7

data/lib/UrgentCare/CLI.rb

@@ -1,4 +1,14 @@
+require_relative "./Office"
+require_relative "./Scraper"
+
 class Urgentcare::CLI
+#dependency injection to make code more testable
+#remove strict dependency on other classes 
+
+  def initialize(scraper: Urgentcare::Scraper.new, offices: Urgentcare::Office.all)
+    @scraper = scraper
+    @offices = offices
+  end
 
   def call
     welcome
@@ -6,50 +16,67 @@ class Urgentcare::CLI
 
   def welcome
     #puts displays with a new line 
+    puts " "
+    puts " "
     puts "Welcome to the Urgent Care CLI"
     puts " "
     puts " "
+    puts " "
+    loading_message 
+    office_list 
+  end
+
+  def office_list
+    @scraper.get_office_list
     puts "Please choose a number from the following list for details on
     an Urgent Care location."
-    puts "  "
-
-    Urgentcare::Scraper.new.get_clinics
-    @clinics = Urgentcare::Office.all
-    @clinics.each_with_index do |office, i|
+    puts " "
+    @offices.each_with_index do |office, i|
       puts "#{i + 1}. #{office.name}"
     end
     list
   end
 
   def list
-    puts " "
-    location = gets.chomp
+      puts " "
+      location = $stdin.gets.chomp 
     if location == "Exit" ||location == "exit"
       puts "Thank you and Goodbye!"
-    else
-      @index = location.to_i - 1
+    elsif location != "Exit" || location != "exit"
+      location = location.to_i 
+      $index = location - 1
+      loading_message
+      @scraper.get_clinic_site
       office_details
+    else 
+       puts "Invalid response"
     end
   end
 
   def office_details
-      the_office = Urgentcare::Office.all
-    if @index != "Exit" ||@index != "exit"
+    if $index != "Exit" || $index != "exit"
+      puts " "
+      puts " "
       puts " "
       puts "---"
-      puts "Office Name: #{the_office[@index].name}"
-      puts "Office Number: #{the_office[@index].phone_number}"
-      puts "Office URL: #{the_office[@index].url}"
-      puts "Office Next Available Appointment: #{the_office[@index].next_available}"
+      puts "Office Name: #{@offices[$index].name}"
+      puts "Office Number: #{@offices[$index].phone_number}"
+      puts "Office URL: #{@offices[$index].url}"
+      puts "Office Next Available Appointment: #{@offices[$index].next_available}"
       puts "---"
       puts " "
+      puts " "
+      puts " "
 
     else
       puts "No results found. Please try again."
     end
+      puts " "
+      puts " "
+      puts " "
       puts "Would you like to select another office from the list?"
       puts " "
-      @clinics.each_with_index do |office, i|
+      @offices.each_with_index do |office, i|
         puts "#{i + 1}. #{office.name}"
       end
       puts " "
@@ -57,4 +84,13 @@ class Urgentcare::CLI
       puts " "
       list
   end
+
+  def loading_message
+      puts " "
+      puts "Retrieving data...."
+      puts "Loading......"
+      puts "............."
+      puts " "
+  end
+
 end

data/lib/UrgentCare/Office.rb

@@ -9,15 +9,11 @@ class Urgentcare::Office
     @url = url
     @next_available = next_available
     @phone_number = phone_number
-    @@all << self
+    self.class.all << self #the class of this instance. abstracted away use of variable. 
   end
 
   def self.all
     @@all
   end
 
-  def self.clear
-    @@all.clear
-  end
-
 end

data/lib/UrgentCare/Scraper.rb

@@ -1,5 +1,10 @@
 class Urgentcare::Scraper
 
+  def initialize(office = Urgentcare::Office, scraper: Urgentcare::Scraper)
+    @office = office 
+    @scraper = scraper 
+  end
+
   def self.send_cmd(driver, cmd, params={})  #method by Hernando Torres- Rocca
     bridge = driver.send(:bridge)
     resource = "session/#{bridge.session_id}/chromium/send_command_and_get_result"
@@ -8,58 +13,66 @@ class Urgentcare::Scraper
     return response[:value]
   end
 
-#@ instance variable 
   @@client = Selenium::WebDriver::Remote::Http::Default.new #class variable 
   @@client.read_timeout = 3000 # seconds – default is 60
 
   @@browser = Watir::Browser.new :chrome, headless: true, http_client: @@client
   send_cmd(@@browser.driver, "Network.setBlockedURLs", {'urls': ["*careuc.netmng.com*"]}) #url pending when page loads
-  send_cmd(@@browser.driver, "Network.enable")     
+  send_cmd(@@browser.driver, "Network.enable")   
 
+  @@clinic_page = @@browser.goto('https://www.carewellurgentcare.com/centers/')  
 
-  @@clinic_page = @@browser.goto('https://www.carewellurgentcare.com/centers/')
+  @@url = []
 
   def get_page # page that lists all clinics 
     doc = @@browser.div(id: 'et-main-area').wait_until(&:present?)
     inner = Nokogiri::HTML(doc.inner_html)  #return value of the method 
   end
 
-  def get_clinics #called first in CLI
-    new_page = get_page.css('.centers-list')
-    new_page.each_with_index do |office_details, index|
-        make_office(office_details, index)
+  def get_office_list #called first in CLI
+    @new_page = get_page.css('.centers-list')
+    office_url
+  end
+
+  def office_url 
+    @new_page.each do |office_details|  #does not create additional objects. returns original object
         if office_details.css('a').length > 3
-          url = office_details.css('a')[3][name="href"]
+          @@url << office_details.css('a')[3][name="href"]
         else
-          url = office_details.css('a')[2][name="href"]
+          @@url << office_details.css('a')[2][name="href"]
         end
-        get_waittime(url)
+        @off = @office.new 
+        make_office(office_details) 
     end
   end
-    
-  def get_waittime(url) #retrieve waittime and add to new office model 
-    @@browser.goto(url) 
-    js_doc = @@browser.iframe.wait_until(&:present?) 
-    if  js_doc.button(data_id: "timeSelector").exists? 
-      @wait_time = js_doc.button(data_id: "timeSelector").text.gsub("\n", " ")
-      Urgentcare::Office.all.last.next_available = @wait_time
-    elsif js_doc.element(tag_name: 'h3').exists?  
-      @wait_time = js_doc.element(tag_name: 'h3').text 
-      Urgentcare::Office.all.last.next_available = @wait_time
-    else
-      @wait_time = "No time available"
-      Urgentcare::Office.all.last.next_available = @wait_time
-    end
+
+  def get_clinic_site 
+    @@browser.goto(@@url[$index]) 
+    @js_doc = @@browser.iframe.wait_until(&:present?) 
+    get_appttime_date
   end
 
-  def make_office(office_details, index)
-    office = Urgentcare::Office.new
-    office.name = office_details.css('h2').text
+  def make_office(office_details)
+      @off.name = office_details.css('h2').text
     if office_details.css('a').length > 3
-      office.url = office_details.css('a')[3][name="href"]
+      @off.url = office_details.css('a')[3][name="href"]
     else
-      office.url = office_details.css('a')[2][name="href"]
+      @off.url = office_details.css('a')[2][name="href"]
+    end
+    @off.phone_number = office_details.css('a[href]').text.gsub("Get DirectionsBook Urgent Care Appointment", " ")
+  end
+
+  def get_appttime_date #retrieve waittime and add to new office model 
+    sleep(1);
+   iframe_info = Nokogiri::HTML(@js_doc.html) 
+    if iframe_info.css('div.time-slots')
+      @wait_day = iframe_info.css('div.d-flex.d-md-none.header').text
+      @wait_time = iframe_info.css('div.time-slot.selected').text
+      @office.all[$index].next_available = "#{@wait_day} #{@wait_time}"
+    else   
+      @wait_time = "No time available"
+      @office.all[$index].next_available = "#{@wait_time}"
     end
-    office.phone_number = office_details.css('a[href]').text.gsub("Get DirectionsBook Urgent Care Appointment", " ")
   end
+
 end  

data/lib/UrgentCare/version.rb

@@ -1,3 +1,3 @@
 module Urgentcare
-  VERSION = "0.2.1"  #increment a version with each release
+  VERSION = "0.2.2"  #increment a version with each release
 end                  #semantic versioning 

data/lib/UrgentCare.rb

@@ -7,7 +7,7 @@ require 'capybara'
 
 
 require_relative "./Urgentcare/CLI"
-require_relative "./Urgentcare/version"  #why was this not a relative path?
+require_relative "./Urgentcare/version"  
 require_relative "./Urgentcare/Office"
 require_relative "./Urgentcare/Scraper"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: UrgentcareCLI
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - PamelaTorres-Rocca
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler