hotel_price 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a238e76090c742fb9853184bdc3af2b062bfec971635d7e25944e96ab028b60
-  data.tar.gz: 9f1b26e87a46a327bc66588298d3ad1c599519bbd2ef8a1fc0361970c4f5cc87
+  metadata.gz: 1f8327ee6d730dcdba0c4858ce602ec2ae1d38f8201509433404e1639e232012
+  data.tar.gz: 0dfb793cdca1fe7d47d15a4f070e6d8932555ca8abb158bdd77082951d36faeb
 SHA512:
-  metadata.gz: 69960789ac56c5f8a08251c7c492dfe6672e3d0925b574c3bc1efb206fb0832b5ecbac7796ba141fe9bbcc12159b1a7720b28aeca5b1ef19360c247080a85403
-  data.tar.gz: 8a4d5c362aae20d2081f1f2945a6418607738578bca532139688234ce9f4b81ecc73c334dd9805394a2efd41ec7c40efc4e6aafce712fe6ff677fc4ccffe2049
+  metadata.gz: 0e42dd98efc0a3b0777e13551e45fd226cd43f48cb9a886efdbcab1e42f20fd8a2194af525efb82b9535e5e9c1b9760711826c32b1558e3a777197bf3bf8e3f3
+  data.tar.gz: 25dd6df2d2f139027ca13b5f0f3cb68dc7698c6786785b7c85b584c1a3db0fd2ffca58c5c8881286093bb4fcc6bffaeda7c00177f085451f612aae8dd397878c

data/Gemfile.lock

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

data/README.md

@@ -31,7 +31,7 @@ Rakuten Travel API Reference : https://webservice.rakuten.co.jp/api/simplehotels
 
 
 ```ruby
-hotel = HotelPrice::Rakuten::RakutenScraper.new(
+hotel = HotelPrice::Rakuten::RakutenAPI.new(
   rakuten_hotel_id: "128552",
   rakuten_api_key: "api_key"
 )

data/lib/hotel_price.rb

@@ -38,12 +38,12 @@ module HotelPrice
 
   protected
 
-  def self.get_selenium_driver(mode = 0)
+  def self.get_selenium_driver(mode = :chrome)
     case mode
-    when 1
+    when :firefox_remote_capabilities
       firefox_capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
       Selenium::WebDriver.for(:remote, url: "http://hub:4444/wd/hub", desired_capabilities: firefox_capabilities)
-    when 2
+    when :firefox
       Selenium::WebDriver.for :firefox
     else
       options = Selenium::WebDriver::Chrome::Options.new
@@ -61,6 +61,7 @@ module HotelPrice
     # Agoda API key
     # @param [String]
     attr_accessor :agoda_api_key
+    attr_accessor :selenium_driver
 
     def initialize
       @agoda_api_key = nil

data/lib/hotel_price/agoda/agoda_scraper.rb

@@ -2,12 +2,18 @@ require "date"
 
 module HotelPrice::Agoda
   class AgodaScraper
-    def self.get_price(agoda_hotel_id, checkin_date, num_adults, mode = 0)
+    @mode
+
+    def initialize(mode = :chrome)
+      @mode = mode
+    end
+
+    def get_price(agoda_hotel_id, checkin_date, num_adults)
       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 = HotelPrice.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver @mode
       driver.get(url)
       sleep 2
 
@@ -26,20 +32,20 @@ module HotelPrice::Agoda
       { checkin_date: checkin_date, min_price: price, hotel_name: hotel_name, room_name: room_name }
     end
 
-    def self.make_query_string(checkin_date, num_adults)
+    def 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
+    def 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
+    def make_num_adults_arg num_adults
       return "" if num_adults.to_i <= 1
       "adults=#{num_adults}"
     end

data/lib/hotel_price/booking/booking_scraper.rb

@@ -3,12 +3,18 @@ require "date"
 module HotelPrice::Booking
   class BookingScraper
 
-    def self.get_price(booking_hotel_id, checkin_date, num_adults, mode = 0)
+    @mode
+
+    def initialize(mode = :chrome)
+      @mode = mode
+    end
+
+    def get_price(booking_hotel_id, checkin_date, num_adults)
       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 = HotelPrice.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver @mode
       driver.get(url)
       sleep 2
 
@@ -29,13 +35,13 @@ module HotelPrice::Booking
       { checkin_date: checkin_date, min_price: price, hotel_name: hotel_name, room_name: room_name }
     end
 
-    def self.make_query_string(checkin_date, num_adults)
+    def 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}&dist=0&do_availability_check=1&hp_avform=1&hp_group_set=0&no_rooms=1&origin=hp&sb_price_type=total&src=hotel&tab=1&type=total&lang=ja&selected_currency=JPY"
     end
 
-    def self.make_date_args checkin_date
+    def make_date_args checkin_date
       Date.parse checkin_date rescue return ""
       t = Date.parse(checkin_date)
       checkin_arg = t.strftime("checkin_monthday=%d&checkin_year_month=%Y-%m")
@@ -43,7 +49,7 @@ module HotelPrice::Booking
       "#{checkin_arg}&#{checkout_arg}"
     end
 
-    def self.make_num_adults_arg num_adults
+    def make_num_adults_arg num_adults
       return "" if num_adults.to_i <= 1
       "group_adults=#{num_adults}&group_children=0"
     end

data/lib/hotel_price/expedia/expedia_scraper.rb

@@ -2,12 +2,18 @@ require "date"
 
 module HotelPrice::Expedia
   class ExpediaScraper
-    def self.get_price(expedia_hotel_id, checkin_date, num_adults, mode = 0)
+    @mode
+
+    def initialize(mode = :chrome)
+      @mode = mode
+    end
+
+    def get_price(expedia_hotel_id, checkin_date, num_adults)
       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 = HotelPrice.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver @mode
       driver.get(url)
       sleep 2
 
@@ -26,13 +32,13 @@ module HotelPrice::Expedia
       { checkin_date: checkin_date, min_price: price, hotel_name: hotel_name, room_name: room_name }
     end
 
-    def self.make_query_string(checkin_date, num_adults)
+    def 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}&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
+    def make_date_args checkin_date
       Date.parse checkin_date rescue return ""
       t = Date.parse(checkin_date)
       checkin_arg = t.strftime("chkin=%Y-%m-%d")
@@ -40,7 +46,7 @@ module HotelPrice::Expedia
       "#{checkin_arg}&#{checkout_arg}"
     end
 
-    def self.make_num_adults_arg num_adults
+    def make_num_adults_arg num_adults
       return "" if num_adults.to_i <= 1
       "rm1=a#{num_adults}"
     end

data/lib/hotel_price/jalan/jalan_scraper.rb

@@ -1,11 +1,17 @@
 module HotelPrice::Jalan
   class JalanScraper
-    def self.get_price(jalan_hotel_id, checkin_date, num_adults, mode = 0)
+    @mode
+
+    def initialize(mode = :chrome)
+      @mode = mode
+    end
+
+    def get_price(jalan_hotel_id, checkin_date, num_adults)
       date = DateTime.now.strftime("%Y-%m-%d")
 
       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}"
-      driver = HotelPrice.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver @mode
       driver.get(url)
       sleep 2
       @price_box = []
@@ -28,18 +34,18 @@ module HotelPrice::Jalan
       { date: date, min_price: 0 }
     end
 
-    def self.make_query_string(checkin_date, num_adults)
+    def make_query_string(checkin_date, num_adults)
       cd_args = make_date_args checkin_date
       na_args = make_num_adults_arg num_adults
       "rootCd=7701&callbackHistFlg=1&contHideFlg=1&reSearchFlg=1&roomCrack=100000&smlCd=121108&distCd=01&#{cd_args}&stayCount=1&roomCount=1&#{na_args}&minPrice=0&maxPrice=999999"
     end
 
-    def self.make_date_args checkin_date
+    def make_date_args checkin_date
       Date.parse checkin_date rescue return ""
       Date.parse(checkin_date).strftime("stayYear=%Y&stayMonth=%m&stayDay=%d")
     end
 
-    def self.make_num_adults_arg num_adults
+    def make_num_adults_arg num_adults
       return "" if num_adults.to_i < 1
       "adultNum=#{num_adults}"
     end

data/lib/hotel_price/rakuten/rakuten_console.rb

@@ -6,7 +6,7 @@ module HotelPrice::Rakuten
         login_pw: params[:login_pw],
         chain: params[:chain] ||= false,
         rakuten_hotel_id: params[:rakuten_hotel_id] ||= 0,
-        mode: params[:mode] ||= 0
+        mode: params[:mode] ||= :chrome
       }
       @wait = Selenium::WebDriver::Wait.new(timeout: 100)
       @driver = HotelPrice.get_selenium_driver @config[:mode]

data/lib/hotel_price/rakuten/rakuten_scraper.rb

@@ -3,12 +3,18 @@ module HotelPrice::Rakuten
   ## mode 1 - docker selenium
   ## mode 2 - debug
   class RakutenScraper
-    def self.get_price(rakuten_hotel_id, checkin_date, num_adults, mode = 0)
+    @mode
+
+    def initialize(mode = :chrome)
+      @mode = mode
+    end
+
+    def get_price(rakuten_hotel_id, checkin_date, num_adults)
       date = DateTime.now.strftime("%Y-%m-%d")
 
       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 = HotelPrice.get_selenium_driver mode
+      driver = HotelPrice.get_selenium_driver @mode
       driver.get(url)
       sleep 2
       driver.find_elements(class_name: "planThumb").first rescue return ""
@@ -22,13 +28,13 @@ module HotelPrice::Rakuten
       { date: date, min_price: 0 }
     end
 
-    def self.make_query_string(checkin_date, num_adults)
+    def make_query_string(checkin_date, num_adults)
       cd_args = make_date_args checkin_date
       na_args = make_num_adults_arg num_adults
       "f_teikei=quick&f_hizuke=&f_hak=&f_dai=japan&f_chu=tokyo&f_shou=nishi&f_sai=&f_tel=&f_target_flg=&f_tscm_flg=&f_p_no=&f_custom_code=&f_search_type=&f_camp_id=&f_static=1&f_rm_equip=&#{cd_args}&f_heya_su=1&#{na_args}"
     end
 
-    def self.make_date_args checkin_date
+    def make_date_args checkin_date
       Date.parse checkin_date rescue return ""
       t = Date.parse(checkin_date)
       checkin_arg = t.strftime("f_hi1=%d&f_tuki1=%m&f_nen1=%Y")
@@ -36,13 +42,13 @@ module HotelPrice::Rakuten
       "#{checkin_arg}&#{checkout_arg}"
     end
 
-    def self.make_num_adults_arg num_adults
+    def make_num_adults_arg num_adults
       return "" if num_adults.to_i <= 1
       "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 = HotelPrice.get_selenium_driver mode
+    def review rakuten_hotel_id
+      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")
@@ -70,8 +76,8 @@ module HotelPrice::Rakuten
       data
     end
 
-    def self.get_photo_num rakuten_hotel_id, mode = 0
-      driver = HotelPrice.get_selenium_driver mode
+    def get_photo_num rakuten_hotel_id
+      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
@@ -79,8 +85,8 @@ module HotelPrice::Rakuten
       num
     end
 
-    def self.get_bf_plan_num rakuten_hotel_id, mode = 0
-      driver = HotelPrice.get_selenium_driver mode
+    def get_bf_plan_num rakuten_hotel_id
+      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
@@ -90,20 +96,17 @@ module HotelPrice::Rakuten
       plan_num.size
     end
 
-    def self.get_dayuse_plan_num rakuten_hotel_id, mode = 0
-      driver = HotelPrice.get_selenium_driver mode
-      driver.get "https://hotel.travel.rakuten.co.jp/hotelinfo/plan/#{rakuten_hotel_id}"
-      sleep 5
-      driver.find_element(:id, "du-radio").click
-      driver.find_element(:id, "dh-submit").click
+    def get_dayuse_plan_num rakuten_hotel_id
+      driver = HotelPrice.get_selenium_driver @mode
+      driver.get "https://hotel.travel.rakuten.co.jp/hotelinfo/dayuse/?f_no=#{rakuten_hotel_id}"
       sleep 5
       plan_num = driver.find_elements(:class, "planThumb")
       driver.quit
       plan_num.size
     end
 
-    def self.get_detail_class_code rakuten_hotel_id, mode = 0
-      driver = HotelPrice.get_selenium_driver mode
+    def get_detail_class_code rakuten_hotel_id
+      driver = HotelPrice.get_selenium_driver @mode
       driver.get "https://hotel.travel.rakuten.co.jp/hinfo/?f_no=#{rakuten_hotel_id}"
       {
         status: "found",

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.5.7"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - Fumitake Kawasaki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler