hotel_price 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a82631788a305757b3d0bffbe8298a441fba18511d678a80c20a2e045f9d408
-  data.tar.gz: 8eadeb31ec3d5f4e2dc179f51e15cf3bd2955b5a5afdf8c427ab68f565880833
+  metadata.gz: 936bc9b0a0c708967b88a86509f12e5a677f2b2ee6bcd88698154e801935418e
+  data.tar.gz: 01e264e7b9391bcb5e8f872f5097673665d2135c60ef94033a0b370105a7f376
 SHA512:
-  metadata.gz: 1f1cf23d50086583c2096adefcd7a207cad65e775a5810c8e89ea0690a4a4995cff6dd8c0d2fe88dd59569f5768b1271c9cbe5ad09aa6348c6173dc51ee0b29a
-  data.tar.gz: d254d83f23aabb34bc1164b8d263cecc13d2fc26d7b4ca4a63401399245304f05c786384ed18eda81e3bb84621386e930c4d59b4442aab7dd9068d9383057346
+  metadata.gz: f8d200030f6757cea8ab13a2d93264bb1f34aff18784b93ad74f6295e6f6f54b5d3512276d4122cb99dcbcf601ca9f66abf2616e3889c022ca487dbc06a3d683
+  data.tar.gz: 438aaefa420b71023d57f6df72ee33f262347e54a8afdcda01a9f96607149aa32d51daf7751124f3853eab59f64f2e63ef1abb458bed6f46363b6ee27899ff52

data/Gemfile.lock

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

data/lib/hotel_price/agoda/agoda_scraper.rb

@@ -23,7 +23,7 @@ module HotelPrice::Agoda
       room_name_element = driver.find_elements(:xpath, "//span[@data-selenium='masterroom-title-name']")
       room_name = room_name_element.first.text unless room_name_element.empty?
 
-      { date: date, min_price: price, hotel_name: hotel_name, room_name: room_name }
+      { 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)

data/lib/hotel_price/booking/booking_scraper.rb

@@ -26,7 +26,7 @@ module HotelPrice::Booking
       room_name_element = driver.find_elements(:class_name, "hprt-ws-roomtype-link")
       room_name = room_name_element.first.text unless room_name_element.empty?
 
-      { date: date, min_price: price, hotel_name: hotel_name, room_name: room_name }
+      { 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)

data/lib/hotel_price/expedia/expedia_scraper.rb

@@ -23,7 +23,7 @@ module HotelPrice::Expedia
       room_name_element = driver.find_elements(:xpath, "//h3[@data-stid='room-info-title-heading']")
       room_name = room_name_element.first.text unless room_name_element.empty?
 
-      { date: date, min_price: price, hotel_name: hotel_name, room_name: room_name }
+      { 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)

data/lib/hotel_price/rakuten/rakuten_api.rb

@@ -2,7 +2,7 @@ module HotelPrice::Rakuten
   class RakutenAPI
     def initialize params
       @config = {
-        rakuten_hotel_id: params[:rakuten_hotel_id] ||= 0,
+        rakuten_hotel_id: params[:rakuten_hotel_id].to_s ||= 0,
         rakuten_api_key: params[:rakuten_api_key] ||= ENV["RT_API_KEY"]
       }
     end
@@ -45,56 +45,7 @@ module HotelPrice::Rakuten
       "format=json&sort=%2BroomCharge&searchPattern=1&applicationId=#{@config[:rakuten_api_key]}&hotelNo=#{rakuten_hotel_id}&adultNum=#{num_adults}&checkinDate=#{checkin_date}&checkoutDate=#{checkout_date}&squeezeCondition="
     end
 
-    def get_min_price params
-      params[:breakfast] ||= ""
-      try = 0
-      begin
-        base_url = "https://app.rakuten.co.jp/services/api/Travel/VacantHotelSearch/20131024?format=json&sort=%2BroomCharge&searchPattern=1"
-        url = [base_url, "&applicationId=", @config[:rakuten_api_key], "&adultNum=", params[:adult_num].to_s, "&checkinDate=", params[:checkin_date].to_s, "&checkoutDate=", (Date.parse(params[:checkin_date]) + 1).strftime("%Y-%m-%d"), "&hotelNo=", @config[:rakuten_hotel_id].to_s, "&squeezeCondition=", params[:breakfast]].join
-        json = Net::HTTP.get(URI.parse(url))
-        result = JSON.parse(json)
-        try = 0
-        begin
-          data_hash = if result["error"] == "not_found"
-                        {
-                          date: DateTime.now.strftime("%Y-%m-%d"),
-                          checkin_date: params[:checkin_date],
-                          rakuten_hotel_id: params[:rakuten_hotel_id],
-                          adult_num: params[:adult_num],
-                          breakfast: params[:breakfast],
-                          plan_num: 0,
-                          min_price: 0
-                        }
-                      elsif result["error"] == "wrong_parameterd"
-                        "入力した値が正しくありません。"
-                      else
-                        {
-                          date: DateTime.now.strftime("%Y-%m-%d"),
-                          checkin_date: result["hotels"][0]["hotel"][1]["roomInfo"][1]["dailyCharge"]["stayDate"],
-                          rakuten_hotel_id: params[:rakuten_hotel_id],
-                          hotel_name: result["hotels"][0]["hotel"][0]["hotelBasicInfo"]["hotelName"],
-                          adult_num: params[:adult_num],
-                          breakfast: params[:breakfast],
-                          plan_num: result["pagingInfo"]["recordCount"],
-                          room_name: result["hotels"][0]["hotel"][1]["roomInfo"][0]["roomBasicInfo"]["roomName"],
-                          plan_name: result["hotels"][0]["hotel"][1]["roomInfo"][0]["roomBasicInfo"]["planName"],
-                          min_price: result["hotels"][0]["hotel"][1]["roomInfo"][1]["dailyCharge"]["rakutenCharge"]
-                        }
-                      end
-        rescue StandardError => e
-          try += 1
-          sleep 2
-          puts "エラー発生。リトライします。\n #{e.message}"
-          retry if try < 5
-        end
-      rescue StandardError => e
-        try += 1
-        sleep 5
-        retry if try < 5
-      end
-      data_hash
-    end
-
+    
     def hotel_info
       uri = URI.parse("https://app.rakuten.co.jp/services/api/Travel/HotelDetailSearch/20131024?hotelNo=" + @config[:rakuten_hotel_id].to_s + "&applicationId=" + @config[:rakuten_api_key].to_s + "&datumType=1&responseType=large")
       json = Net::HTTP.get(uri)

data/lib/hotel_price/rakuten/rakuten_console.rb

@@ -462,7 +462,6 @@ module HotelPrice::Rakuten
     # end
 
     def daily_data
-      puts "start"
       @driver.find_element(:xpath, "/html/body/table[2]/tbody/tr/td[3]/table[2]/tbody/tr[1]/td[1]/table/tbody/tr/td[3]/a/img").click
       @driver.find_element(:xpath, "/html/body/table[2]/tbody/tr/td[3]/table[5]/tbody/tr[2]/td[1]/table/tbody/tr[3]/td/table/tbody/tr/td[1]/input").click
       sleep 3
@@ -476,7 +475,6 @@ module HotelPrice::Rakuten
         select = Selenium::WebDriver::Support::Select.new(@driver.find_element(:name, "f_date"))
         select.select_by(:value, value)
       end
-      puts "scraper"
       @driver.find_element(:xpath, '//input[@value = "表示"]').click
       rows = @driver.find_elements(:xpath, "//tr")
       data = []

data/lib/hotel_price/rakuten/rakuten_scraper.rb

@@ -84,7 +84,7 @@ module HotelPrice::Rakuten
       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
-      sleep 30
+      sleep 3
       plan_num = driver.find_elements(:class, "planThumb")
       driver.quit
       plan_num.size
@@ -93,10 +93,10 @@ module HotelPrice::Rakuten
     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 10
+      sleep 5
       driver.find_element(:id, "du-radio").click
       driver.find_element(:id, "dh-submit").click
-      sleep 10
+      sleep 5
       plan_num = driver.find_elements(:class, "planThumb")
       driver.quit
       plan_num.size

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

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