hotel_price 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92aec7a05284637bc1bd0ccadc6f2022888e6a5392d84bca9c78c236af810393
-  data.tar.gz: 2154651c9955907afbb09d429766df445d24919a9cd2eaf6471911a7b8b257b0
+  metadata.gz: 38a5082a8fd046c92eb5b3e7f68c0a51c2abdd25f5516950ef5e547296d11404
+  data.tar.gz: 58606a57adfe1fb211af3ab18898ab2b476a4b39e8c027cb4a1dae00073df2b6
 SHA512:
-  metadata.gz: 6d48efbd42d28a278fce44b9af78ca1881de8fda7f966e271f3030529474f9847fe3bc053eb36279bf020ef4d7c7060f783a37b1836220e913d21b0c00814582
-  data.tar.gz: 79fa05cbf933589dd86918da447a776551d31f5380386d25c2a271ee39389acfef374903bedd2076d5d3b54008dae70766753917daffdb1dceb1eea0bec2211a
+  metadata.gz: 6dc57df83893d7a9b0da3569ae360542939faf3560dfc4bb4a958aa196c16b8b4311deae4993fef2521fe0ec99e17e40ba1ed14f6ad9d9e66a8ab70c6b4b9b92
+  data.tar.gz: d1c98ae6a1afdd17b367303a080617905b94ff91b3d2b49f038f370afebf097405d98f9cab799884c90d3a48bf55c850c556b8636ab3298c9c1c520d34e163dc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hotel_price (0.3.2)
+    hotel_price (0.3.4)
       activesupport (~> 6.0.2.1)
       nokogiri (~> 1.10.9)
       selenium-webdriver (~> 3.141)

data/lib/hotel_price/agoda/agoda_scraper.rb

@@ -1,56 +1,48 @@
+require "date"
+
 module HotelPrice::Agoda
   class AgodaScraper
-    def self.get_price(day)
-      datetime = DateTime.now
-      retr_datetime = datetime + day
-      date = retr_datetime.day
-      date_tmrw = (retr_datetime + 1).day
-      url = "https://www.agoda.com/ja-jp/hotel-sunroute-new-sapporo/hotel/sapporo-jp.html"
+    def self.get_price(agoda_hotel_id, checkin_date, num_adults)
+      date = DateTime.now.strftime("%Y-%m-%d")
+
+      query_string = make_query_string(checkin_date, num_adults)
+      url = "https://www.agoda.com/ja-jp/#{agoda_hotel_id}.html?#{query_string}"
       driver = self.get_selenium_driver
       driver.get(url)
       sleep 2
 
-      added_months = (retr_datetime.year - datetime.year) * 12 + (retr_datetime.month - datetime.month)
-
-      if added_months.positive?
-        (1..added_months).each do |_n|
-          driver.find_element(:class_name, "DayPicker-NavButton--next").click
-          sleep 1
-        end
-      end
-
-      today = retr_datetime.strftime("%a %b %d %Y")
-      tomorrow = (retr_datetime + 1).strftime("%a %b %d %Y")
-
-      driver.find_elements(:xpath, "//div[@aria-label=\"#{today}\"]")[0].click
-      driver.find_elements(:xpath, "//div[@aria-label=\"#{tomorrow}\"]")[0].click
-      driver.find_element(:xpath, "/html/body/div[14]/div/div[1]/div/div/div[5]/div/div/div/div/div/div[1]/div[1]").click
-      driver.find_element(:class_name, "Searchbox__searchButton__text").click
-      sleep 5
-      begin
-        room_name = driver.find_element(:xpath, "/html/body/div[14]/div/div[4]/div/div[2]/div/div[4]/div/div[2]/div[3]/div[1]/div[1]/div[1]/a/div/div/span").text
-      rescue StandardError => e
-        room_name = ""
-      end
-      begin
-        min_price = driver.find_element(:class_name, "PriceRibbon__Price").text.gsub(",", "").to_i
-      rescue StandardError
-        min_price = 0
-      end
-      sleep 3
-      data = {
-        checkin_date: datetime.year.to_s + datetime.month.to_s + date.to_i.to_s,
-        agoda_min_price: min_price,
-        agoda_min_room_name: room_name
-      }
-      puts data
-      driver.quit
+      data = driver.find_elements(:xpath, "//strong[@data-ppapi='room-price']")
+      return { date: date, min_price: 0 } if data.empty?
+      price = data.first.text.delete("^0-9").to_i
+
+      hotel_name = driver.find_elements(:xpath, "//h1[@data-selenium='hotel-header-name']").first.text
+      room_name = driver.find_elements(:xpath, "//span[@data-selenium='masterroom-title-name']").first.text
+
+      { date: date, min_price: price, hotel_name: hotel_name, room_name: room_name }
+    end
+
+    def self.make_query_string(checkin_date, num_adults)
+      cd_args = make_date_args checkin_date
+      na_args = make_num_adults_arg num_adults
+      "#{cd_args}&#{na_args}&rooms=1&travellerType=-1"
+    end
+
+    def self.make_date_args checkin_date
+      Date.parse checkin_date rescue return ""
+      t = Date.parse(checkin_date)
+      checkin_arg = t.strftime("checkIn=%Y-%m-%d")
+      "#{checkin_arg}&los=2"
+    end
+
+    def self.make_num_adults_arg num_adults
+      return "" if num_adults.to_i <= 1
+      "adults=#{num_adults}"
     end
 
     def self.get_selenium_driver
       options = Selenium::WebDriver::Firefox::Options.new
       options.add_argument("-headless")
-      Selenium::WebDriver.for :firefox#, options: options
+      Selenium::WebDriver.for :firefox, options: options
     end
   end
 end

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Fumitake Kawasaki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler