hotel_price 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b5a3b50fe4081d4f8a3415fda4e9cef549945952e4dff0ed857edb01821734
-  data.tar.gz: afc2199c849cd59933eaa515ec9456dfd0bc0b69174d852a5aabedc4a2998df2
+  metadata.gz: bc76b623cc53e04ce6b4e2b0c065c6cb70c4ee24f38ac6addc5a2c9ea22c04e3
+  data.tar.gz: 9818d73af51d8a53cf4e045defb37b328ca3d43bc0e1752eb2778c17805cbe7c
 SHA512:
-  metadata.gz: 5e32918fc77c7808cc81d11c9f3b21935cc983c923305046d4f8a49fdb9a771a1fcf5b367afe0018bc89e46016d210376c1bb08ca9ef78575ff83d995b7bbca2
-  data.tar.gz: b98c58be5c87b6823ce9b9dc59ffbf63f14aaa38d9bf9acccebd1de3c3da81241b7254c45025e7cc8ce8d43990a9e78f5adce669ae60157f033d511f68c0e784
+  metadata.gz: 68c6d5beaae5c53e71fdebf1122b8db3fe4e6c7d887fa1dd1acc1e58d1bf07b3947038942cb8872d623e08340b26f86e0d1db433960fbba43d792d7366ded705
+  data.tar.gz: 16144d0302ea1aa7b260639bcd8d41ae0c6c8899ad579228490d7c1509f9c997ef1f0f1e92a84122b5c619b00e0d3bc333c2effd243c77be67483b25410ea65b

data/lib/hotel_price/rakuten/rakuten_console.rb

@@ -5,16 +5,11 @@ module HotelPrice::Rakuten
         login_id: params[:login_id],
         login_pw: params[:login_pw],
         chain: params[:chain] ||= false,
-        rakuten_hotel_id: params[:rakuten_hotel_id] ||= 0
+        rakuten_hotel_id: params[:rakuten_hotel_id] ||= 0,
+        mode: params[:mode] ||= 0
       }
-      @wait = Selenium::WebDriver::Wait.new(:timeout => 100)
-      # For Local Headless
-      # options = Selenium::WebDriver::Firefox::Options.new
-      # options.add_argument("-headless")
-      # @driver = Selenium::WebDriver.for :firefox, options: options
-      
-      firefox_capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
-      @driver = Selenium::WebDriver.for(:remote, url: "http://hub:4444/wd/hub", desired_capabilities: firefox_capabilities)
+      @wait = Selenium::WebDriver::Wait.new(timeout: 100)
+      @driver = get_selenium_driver @config[:mode]
       if @config[:chain]
         go_to_management_page_chain
       else
@@ -22,6 +17,19 @@ module HotelPrice::Rakuten
       end
     end
 
+    def get_selenium_driver(mode = 0)
+      if mode == 1
+        firefox_capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
+        Selenium::WebDriver.for(:remote, url: "http://hub:4444/wd/hub", desired_capabilities: firefox_capabilities)
+      elsif mode == 2
+        Selenium::WebDriver.for :firefox
+      else
+        options = Selenium::WebDriver::Firefox::Options.new
+        options.add_argument("-headless")
+        Selenium::WebDriver.for :firefox, options: options
+      end
+    end
+
     def go_to_management_page_chain
       @driver.get "https://manage.travel.rakuten.co.jp/portal/inn/ry_group.main"
       @driver.find_element(:name, "f_id").send_keys @config[:login_id].to_s
@@ -104,7 +112,7 @@ module HotelPrice::Rakuten
       (0..@plans.size - 1).each do |i|
         plan = RakutenPlan.find_by(manage_number: @data[i][:manage_number])
         @driver.find_element(:link_text, @data[i][:plan_name]).click
-        status = @driver.find_element(:xpath, "/html/body/form[4]/table[1]/tbody/tr/td/table/tbody[1]/tr[3]/td[2]").text
+        @driver.find_element(:xpath, "/html/body/form[4]/table[1]/tbody/tr/td/table/tbody[1]/tr[3]/td[2]").text
         flag = []
         flag[0] = "楽天トラベル[宿泊のみ]" if @driver.find_element(:name, "f_tabi_flg").selected?
 
@@ -288,7 +296,7 @@ module HotelPrice::Rakuten
           room_size_tatami = ""
         end
         (0..5).each do |i|
-          room_category = @driver.find_element(:id, "view2_type_#{i}").attribute("value") if @driver.find_element(:id, "view2_type_#{i}").selected?
+          @driver.find_element(:id, "view2_type_#{i}").attribute("value") if @driver.find_element(:id, "view2_type_#{i}").selected?
         end
 
         # Pause sort
@@ -331,7 +339,7 @@ module HotelPrice::Rakuten
         password_exp_date: exp,
         rakuten_hotel_id: rakuten_hotel_id
       }
-    rescue => e
+    rescue StandardError => e
       @driver.quit
       {
         status: "error",
@@ -340,7 +348,7 @@ module HotelPrice::Rakuten
     end
 
     def get_area_seo_rank
-      ranking_page = @driver.find_element(:xpath, "/html/body/table[2]/tbody/tr/td[3]/table[1]/tbody/tr[2]/td/table/tbody/tr[1]/td[5]/table/tbody/tr/td/table[1]/tbody/tr[5]/td[2]/font/b")
+      @driver.find_element(:xpath, "/html/body/table[2]/tbody/tr/td[3]/table[1]/tbody/tr[2]/td/table/tbody/tr[1]/td[5]/table/tbody/tr/td/table[1]/tbody/tr[5]/td[2]/font/b")
       rows = @driver.find_elements(:xpath, "/html/body/table[2]/tbody/tr/td[3]/table[1]/tbody/tr[2]/td/table/tbody/tr[1]/td[5]/table/tbody/tr/td/table[1]/tbody/tr[5]")
       rows.each do |f|
         cells = f.find_elements(:css, "td").map(&:text)
@@ -355,7 +363,7 @@ module HotelPrice::Rakuten
 
     def get_reservation_info
       t = Time.now
-      management_page = @driver.find_element(:xpath, "/html/body/table[2]/tbody/tr/td[3]/table[3]/tbody/tr[2]/td[2]/table/tbody/tr[3]/td/input").click
+      @driver.find_element(:xpath, "/html/body/table[2]/tbody/tr/td[3]/table[3]/tbody/tr[2]/td[2]/table/tbody/tr[3]/td/input").click
       if t.day == 1
         last_month = degit2 t.prev_month.month.to_i
         yesterday = degit2 t.prev_month.end_of_month.day.to_i
@@ -472,8 +480,8 @@ module HotelPrice::Rakuten
     end
 
     def daily_data_update
-      green_tab = @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
-      karute_button = @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
+      @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
       if Time.now.day == 1
       else
@@ -485,7 +493,7 @@ module HotelPrice::Rakuten
         select = Selenium::WebDriver::Support::Select.new(@driver.find_element(:name, "f_date"))
         select.select_by(:value, value)
       end
-      display_data = @driver.find_element(:xpath, '//input[@value = "表示"]').click
+      @driver.find_element(:xpath, '//input[@value = "表示"]').click
       rows = @driver.find_elements(:xpath, "//tr")
       rows[27..58].each do |row|
         cells = row.find_elements(:css, "td[align=RIGHT]").map { |a| a.text.strip.gsub(",", "") }
@@ -514,9 +522,9 @@ module HotelPrice::Rakuten
     end
 
     def monthly_data_past
-      karute_button = @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
-      karute_page = @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[2]/input").click
-      month_karute = @driver.find_element(:xpath, "/html/body/center/table[1]/tbody/tr[2]/td/table/tbody/tr[2]/td/form/input[8]").click
+      @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[2]/input").click
+      @driver.find_element(:xpath, "/html/body/center/table[1]/tbody/tr[2]/td/table/tbody/tr[2]/td/form/input[8]").click
       rows = @driver.find_elements(:xpath, "//tr")
       rows[19..31].each do |row|
         cells = row.find_elements(:css, "td").map { |a| a.text.strip.gsub(",", "") }
@@ -548,4 +556,4 @@ module HotelPrice::Rakuten
       @driver.quit
     end
   end
-end
+end

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

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