hotel_price 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a258d3e3cd27cf75ec732a05891c6cc464603e505e897c4160654c389851b08b
-  data.tar.gz: 0111e2c99abd43c92e440b0ee798f4c9633ae5887c87e97e6d700b8613ee8ad9
+  metadata.gz: 672b35ba401f15c898aec3704672a2f44c036ed6ead4fe58141eb6b733cedb4e
+  data.tar.gz: 64e76de7703a063114353638292c2beb15654eb43b70fddbf405f2ce303cfcca
 SHA512:
-  metadata.gz: af2482c3ee4b4eadb3d101d4f075ca76d241600ee1c7652495d1bd53fc6954589923a371d09c97855d00794f87126bd797b780ff5e6731ca82dcca670a83d89a
-  data.tar.gz: 8239b9ce0695efa32ac9cb0dbc58e664d03411f6f419bf6cd485b539dc910a7667706e1165a40660b9771b617b7eec6346bc6b0346694804c8f7d05c6f77d30f
+  metadata.gz: 6d22b791dea64cdbb7b7d37b6b3903d5bddf7091032e0b47c3015c0b1fc29510392fe8719ace887ba788ce6c2c0df84d5b8a5d6d2a245b5e525f1457f78b598c
+  data.tar.gz: bf780e075c09d2bf1afa8d7b9309ac61376d70ad4d8b9b4da29b17e72aaaf85553fd40ae211141647eda2b15c867497c3b6ce4422560d209277a341e53373702

data/.rubocop.yml

@@ -92,9 +92,8 @@ Style/GuardClause:
 
 # rake タスクの順序の hash は rocket を許可する
 Style/HashSyntax:
-  Exclude:
-    - "**/*.rake"
-    - "Rakefile"
+  EnforcedStyle: ruby19
+
 
 # 条件式の方を意識させたい場合には後置の if/unless を使わない方が分かりやすい
 Style/IfUnlessModifier:
@@ -222,4 +221,4 @@ Style/MutableConstant:
   Enabled: false
 
 Lint/NonDeterministicRequireOrder:
-  Enabled: false
+  Enabled: false

data/Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    hotel_price (0.3.0)
+    hotel_price (0.3.1)
+      nokogiri (~> 1.10.9)
+      selenium-webdriver (~> 3.141)
 
 GEM
   remote: https://rubygems.org/
   specs:
     childprocess (3.0.0)
     diff-lcs (1.3)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -35,7 +40,6 @@ DEPENDENCIES
   hotel_price!
   rake (>= 12.3.3)
   rspec (~> 3.0)
-  selenium-webdriver (~> 3.141)
 
 BUNDLED WITH
    2.1.4

data/hotel_price.gemspec

@@ -31,5 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "selenium-webdriver", "~> 3.141"
+  spec.add_runtime_dependency "nokogiri", "~> 1.10.9"
+  spec.add_runtime_dependency "selenium-webdriver", "~> 3.141"
 end

data/lib/hotel_price/booking/booking_scraper.rb

@@ -9,7 +9,6 @@ module HotelPrice::Booking
       url = "https://www.booking.com/hotel/jp/#{booking_hotel_id}.ja.html?#{query_string}"
       driver = self.get_selenium_driver
       driver.get(url)
-      puts url
       sleep 2
 
       data = driver.find_elements(:class_name, "hprt-table")
@@ -18,7 +17,10 @@ module HotelPrice::Booking
       return { date: date, min_price: 0 } if price_box.empty?
       price = price_box.first.text.delete("^0-9").to_i
 
-      { date: date, price: price }
+      hotel_name = driver.find_elements(:class_name, "hp__hotel-type-badge").first.text
+      room_name = driver.find_elements(:class_name, "hprt-ws-roomtype-link").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)

data/lib/hotel_price/jalan/jalan_api.rb

@@ -1,26 +1,35 @@
 module HotelPrice::Jalan
+  require "nokogiri"
+  require "open-uri"
   class JalanAPI
-    def initialize api_key
-      @api_key = api_key
+    def initialize params
+      @config = {
+        jalan_hotel_id: params[:jalan_hotel_id] ||= 0,
+        jalan_api_key: params[:jalan_api_key] ||= ENV["JALAN_API_KEY"]
+      }
     end
 
     def test
-      @api_key
+      @config[:jalan_api_key]
     end
 
-    def get_price jalan_hotel_id, checkin_date, adult_num
-      url = "http://jws.jalan.net/APIAdvance/StockSearch/V1/?key=#{@api_key}&h_id=#{jalan_hotel_id}&stay_date=#{checkin_date}&stay_count=1&adult_num=#{adult_num}&count=1"
+    def get_min_price params
+      url = "http://jws.jalan.net/APIAdvance/StockSearch/V1/?key=#{@config[:jalan_api_key]}&h_id=#{@config[:jalan_hotel_id]}&stay_date=#{params[:checkin_date]}&stay_count=1&adult_num=#{params[:adult_num]}&count=1"
       puts url
       doc = Nokogiri::XML(open(url))
       if doc.css("NumberOfResults").text == "0"
         {
           date: DateTime.now.strftime("%Y-%m-%d"),
+          jalan_hotel_id: @config[:jalan_hotel_id],
+          checkin_date: params[:checkin_date],
           plan_num: 0,
           min_price: 0
         }
       else
         {
           date: DateTime.now.strftime("%Y-%m-%d"),
+          jalan_hotel_id: @config[:jalan_hotel_id],
+          checkin_date: params[:checkin_date],
           hotel_name: doc.css("Plan").css("Hotel HotelName").text,
           room_name: doc.css("Plan").css("RoomName").text,
           plan_name: doc.css("Plan").css("PlanName").text,

data/lib/hotel_price/rakuten/rakuten_api.rb

@@ -7,6 +7,56 @@ module HotelPrice::Rakuten
       }
     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/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Fumitake Kawasaki
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.9
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +74,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.141'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: