hotel_price 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a82631788a305757b3d0bffbe8298a441fba18511d678a80c20a2e045f9d408
-  data.tar.gz: 8eadeb31ec3d5f4e2dc179f51e15cf3bd2955b5a5afdf8c427ab68f565880833
+  metadata.gz: fb5d2bbe6a153d6df58d558653addef88e4b54c83e5d9fc2784e8b9cb5e1a911
+  data.tar.gz: eb2f765f334d8c22827df5877356be34a74a114f91909439ce2efc43dc166c8a
 SHA512:
-  metadata.gz: 1f1cf23d50086583c2096adefcd7a207cad65e775a5810c8e89ea0690a4a4995cff6dd8c0d2fe88dd59569f5768b1271c9cbe5ad09aa6348c6173dc51ee0b29a
-  data.tar.gz: d254d83f23aabb34bc1164b8d263cecc13d2fc26d7b4ca4a63401399245304f05c786384ed18eda81e3bb84621386e930c4d59b4442aab7dd9068d9383057346
+  metadata.gz: 38428d2d3bcd9098d1d18050901bfe75ed5042be5b93a49d24bd45c0eb5bc7d9a270c0d0c3265c6ec8fdabb949a2ba5e0ee5269312b2dc141a69c826767befe7
+  data.tar.gz: 4958ec209501d14d06d58bf9ddf6c1df34bacf78a6f0cd3da7a1fbd17084cce69978854848e6d5d301f5645967665665c226d0aef300fac05414408b9de643ba

data/.gitignore

@@ -8,6 +8,6 @@
 /tmp/
 /.envrc
 .idea
-
+.DS_Store
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -1,49 +1,33 @@
-# target_version:
-#   rubocop v0.34.2
-
-# 自動生成されるものはチェック対象から除外する
 AllCops:
-  Exclude:
-    - "vendor/**/*" # rubocop config/default.yml
-    - "db/schema.rb"
-    - "db/migrate/*"
-  DisplayCopNames: true
-  TargetRubyVersion: 2.6.5
+  EnabledByDefault: true
+
+Style/AndOr:
+  Enabled: false
 
-##################### Style ##################################
 Style/ClassAndModuleChildren:
   Enabled: false
-# redirect_to xxx and return のイディオムを維持したい
-Style/AndOr:
-  EnforcedStyle: conditionals
 
-# 日本語のコメントを許可する
 Style/AsciiComments:
   Enabled: false
 
-# do .. end から更にメソッドチェーンすると見づらいので
-# auto-correct せず、自分で修正する
-# spec 内は見た目が綺麗になるので許可
-Style/BlockDelimiters:
-  AutoCorrect: false
-  Exclude:
-    - "spec/**/*"
+Style/SymbolArray:
+  Enabled: false
+
+Style/WordArray:
+  Enabled: false
+
+Style/MixinGrouping:
+  Enabled: false
+
+Style/RescueStandardError:
+  Enabled: false
+
+Style/MethodCallWithArgsParentheses:
+  Enabled: false
+
+Style/DocumentationMethod:
+  Enabled: false
 
-# option 等、明示的にハッシュにした方が分かりやすい場合もある
-Style/BracesAroundHashParameters:
-  Enabled: false
-
-# Style/CollectionMethods 自体は無効になっているのだが、
-#   https://github.com/bbatsov/rubocop/issues/1084
-#   https://github.com/bbatsov/rubocop/issues/1334
-# Performance/Detect がこの設定値を見るので PreferredMethods だけ変更しておく。
-#
-# デフォルト値から変えたのは
-#   find -> detect
-#     ActiveRecord の find と間違えやすいため
-#   reduce -> inject
-#     detect, reject, select と並べたときに韻を踏んでいるため。
-#     collect -> map を維持しているのは文字数が圧倒的に少ないため。
 Style/CollectionMethods:
   PreferredMethods:
     detect: "detect"
@@ -51,152 +35,104 @@ Style/CollectionMethods:
     inject: "inject"
     reduce: "inject"
 
-# ドキュメントの無い public class を許可する
 Style/Documentation:
   Enabled: false
 
-# !! のイディオムは積極的に使う
 Style/DoubleNegation:
   Enabled: false
 
-# MethodDefParentheses:
-#   EnforcedStyle: require_no_parentheses
-  
-# メソッドチェーンの改行は末尾に . を入れる
-# REPL に貼り付けた際の暴発を防ぐため
+Lint/ConstantResolution:
+  Enabled: false
+
 Layout/DotPosition:
   EnforcedStyle: trailing
 
-Layout/LineLength:
-  Enabled: false
 
 Layout/EmptyLineAfterGuardClause:
    Enabled: false
 
-# 明示的に else で nil を返すのは分かりやすいので許可する
 Style/EmptyElse:
   EnforcedStyle: empty
 
-# 桁揃えが綺麗にならないことが多いので migration は除外
 Layout/ExtraSpacing:
   Exclude:
     - "db/migrate/*.rb"
 
-# いずれかに揃えるのならば `sprintf` や `format` より String#% が好きです
 Style/FormatString:
   EnforcedStyle: percent
 
-# if 文の中に 3 行程度のブロックを書くぐらいは許容した方が現実的
+Style/MissingElse:
+  Enabled: false
+
+Style/StringHashKeys:
+  Exclude:
+    - "spec/queries/*.rb"
+    - "*.gemspec"
+
 Style/GuardClause:
   MinBodyLength: 5
 
-# rake タスクの順序の hash は rocket を許可する
 Style/HashSyntax:
   EnforcedStyle: ruby19
+  Exclude:
+    - "**/*.rake"
+    - "Rakefile"
 
-
-# 条件式の方を意識させたい場合には後置の if/unless を使わない方が分かりやすい
 Style/IfUnlessModifier:
   Enabled: false
 
-# private/protected は一段深くインデントする
 Style/PreferredHashMethods:
   EnforcedStyle: short
 
-# scope 等は複数行でも lambda ではなく ->{} で揃えた方が見た目が綺麗
 Style/Lambda:
   Enabled: false
 
-# 1_000_000 と区切り文字が 2 個以上必要になる場合のみ _ 区切りを必須にする
 Style/NumericLiterals:
   MinDigits: 7
 
-# 正規表現にマッチさせた時の特殊変数の置き換えは Regex.last_match ではなく
-# 名前付きキャプチャを使って参照したいので auto-correct しない
 Style/PerlBackrefs:
   AutoCorrect: false
 
-# has_ から始まるメソッドは許可する
-Naming/PredicateName:
-  ForbiddenPrefixes:
-    - "is_"
-    - "have_"
-  NamePrefix:
-    - "is_"
-    - "have_"
-
-# 特に model 内において、ローカル変数とメソッド呼び出しの区別をつけた方が分かりやすい場合が多い
 Style/RedundantSelf:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# 受け取り側で multiple assignment しろというのを明示
 Style/RedundantReturn:
   AllowMultipleReturnValues: true
 
-# spec 内は見た目が綺麗になるので許可
 Style/Semicolon:
   Exclude:
     - "spec/**/*"
 
-# fail と使い分ける必要ナシ
 Style/SignalException:
   EnforcedStyle: only_raise
 
 Style/MethodDefParentheses:
   Enabled: false
 
-# `||` も align に使うことがあるので追加する
-# Style/SpaceAroundOperators:
-#   MultiSpaceAllowedForOperators:
-#     - "="
-#     - "=>"
-#     - "||"
-
-# * 式展開したい場合に書き換えるのが面倒
-# * 文章ではダブルクォートよりもシングルクォートの方が頻出する
-# ことから EnforcedStyle: double_quotes 推奨
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-# auto-correct 時に Style/StringLiterals とカニバって無限ループになる (v0.28.0)
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
-# いくらなんでも inject { |a, e| } は短すぎるので分かりやすい名前をつけたい
 Style/SingleLineBlockParams:
   Enabled: false
 
-# * migrate
-# * jbuilder
-# * model の association
-# * controller の callback
-# 辺りの桁揃えで引っかかるので全体的にチェックしない
-# Style/SingleSpaceBeforeFirstArg:
-#   Enabled: false
-
-
-##################### Lint ##################################
-
-# * 同名のメソッドがある場合にローカル変数に `_` を付ける
-# * 一時変数として `_` を付ける
-# というテクニックは頻出する
 Lint/UnderscorePrefixedVariableName:
   Enabled: false
 
-# 子クラスで実装させるつもりのメソッドで引っかかるので
 Lint/UnusedMethodArgument:
   Enabled: false
 
-##################### Metrics ##################################
 
 Metrics/AbcSize:
   Enabled: false
 
 Metrics/CyclomaticComplexity:
-  Enabled: false
+  Max: 10
 
 Metrics/PerceivedComplexity:
   Enabled: false
@@ -204,6 +140,10 @@ Metrics/PerceivedComplexity:
 Metrics/BlockLength:
   Enabled: false
 
+Layout/LineLength:
+  Enabled: false
+  
+
 Metrics/MethodLength:
   Enabled: false
 
@@ -216,14 +156,35 @@ Naming/HeredocDelimiterNaming:
 Naming/AccessorMethodName:
   Enabled: false
 
-Style/MutableConstant:
+Metrics/ModuleLength:
   Enabled: false
 
-Lint/NonDeterministicRequireOrder:
+Lint/UnusedBlockArgument:
   Enabled: false
 
-Style/RescueModifier:
+Lint/RescueException:
   Enabled: false
 
-Style/RegexpLiteral:
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+
+Bundler/GemComment:
+  Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Lint/NumberConversion:
+  Enabled: false
+Style/ConstantVisibility:
+  Enabled: false
+Style/MutableConstant:
+  Enabled: false
+Style/Copyright:
+  Enabled: false
+Style/MultilineTernaryOperator:
+  Enabled: false
+Layout/MultilineAssignmentLayout:
+  Enabled: false
+Style/Send:
   Enabled: false

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    hotel_price (0.5.3)
-      activesupport (~> 6.0.2.1)
-      json (~> 2.3.0)
+    hotel_price (0.5.9)
+      activesupport (~> 6.0.2.2)
+      json (~> 2.3.1)
       nokogiri (~> 1.10.9)
       selenium-webdriver (~> 3.141)
 
@@ -18,28 +18,28 @@ GEM
       zeitwerk (~> 2.2)
     childprocess (3.0.0)
     concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    i18n (1.8.2)
+    diff-lcs (1.4.4)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
+    json (2.3.1)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    nokogiri (1.10.9)
+    minitest (5.14.1)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.3)
     rubyzip (2.3.0)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
@@ -47,7 +47,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -56,7 +56,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   hotel_price!
   rake (>= 12.3.3)
-  rspec (~> 3.0)
+  rspec (~> 3.9.0)
 
 BUNDLED WITH
    2.1.4

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/hotel_price.gemspec

@@ -8,20 +8,21 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Fumitake Kawasaki", "James Neve"]
   spec.email         = ["fumitake.kawasaki@el-soul.com", "jamesoneve@gmail.com"]
 
-  spec.summary       = %q{Scraping Library to get world hotel price}
-  spec.description   = %q{Empower World Travel Information Technology }
-  spec.homepage      = "https://github.com/el-fudo/hotel_price"
+  spec.summary       = "Scraping Library to get world hotel price"
+  spec.description   = "Empower World Travel Information Technology "
+  spec.homepage      = "https://github.com/elsoul/hotel_price"
   spec.license       = "MIT"
-  spec.metadata = { "source_code_uri" =>"https://github.com/el-fudo/hotel_price" }
+  spec.metadata = { "source_code_uri" => "https://github.com/elsoul/hotel_price" }
+  spec.required_ruby_version = ">= 2.7.0"
   # spec.metadata["allowed_push_host"] = "https://hotel.el-soul.com"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/el-fudo/hotel_price"
-  spec.metadata["changelog_uri"] = "https://github.com/el-fudo/hotel_price"
+  spec.metadata["source_code_uri"] = "https://github.com/elsoul/hotel_price"
+  spec.metadata["changelog_uri"] = "https://github.com/elsoul/hotel_price"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -30,9 +31,9 @@ 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_runtime_dependency "activesupport", "~> 6.0.2.1"
+  spec.add_development_dependency "rspec", "~> 3.9.0"
+  spec.add_runtime_dependency "activesupport", "~> 6.0.2.2"
+  spec.add_runtime_dependency "json", "~> 2.3.1"
   spec.add_runtime_dependency "nokogiri", "~> 1.10.9"
   spec.add_runtime_dependency "selenium-webdriver", "~> 3.141"
-  spec.add_runtime_dependency "json", "~> 2.3.0"
 end

data/lib/hotel_price.rb

@@ -23,7 +23,7 @@ module HotelPrice
   def self.rakuten_travel
     driver = self.get_selenium_driver
     rakuten_travel_hotel_id = 128552
-    driver.get("https://travel.rakuten.co.jp/HOTEL/#{rakuten_travel_hotel_id.to_s}/review.html")
+    driver.get("https://travel.rakuten.co.jp/HOTEL/#{rakuten_travel_hotel_id}/review.html")
     sleep 2
     comment_area = driver.find_elements(:class_name, "commentReputationBoth")
     comment_area.map do |f|
@@ -38,17 +38,20 @@ 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::Firefox::Options.new
+      options = Selenium::WebDriver::Chrome::Options.new
+      options.add_argument("--ignore-certificate-errors")
+      options.add_argument("--disable-popup-blocking")
+      options.add_argument("--disable-translate")
       options.add_argument("-headless")
-      Selenium::WebDriver.for :firefox, options: options
+      Selenium::WebDriver.for :chrome, options: options
     end
   end
 
@@ -58,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
 
@@ -23,23 +29,23 @@ 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)
+    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

@@ -2,13 +2,18 @@ require "date"
 
 module HotelPrice::Booking
   class BookingScraper
+    @mode
 
-    def self.get_price(booking_hotel_id, checkin_date, num_adults, mode = 0)
+    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
 
@@ -26,16 +31,16 @@ 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)
+    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,9 +48,9 @@ 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
   end
-end
+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
 
@@ -23,16 +29,16 @@ 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)
+    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/expedia/jalan/jalan_api.rb

@@ -0,0 +1,41 @@
+module HotelPrice::Jalan
+  require "nokogiri"
+  require "open-uri"
+  class JalanAPI
+    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
+      @config[:jalan_api_key]
+    end
+
+    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))
+      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,
+          plan_num: doc.css("NumberOfResults").text,
+          min_price: doc.css("Plan").css("Stay Rate").text
+        }
+      end
+    end
+  end
+end

data/lib/hotel_price/expedia/jalan/jalan_console.rb

@@ -0,0 +1,12 @@
+module HotelPrice::Jalan
+  class JalanConsole
+    def initialize params
+      @config = {
+        login_id: params[:login_id],
+        login_pw: params[:login_pw],
+        chain: params[:chain] ||= false,
+        jalan_hotel_id: params[:jalan_hotel_id] ||= 0
+      }
+    end
+  end
+end

data/lib/hotel_price/expedia/jalan/jalan_scraper.rb

@@ -0,0 +1,53 @@
+module HotelPrice::Jalan
+  class JalanScraper
+    @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.get(url)
+      sleep 2
+      @price_box = []
+      driver.find_elements(class_name: "p-planCassette").each do |f|
+        rows = f.find_elements(:xpath, "//tr")
+        rows.each do |e|
+          @price_box << {
+            date: date,
+            min_price: e.find_element(class_name: "p-searchResultItem__total").text.delete("^0-9").to_i,
+            hotel_name: driver.find_element(id: "yado_header_hotel_name").text,
+            room_name: e.find_element(class_name: "p-searchResultItem__planName").text,
+            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 || { date: date, min_price: 0 }
+    rescue StandardError
+      { date: date, min_price: 0 }
+    end
+
+    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 make_date_args checkin_date
+      Date.parse checkin_date rescue return ""
+      Date.parse(checkin_date).strftime("stayYear=%Y&stayMonth=%m&stayDay=%d")
+    end
+
+    def make_num_adults_arg num_adults
+      return "" if num_adults.to_i < 1
+      "adultNum=#{num_adults}"
+    end
+  end
+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 = []
@@ -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/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

@@ -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]
@@ -320,14 +320,12 @@ module HotelPrice::Rakuten
     def login_check
       exp = @driver.find_element(:xpath, "/html/body/table[1]/tbody/tr[1]/td/table/tbody/tr/td[5]/table/tbody/tr[1]/td").text.gsub("次回パスワード更新日：", "").gsub("※事前にパスワードを変更されたい場合はこちらをご参照ください。\n", "")
       rakuten_hotel_id = @driver.find_element(:xpath, "/html/body/table[1]/tbody/tr[1]/td/table/tbody/tr/td[2]/table/tbody/tr/td").text.gsub("施設番号 : ", "").split("\n")[0]
-      @driver.quit
       {
         status: "success",
         password_exp_date: exp,
         rakuten_hotel_id: rakuten_hotel_id
       }
     rescue StandardError => e
-      @driver.quit
       {
         status: "error",
         error: e.to_s
@@ -462,7 +460,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 +473,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

@@ -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,31 +85,28 @@ 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
-      sleep 30
+      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 10
-      driver.find_element(:id, "du-radio").click
-      driver.find_element(:id, "dh-submit").click
-      sleep 10
+    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.4"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 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-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,70 +45,70 @@ 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
+        version: '3.141'
 description: 'Empower World Travel Information Technology '
 email:
 - fumitake.kawasaki@el-soul.com
@@ -118,7 +118,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -143,6 +142,9 @@ files:
 - lib/hotel_price/configuration.rb
 - lib/hotel_price/expedia.rb
 - lib/hotel_price/expedia/expedia_scraper.rb
+- lib/hotel_price/expedia/jalan/jalan_api.rb
+- lib/hotel_price/expedia/jalan/jalan_console.rb
+- lib/hotel_price/expedia/jalan/jalan_scraper.rb
 - lib/hotel_price/jalan.rb
 - lib/hotel_price/jalan/jalan_api.rb
 - lib/hotel_price/jalan/jalan_console.rb
@@ -152,13 +154,13 @@ files:
 - 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
 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,14 +169,14 @@ 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