hotel_price 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721f3ad16dfb1b86f930d6f9f420590ed1774f56653f1793ed2267deb8668ded
-  data.tar.gz: 7b4096b1eba821639226712dae8f36ba1adc09a1e01cc5bc756f2b3a0f60dc9b
+  metadata.gz: 8fd231f11180111d3ad02831039cb550616f229187d094904e319283ad5edddf
+  data.tar.gz: af6b0f219ea03e0e3ef0cf261eb8ea760cb3fadae129144c2512e631907c1bf6
 SHA512:
-  metadata.gz: 1acfb4cecec62bf16f2e8b5c167151f15f2dbb99757b0a44f4771091f98cb80820e57cbb9e36cd4df1d8693eba74747d11ca8758f9c4b1eee7457f45d023fc6b
-  data.tar.gz: d372e2383be49bee1a3ae3db191abfea5806208d6eb7d3b36bd4cd393db3552f425b48c36bbe94e086f4735ee932116cf9a047ef47c584cf83c26dd5aa76d99e
+  metadata.gz: b961c2ed9421d09648903cd4adc1c81fa42f88017361dca002e6e9d13c45baf7c51339dd38470062eec3b1257e8b2a4ad56f039cd2938af25110ebf351695ee0
+  data.tar.gz: d57619eb97f7fb8ad33d69ba22653201fe607f4ea81d7f65fd0a608e890339405511979538c243fc5b5ba151f553dbcf722c4261f034f0c3e9ef93b586861d41

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hotel_price (0.4.9)
+    hotel_price (0.5.1)
       activesupport (~> 6.0.2.1)
       json (~> 2.3.0)
       nokogiri (~> 1.10.9)

data/lib/hotel_price.rb

@@ -36,7 +36,7 @@ module HotelPrice
     end
   end
 
-  private
+  protected
 
   def self.get_selenium_driver(mode = 0)
     case mode
@@ -52,6 +52,8 @@ module HotelPrice
     end
   end
 
+  private
+
   class Configuration
     # Agoda API key
     # @param [String]

data/lib/hotel_price/agoda/agoda_scraper.rb

@@ -2,12 +2,12 @@ require "date"
 
 module HotelPrice::Agoda
   class AgodaScraper
-    def self.get_price(agoda_hotel_id, checkin_date, num_adults)
+    def self.get_price(agoda_hotel_id, checkin_date, num_adults, mode = 0)
       date = DateTime.now.strftime("%Y-%m-%d")
 
       query_string = make_query_string(checkin_date.to_s, num_adults)
       url = "https://www.agoda.com/ja-jp/#{agoda_hotel_id}.html?#{query_string}"
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get(url)
       sleep 2
 
@@ -43,7 +43,5 @@ module HotelPrice::Agoda
       return "" if num_adults.to_i <= 1
       "adults=#{num_adults}"
     end
-
-
   end
 end

data/lib/hotel_price/booking/booking_scraper.rb

@@ -2,12 +2,13 @@ require "date"
 
 module HotelPrice::Booking
   class BookingScraper
-    def self.get_price(booking_hotel_id, checkin_date, num_adults)
+
+    def self.get_price(booking_hotel_id, checkin_date, num_adults, mode = 0)
       date = DateTime.now.strftime("%Y-%m-%d")
 
       query_string = make_query_string(checkin_date.to_s, num_adults)
       url = "https://www.booking.com/hotel/jp/#{booking_hotel_id}.ja.html?#{query_string}"
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get(url)
       sleep 2
 

data/lib/hotel_price/expedia/expedia_scraper.rb

@@ -2,12 +2,12 @@ require "date"
 
 module HotelPrice::Expedia
   class ExpediaScraper
-    def self.get_price(expedia_hotel_id, checkin_date, num_adults)
+    def self.get_price(expedia_hotel_id, checkin_date, num_adults, mode = 0)
       date = DateTime.now.strftime("%Y-%m-%d")
 
       query_string = make_query_string(checkin_date.to_s, num_adults)
       url = "https://www.expedia.co.jp/ja/#{expedia_hotel_id}.Hotel-Information?#{query_string}"
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get(url)
       sleep 2
 
@@ -32,12 +32,11 @@ module HotelPrice::Expedia
       "#{cd_args}&#{na_args}&x_pwa=1&rfrr=HSR&pwa_ts=1583335742618&swpToggleOn=true&regionId=3250&destination=Sapporo%2C+Hokkaido%2C+Japan&destType=MARKET&neighborhoodId=6290332&selected=5224778&sort=recommended&top_dp=5686&top_cur=JPY"
     end
 
-
     def self.make_date_args checkin_date
       Date.parse checkin_date rescue return ""
       t = Date.parse(checkin_date)
       checkin_arg = t.strftime("chkin=%Y-%m-%d")
-      checkout_arg = (t+1).strftime("chkout=%Y-%m-%d")
+      checkout_arg = (t + 1).strftime("chkout=%Y-%m-%d")
       "#{checkin_arg}&#{checkout_arg}"
     end
 
@@ -46,4 +45,4 @@ module HotelPrice::Expedia
       "rm1=a#{num_adults}"
     end
   end
-end
+end

data/lib/hotel_price/jalan/jalan_scraper.rb

@@ -6,7 +6,7 @@ module HotelPrice::Jalan
       query_string = make_query_string(checkin_date.to_s, num_adults)
       url = "https://www.jalan.net/yad#{jalan_hotel_id}/plan/?screenId=UWW3101&yadNo=#{jalan_hotel_id}&#{query_string}"
       puts url
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get(url)
       sleep 2
       @price_box = []
@@ -20,11 +20,11 @@ module HotelPrice::Jalan
             room_name: e.find_element(class_name: "p-searchResultItem__planName").text,
             plan_name: f.find_element(class_name: "p-planCassette__header").text
           }
-        rescue
+        rescue StandardError
         end
       end
-      @price_box.sort_by { |a, b, c| c }.reverse.first
-    rescue
+      @price_box.sort_by { |_a, _b, c| c }.reverse.first
+    rescue StandardError
       { date: date, min_price: 0 }
     end
 
@@ -44,4 +44,4 @@ module HotelPrice::Jalan
       "adultNum=#{num_adults}"
     end
   end
-end
+end

data/lib/hotel_price/rakuten/rakuten_console.rb

@@ -9,7 +9,7 @@ module HotelPrice::Rakuten
         mode: params[:mode] ||= 0
       }
       @wait = Selenium::WebDriver::Wait.new(timeout: 100)
-      @driver = get_selenium_driver @config[:mode]
+      @driver = self.get_selenium_driver @config[:mode]
       if @config[:chain]
         go_to_management_page_chain
       else
@@ -17,19 +17,6 @@ module HotelPrice::Rakuten
       end
     end
 
-    def get_selenium_driver(mode = 0)
-      if mode == 1
-        firefox_capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
-        Selenium::WebDriver.for(:remote, url: "http://selenium-hub:4444/wd/hub", desired_capabilities: firefox_capabilities)
-      elsif mode == 2
-        Selenium::WebDriver.for :firefox
-      else
-        options = Selenium::WebDriver::Firefox::Options.new
-        options.add_argument("-headless")
-        Selenium::WebDriver.for :firefox, options: options
-      end
-    end
-
     def go_to_management_page_chain
       @driver.get "https://manage.travel.rakuten.co.jp/portal/inn/ry_group.main"
       @driver.find_element(:name, "f_id").send_keys @config[:login_id].to_s

data/lib/hotel_price/rakuten/rakuten_scraper.rb

@@ -8,7 +8,7 @@ module HotelPrice::Rakuten
 
       query_string = make_query_string(checkin_date.to_s, num_adults)
       url = "https://hotel.travel.rakuten.co.jp/hotelinfo/plan/#{rakuten_hotel_id}?#{query_string}"
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get(url)
       sleep 2
       driver.find_elements(class_name: "planThumb").first rescue return ""
@@ -18,7 +18,7 @@ module HotelPrice::Rakuten
       room_name = first_plan.find_element(tag_name: "h6").text
       plan_name = first_plan.find_element(tag_name: "h4").text
       { date: date, min_price: price, hotel_name: hotel_name, room_name: room_name, plan_name: plan_name }
-    rescue
+    rescue StandardError
       { date: date, min_price: 0 }
     end
 
@@ -41,10 +41,9 @@ module HotelPrice::Rakuten
       "f_otona_su=#{num_adults}&f_kin2=0&f_kin=&f_s1=0&f_s2=0&f_y1=0&f_y2=0&f_y3=0&f_y4=0"
     end
 
-
     def self.review rakuten_hotel_id, mode = 0
-      driver = self.get_selenium_driver mode
-      driver.get("https://travel.rakuten.co.jp/HOTEL/#{rakuten_hotel_id.to_s}/review.html")
+      driver = HotelPrice.get_selenium_driver mode
+      driver.get("https://travel.rakuten.co.jp/HOTEL/#{rakuten_hotel_id}/review.html")
       sleep 2
       comment_area = driver.find_elements(:class_name, "commentBox")
       data = comment_area.map do |f|
@@ -53,12 +52,12 @@ module HotelPrice::Rakuten
           generation = 0
           gender = ""
         else
-          username = f.find_element(class_name: "user").text.match(/(^.+ )/).to_s.strip 
-          generation = f.find_element(class_name: "user").text.match(/\[.+代/).to_s.gsub("[","").gsub("代", "")
+          username = f.find_element(class_name: "user").text.match(/(^.+ )/).to_s.strip
+          generation = f.find_element(class_name: "user").text.match(/\[.+代/).to_s.gsub("[", "").gsub("代", "")
           gender = f.find_element(class_name: "user").text.match(/\/../).to_s.gsub("/", "")
         end
         {
-          date: f.find_element(class_name: "time").text.gsub("年","").gsub("月", "").gsub("日", ""),
+          date: f.find_element(class_name: "time").text.gsub("年", "").gsub("月", "").gsub("日", ""),
           rate: f.find_element(class_name: "rate").text,
           username: username,
           generation: generation,
@@ -72,7 +71,7 @@ module HotelPrice::Rakuten
     end
 
     def self.get_photo_num rakuten_hotel_id, mode = 0
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get "https://hotel.travel.rakuten.co.jp/hinfo/#{rakuten_hotel_id}/"
       sleep 2
       num = driver.find_element(:id, "navPht").text.gsub("写真・動画(", "").gsub(")", "").to_i
@@ -81,7 +80,7 @@ module HotelPrice::Rakuten
     end
 
     def self.get_bf_plan_num rakuten_hotel_id, mode = 0
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get "https://hotel.travel.rakuten.co.jp/hotelinfo/plan/#{rakuten_hotel_id}"
       driver.find_element(:id, "focus1").click
       driver.find_element(:id, "dh-squeezes-submit").click
@@ -92,7 +91,7 @@ module HotelPrice::Rakuten
     end
 
     def self.get_dayuse_plan_num rakuten_hotel_id, mode = 0
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get "https://hotel.travel.rakuten.co.jp/hotelinfo/plan/#{rakuten_hotel_id}"
       sleep 10
       driver.find_element(:id, "du-radio").click
@@ -104,17 +103,17 @@ module HotelPrice::Rakuten
     end
 
     def self.get_detail_class_code rakuten_hotel_id, mode = 0
-      driver = self.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver mode
       driver.get "https://hotel.travel.rakuten.co.jp/hinfo/?f_no=#{rakuten_hotel_id}"
       {
         status: "found",
         detail_class_code: driver.find_element(id: "breadcrumbs-detail").attribute("href").match(/\/.\./).to_s.gsub("/", "").gsub(".", "")
       }
-    rescue
+    rescue StandardError
       {
         status: "not_found",
         detail_class_code: ""
       }
     end
   end
-end
+end

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Fumitake Kawasaki