UrgentcareCLI 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d62d9e62ebcc0e1b2318252471997712e2f515b1144ae192cb464fe4b496307
-  data.tar.gz: a62a1ad60b8fbb783cb8bc21eb5d93a5d53665db357af52368b5f5795e4edb1d
+  metadata.gz: d08c3a8550ac9e5303232d496a6b848c5b55693e2156c1de8ddafb2287553baf
+  data.tar.gz: f1e3cd49f0e54c41d4918ada94e8b12ee9a2faa4fbd6856470247ad5bb3da242
 SHA512:
-  metadata.gz: 3637e6bd4dd19d26d5d71945d589883f3f5a65d999fd9f81fc184a84e884e1f2ea8f23286a85a0698e2cab51d6b7a8ed70f7b73c45899fbd684d6e3674589c1b
-  data.tar.gz: 76793ffbfcac85d94cc8e23a89814eb625a0f7419727436796aae16b9cebc6dc1559db607f08635d491b9d61f4c23b25b3d9e7f98da22586349f8cbc1c8bb5ab
+  metadata.gz: cb72119f5bdb980fd1351abff64b7fdc91b3f6230b335608c4c39a65a5f73934a5f41746fe8dbcba4c88cd2e74162e7ed35877db0a1fc6267f1d9cb553591397
+  data.tar.gz: ce10f3ef928361056eef160b2fc5d729c655ced8ce787646cdc486822c36fbbeea603e80f152c45805484b7d045b88bdd6984c7caf25aa4bf2a3c25fd6710d45

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,55 +16,81 @@ 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
+     list
+    end
 
   def list
     puts " "
-    location = gets.chomp
+    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|
-        puts "#{i + 1}. #{office.name}"
-      end
+    @offices.each_with_index do |office, i|
+      puts "#{i + 1}. #{office.name}"
+    end
       puts " "
       puts "If not, please type exit."
       puts " "
-      list
+    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,12 @@
+require 'webdrivers'
+
 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 +15,59 @@ 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)
-        if office_details.css('a').length > 3
-          url = office_details.css('a')[3][name="href"]
-        else
-          url = office_details.css('a')[2][name="href"]
-        end
-        get_waittime(url)
-    end
+  def get_office_list #called first in CLI
+    @new_page = get_page.css('.centers-list')
+    office_url
   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
+
+  def office_url 
+    @new_page.each do |office_details|  #does not create additional objects. returns original object
+      @@url << office_details.css('a')[2][name="href"]
+      @office_details = office_details
+      make_office
     end
   end
 
-  def make_office(office_details, index)
-    office = Urgentcare::Office.new
-    office.name = office_details.css('h2').text
-    if office_details.css('a').length > 3
-      office.url = office_details.css('a')[3][name="href"]
-    else
-      office.url = office_details.css('a')[2][name="href"]
+  def get_clinic_site 
+    @@browser.goto(@@url[$index]) 
+    @js_doc = @@browser.iframe.wait_until(&:present?) 
+    get_appttime_date
+  end
+
+  def make_office
+    @off = @office.new 
+    @off.name = @office_details.css('h2').text
+    @off.url = @office_details.css('a')[2][name="href"]
+    @off.phone_number = @office_details.css('a[href]').text.gsub("Get DirectionsSave Your Spot in Line", "")
+  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').empty?
+      @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 = "Walk-in only due to staffing shortages"
+      @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.4"  #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.4
 platform: ruby
 authors:
 - PamelaTorres-Rocca
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.3
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -80,10 +94,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.11.4
-description:
+description: Current Urgent Care wait times in Massachusetts based on location
 email:
-- pfrieze@gmail.com
-executables: []
+- pamela@torres-rocca.com
+executables:
+- Urgentcare
 extensions: []
 extra_rdoc_files: []
 files:
@@ -95,10 +110,11 @@ files:
 - lib/UrgentCare/Office.rb
 - lib/UrgentCare/Scraper.rb
 - lib/UrgentCare/version.rb
-homepage: https://github.com/Pamela454/Pamela-cli-app.git
+homepage: https://github.com/Pamela454/Pamela-cli-app
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/Pamela454/Pamela-cli-app
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -114,8 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.0.1
 signing_key:
 specification_version: 4
-summary: Current Urgent Care wait times in Massachusetts based on location.
+summary: UrgentCareCLI Gem
 test_files: []