hotel_price 0.5.6 → 0.6.2

data/lib/hotel_price/jalan.rb

@@ -1,5 +1,4 @@
 require_relative "./jalan/jalan_api"
-require_relative "./jalan/jalan_console"
 require_relative "./jalan/jalan_scraper"
 
 module HotelPrice

data/lib/hotel_price/jalan/jalan_api.rb

@@ -15,7 +15,7 @@ module HotelPrice::Jalan
 
     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"
-      doc = Nokogiri::XML(open(url))
+      doc = Nokogiri::XML(url)
       if doc.css("NumberOfResults").text == "0"
         {
           date: DateTime.now.strftime("%Y-%m-%d"),

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 = []
@@ -20,25 +26,26 @@ module HotelPrice::Jalan
             plan_name: f.find_element(class_name: "p-planCassette__header").text
           }
         rescue StandardError
+          { date: date, min_price: 0 }
         end
       end
-      @price_box.sort_by { |_a, _b, c| c }.reverse.first
+      @price_box.sort_by { |_a, _b, c| c }.reverse.first || { date: date, min_price: 0 }
     rescue StandardError
       { 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.rb

@@ -1,5 +1,4 @@
 require_relative "./rakuten/rakuten_api"
-require_relative "./rakuten/rakuten_console"
 require_relative "./rakuten/rakuten_scraper"
 
 module HotelPrice

data/lib/hotel_price/rakuten/rakuten_api.rb

@@ -14,7 +14,7 @@ module HotelPrice::Rakuten
       result = JSON.parse(json)
       if result["error"] == "not_found"
         {
-          date: DateTime.now.strftime("%Y-%m-%d"),
+          date: Time.now.strftime("%Y-%m-%d"),
           checkin_date: checkin_date,
           rakuten_hotel_id: @config[:rakuten_hotel_id],
           adult_num: num_adults,
@@ -45,118 +45,5 @@ 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 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)
-      result = JSON.parse(json)
-      return "ホテル情報がありませんでした。" if result["error"] == "not_found"
-      return result["error_description"] if result["error"] == "wrong_parameter"
-      result["hotels"][0].each do |_key, field|
-        field[0].each do |_, value|
-          @data_hash = {
-            rakuten_hotel_id: value["hotelNo"],
-            hotel_name: value["hotelName"],
-            room_price_min: value["hotelMinCharge"],
-            lat: value["latitude"],
-            lon: value["longitude"],
-            tel: value["telephoneNo"],
-            zip_code: value["postalCode"],
-            prefecture: value["address1"],
-            address1: value["address2"],
-            fax: value["faxNo"],
-            access: value["access"],
-            parking_info: value["parkingInformation"],
-            near_station: value["nearestStation"],
-            hotel_img_url: value["hotelImageUrl"],
-            rakuten_review_count: value["reviewCount"],
-            rakuten_review_avg: value["reviewAverage"].to_f
-          }
-        end
-      end
-      result["hotels"][0].each do |_key, field|
-        field[1].each do |_, value|
-          @data_hash[:rakuten_service_review] = value["serviceAverage"].to_f
-          @data_hash[:rakuten_location_review] = value["locationAverage"].to_f
-          @data_hash[:rakuten_room_review] = value["roomAverage"].to_f
-          @data_hash[:rakuten_equipment_review] = value["equipmentAverage"].to_f
-          @data_hash[:rakuten_bath_review] = value["bathAverage"].to_f
-          @data_hash[:rakuten_meal_review] = value["mealAverage"].to_f
-        end
-      end
-      result["hotels"][0].each do |_key, field|
-        field[2].each do |_, value|
-          @data_hash[:middle_class_code] = value["middleClassCode"].to_s
-          @data_hash[:small_class_code] = value["smallClassCode"].to_s
-          @data_hash[:area_name] = value["areaName"].to_s
-          @data_hash[:hotel_class_code] = value["hotelClassCode"].to_s
-          @data_hash[:checkin_time] = value["checkinTime"].to_s
-          @data_hash[:checkout_time] = value["checkoutTime"].to_s
-          @data_hash[:last_checkin_time] = value["lastCheckinTime"].to_s
-        end
-      end
-      result["hotels"][0].each do |_key, field|
-        field[3].each do |_, value|
-          @data_hash[:total_room_num] = value["hotelRoomNum"].to_s
-          room_facilities = []
-          value["roomFacilities"].each_with_index do |f, i|
-            room_facilities[i] = f["item"]
-          end
-          @data_hash[:room_facilities] = room_facilities
-        end
-      end
-      result["hotels"][0].each do |_key, field|
-        field[4].each do |_, value|
-          @data_hash[:hotel_policy_note] = value["note"].to_s
-          @data_hash[:cancel_policy] = value["cancelPolicy"].to_s
-        end
-      end
-      @data_hash
-    end
-
-    def search_ranking params
-      body = {
-        middle_class_code: params[:middle_class_code],
-        small_class_code: params[:small_class_code],
-        detail_class_code: params[:detail_class_code],
-        page_num: params[:page_num]
-      }
-      url = "https://app.rakuten.co.jp/services/api/Travel/SimpleHotelSearch/20170426?applicationId=#{@config[:rakuten_api_key]}&largeClassCode=japan&middleClassCode=#{body[:middle_class_code]}&smallClassCode=#{body[:small_class_code]}&detailClassCode=#{body[:detail_class_code]}&page=#{body[:page_num]}"
-      uri = URI.parse(url)
-      json = Net::HTTP.get(uri)
-      result = JSON.parse(json)
-      i = 1
-      result["hotels"].each do |key, _value|
-        if @config[:rakuten_hotel_id] == key["hotel"][0]["hotelBasicInfo"]["hotelNo"].to_s
-          return {
-            status: "found",
-            hotel_name: key["hotel"][0]["hotelBasicInfo"]["hotelName"],
-            area_name: body[:area_name],
-            page_num: params[:page_num],
-            area_rank: i.to_i + ((body[:page_num].to_i - 1) * 30),
-            middle_class_code: body[:middle_class_code],
-            small_class_code: body[:small_class_code],
-            detail_class_code: body[:detail_class_code]
-          }
-        end
-        i += 1
-      end
-      { status: "not_found" }
-    end
-
-    def get_page_num detail_class_code
-      hotel = hotel_info
-      url = "https://app.rakuten.co.jp/services/api/Travel/SimpleHotelSearch/20170426?applicationId=#{@config[:rakuten_api_key]}&largeClassCode=japan&middleClassCode=#{hotel[:middle_class_code]}&smallClassCode=#{hotel[:small_class_code]}&detailClassCode=#{detail_class_code}"
-      uri = URI.parse(url)
-      json = Net::HTTP.get(uri)
-      result = JSON.parse(json)
-      {
-        small_class_code: hotel[:small_class_code],
-        middle_class_code: hotel[:middle_class_code],
-        detail_class_code: detail_class_code,
-        area_name: hotel[:area_name].to_s,
-        page_num: result["pagingInfo"]["pageCount"].to_i
-      }
-    end
   end
 end

data/lib/hotel_price/rakuten/rakuten_scraper.rb

@@ -1,14 +1,17 @@
 module HotelPrice::Rakuten
-  ## mode 0 - headless
-  ## mode 1 - docker selenium
-  ## mode 2 - debug
   class RakutenScraper
-    def self.get_price(rakuten_hotel_id, checkin_date, num_adults, mode = 0)
-      date = DateTime.now.strftime("%Y-%m-%d")
+    @mode
+
+    def initialize(mode = :chrome)
+      @mode = mode
+    end
+
+    def get_price(rakuten_hotel_id, checkin_date, num_adults)
+      date = Time.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 +25,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,84 +39,9 @@ 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
-      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|
-        if f.find_element(class_name: "user").text.include?("投稿者さん")
-          username = f.find_element(class_name: "user").text
-          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("代", "")
-          gender = f.find_element(class_name: "user").text.match(/\/../).to_s.gsub("/", "")
-        end
-        {
-          date: f.find_element(class_name: "time").text.gsub("年", "").gsub("月", "").gsub("日", ""),
-          rate: f.find_element(class_name: "rate").text,
-          username: username,
-          generation: generation,
-          gender: gender,
-          rakuten_hotel_id: rakuten_hotel_id,
-          comment: f.find_element(class_name: "commentSentence").text
-        }
-      end
-      driver.quit
-      data
-    end
-
-    def self.get_photo_num rakuten_hotel_id, mode = 0
-      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
-      driver.quit
-      num
-    end
-
-    def self.get_bf_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}"
-      driver.find_element(:id, "focus1").click
-      driver.find_element(:id, "dh-squeezes-submit").click
-      sleep 3
-      plan_num = driver.find_elements(:class, "planThumb")
-      driver.quit
-      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
-      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
-      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 StandardError
-      {
-        status: "not_found",
-        detail_class_code: ""
-      }
-    end
   end
 end

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.5.6"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.2
 platform: ruby
 authors:
 - Fumitake Kawasaki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,71 +45,71 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: 6.0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: 6.0.2.2
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.141'
+        version: 1.10.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.141'
+        version: 1.10.9
 - !ruby/object:Gem::Dependency
-  name: json
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '3.141'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
-description: 'Empower World Travel Information Technology '
+        version: '3.141'
+description: Webcrawler for checking booking price of travel agencies.
 email:
 - fumitake.kawasaki@el-soul.com
 - jamesoneve@gmail.com
@@ -118,7 +118,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -145,20 +144,18 @@ files:
 - lib/hotel_price/expedia/expedia_scraper.rb
 - lib/hotel_price/jalan.rb
 - lib/hotel_price/jalan/jalan_api.rb
-- lib/hotel_price/jalan/jalan_console.rb
 - lib/hotel_price/jalan/jalan_scraper.rb
 - lib/hotel_price/rakuten.rb
 - lib/hotel_price/rakuten/rakuten_api.rb
-- lib/hotel_price/rakuten/rakuten_console.rb
 - lib/hotel_price/rakuten/rakuten_scraper.rb
 - lib/hotel_price/version.rb
-homepage: https://github.com/el-fudo/hotel_price
+homepage: https://github.com/elsoul/hotel_price
 licenses:
-- MIT
+- Apache-2.0
 metadata:
-  source_code_uri: https://github.com/el-fudo/hotel_price
-  homepage_uri: https://github.com/el-fudo/hotel_price
-  changelog_uri: https://github.com/el-fudo/hotel_price
+  source_code_uri: https://github.com/elsoul/hotel_price
+  homepage_uri: https://github.com/elsoul/hotel_price
+  changelog_uri: https://github.com/elsoul/hotel_price
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -167,15 +164,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Scraping Library to get world hotel price
+summary: Webcrawler for checking booking price of travel agencies.
 test_files: []