hotel_price 0.5.5 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 936bc9b0a0c708967b88a86509f12e5a677f2b2ee6bcd88698154e801935418e
-  data.tar.gz: 01e264e7b9391bcb5e8f872f5097673665d2135c60ef94033a0b370105a7f376
+  metadata.gz: bf5eb6642b98241831c3b8fef53d49d36e3831739ab7c71638300a70529cc361
+  data.tar.gz: 4acb833993a48783844fc6907eafe1845fd445e63bf7412c2b044da40071799c
 SHA512:
-  metadata.gz: f8d200030f6757cea8ab13a2d93264bb1f34aff18784b93ad74f6295e6f6f54b5d3512276d4122cb99dcbcf601ca9f66abf2616e3889c022ca487dbc06a3d683
-  data.tar.gz: 438aaefa420b71023d57f6df72ee33f262347e54a8afdcda01a9f96607149aa32d51daf7751124f3853eab59f64f2e63ef1abb458bed6f46363b6ee27899ff52
+  metadata.gz: 9bc3d11d78a5ec661800ee5bd9fe8957d75fde7c5388401bb36882e43b30c9c92c928f3f93048bbd3bdbda604074beb558d1b2da073394d5200606dd32ca3c48
+  data.tar.gz: b18e19c6bba93f835aca3bf5766b6660d21caaa279a5ea809ac6a80b099a6037f40d4aa9833b875671cb43ad836053b55eafca4a16f36e8445a5846f70c25adb

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.4)
-      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/LICENSE.txt

@@ -1,21 +1,67 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Fumitake Kawasaki
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+Copyright 2020 ELSOUL, INC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -1,3 +1,22 @@
+[![HotelPrice](https://firebasestorage.googleapis.com/v0/b/el-quest.appspot.com/o/mediaLibrary%2F1589293505170_rakuten-shoken.jpg?alt=media&token=f86b6870-fd3f-42aa-805d-db35cb53a9b6)](https://rubygems.org/gems/hotel_price/)
+
+<p align="center">
+
+  <a aria-label="Ruby logo" href="https://el-soul.com">
+    <img src="https://badgen.net/badge/icon/Made%20by%20ELSOUL?icon=ruby&label&color=black&labelColor=black">
+  </a>
+  <br/>
+
+  <a aria-label="Ruby Gem version" href="https://rubygems.org/gems/hotel_price">
+    <img alt="" src="https://badgen.net/rubygems/v/hotel_price/latest">
+  </a>
+  <a aria-label="Downloads Number" href="https://rubygems.org/gems/hotel_price">
+    <img alt="" src="https://badgen.net/rubygems/dt/hotel_price">
+  </a>
+  <a aria-label="License" href="https://github.com/elsoul/hotel_price/blob/master/LICENSE">
+    <img alt="" src="https://badgen.net/badge/license/Apache/blue">
+  </a>
+</p>
 # HotelPrice
 This Gem is made for ppl who work at travel industry
 
@@ -31,7 +50,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"
 )
@@ -56,7 +75,7 @@ HotelPrice::Rakuten::RakutenScraper.get_price("128552", (Date.today + 45.day).to
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org/gems/hotel_price).
 
 ## Contributing
 

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.license       = "MIT"
-  spec.metadata = { "source_code_uri" =>"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       = "Apache-2.0"
+  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
 
@@ -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

@@ -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
 
@@ -29,13 +34,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,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
 
@@ -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 = []
@@ -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_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

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.5"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.1
 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-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"
@@ -152,13 +151,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
+- 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,14 +166,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