hotel_price 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a89f55a297a504a6e9dc86a123dd336b5e762618f574a6b24749cfcfe394df00
-  data.tar.gz: 71eb4e9956b772b38316bc6ccf733146879417088cb28cc6f9ffde6984d0bc5c
+  metadata.gz: 0a82631788a305757b3d0bffbe8298a441fba18511d678a80c20a2e045f9d408
+  data.tar.gz: 8eadeb31ec3d5f4e2dc179f51e15cf3bd2955b5a5afdf8c427ab68f565880833
 SHA512:
-  metadata.gz: 56468f07606b0c207a96520a41ce403f45318ea0210482052993d0fd740a9008db83a7a0fb2eaa6f65ef53fd5b9c251fa1e01283313a29b03a5c255116c73b5f
-  data.tar.gz: dfa6d6f5f2f789ff86819a4b5e2d42dd303f79d090f302d8dcd698c2279566a5d5a13d209bcd972bab1f71263f23f079ae5c8483d440204dee5ac3c403a5d715
+  metadata.gz: 1f1cf23d50086583c2096adefcd7a207cad65e775a5810c8e89ea0690a4a4995cff6dd8c0d2fe88dd59569f5768b1271c9cbe5ad09aa6348c6173dc51ee0b29a
+  data.tar.gz: d254d83f23aabb34bc1164b8d263cecc13d2fc26d7b4ca4a63401399245304f05c786384ed18eda81e3bb84621386e930c4d59b4442aab7dd9068d9383057346

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hotel_price (0.5.2)
+    hotel_price (0.5.3)
       activesupport (~> 6.0.2.1)
       json (~> 2.3.0)
       nokogiri (~> 1.10.9)

data/README.md

@@ -26,11 +26,14 @@ Or install it yourself as:
 ### Rakuten Travel
 
 #### Rakuten API
-Set `rakuten_hotel_id` 
+Initialize with `rakuten_hotel_id` and `Rakuten Travel API key`
+Rakuten Travel API Reference : https://webservice.rakuten.co.jp/api/simplehotelsearch/
+
 
 ```ruby
-hotel = HotelPrice::RakutenTravel::RakutenAPI.new(
-  rakuten_hotel_id: "128552
+hotel = HotelPrice::Rakuten::RakutenScraper.new(
+  rakuten_hotel_id: "128552",
+  rakuten_api_key: "api_key"
 )
 ```
 
@@ -40,6 +43,15 @@ Get Hotel Info
 puts hotel.hotel_info
 ```
 
+
+### RakutenScraper
+Argments : `rakuten_hotel_id`, `YYYY-MM-DD`, `adult_nums`
+
+```ruby
+HotelPrice::Rakuten::RakutenScraper.get_price("128552", (Date.today + 45.day).to_s, 1)
+```
+
+
 ## Development
 
 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.

data/lib/hotel_price/rakuten/rakuten_api.rb

@@ -163,16 +163,6 @@ module HotelPrice::Rakuten
       @data_hash
     end
 
-    def get_area_rank
-      body = get_page_num
-      (1..body[:page_num]).each do |i|
-        body[:page_num] = i
-        rank = search_ranking(body)
-        return rank if rank[:status] == "found"
-      end
-      { status: "not_found" }
-    end
-
     def search_ranking params
       body = {
         middle_class_code: params[:middle_class_code],
@@ -203,8 +193,7 @@ module HotelPrice::Rakuten
       { status: "not_found" }
     end
 
-    def get_page_num
-      detail_class_code = HotelPrice::Rakuten::RakutenScraper.get_detail_class_code(@config[:rakuten_hotel_id])[:detail_class_code]
+    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)

data/lib/hotel_price/rakuten/rakuten_console.rb

@@ -334,14 +334,14 @@ module HotelPrice::Rakuten
       }
     end
 
-    def get_area_seo_rank
-      @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)
-        return cells[1]
-      end
-    end
+    # def get_area_seo_rank
+    #   @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)
+    #     return cells[1]
+    #   end
+    # end
 
     def degit2 num
       num = "0#{num}" if num.to_s.size == 1
@@ -430,43 +430,39 @@ module HotelPrice::Rakuten
       @driver.quit
     end
 
-    def daily_data_past
-      @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
-      (0..13).each do |i|
-        select = Selenium::WebDriver::Support::Select.new(@driver.find_element(:name, "f_date"))
-        select.select_by(:index, i)
-        display_data = @driver.find_element(:xpath, '//input[@value = "表示"]')
-        display_data.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(",", "") }
-          break unless cells[5] && cells[5].to_i > 1
-          @output_hash = {
-            date: cells[0],
-            reservation_sales: cells[1],
-            access_ppl: cells[2],
-            cvr: cells[3],
-            reservation_unit_price: cells[4],
-            pv: cells[5],
-            pc_retained: cells[6],
-            pc_deliveries: cells[7],
-            pc_total_delivered: cells[8],
-            sp_retained: cells[9],
-            sp_deliveries: cells[10],
-            sp_total_delivered: cells[11]
-          }
-          puts "saved in DB:#{@output_hash}" if RakutenDaily.create(@output_hash).valid?
-        end
-      end
-      @driver.quit
-    rescue StandardError => e
-      @driver.quit
-      puts e.to_json
-    end
-
-    def daily_data_update
+    # def daily_data_past
+    #   @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
+    #   (0..13).each do |i|
+    #     select = Selenium::WebDriver::Support::Select.new(@driver.find_element(:name, "f_date"))
+    #     select.select_by(:index, i)
+    #     display_data = @driver.find_element(:xpath, '//input[@value = "表示"]')
+    #     display_data.click
+    #     rows = @driver.find_elements(:xpath, "//tr")
+    #     rows[27..58].map do |row|
+    #       cells = row.find_elements(:css, "td[align=RIGHT]").map { |a| a.text.strip.gsub(",", "") }
+    #       break unless cells[5] && cells[5].to_i > 1
+    #       {
+    #         date: cells[0],
+    #         reservation_sales: cells[1],
+    #         access_ppl: cells[2],
+    #         cvr: cells[3],
+    #         reservation_unit_price: cells[4],
+    #         pv: cells[5],
+    #         pc_retained: cells[6],
+    #         pc_deliveries: cells[7],
+    #         pc_total_delivered: cells[8],
+    #         sp_retained: cells[9],
+    #         sp_deliveries: cells[10],
+    #         sp_total_delivered: cells[11]
+    #       }
+    #     end
+    #   end
+    # 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
@@ -480,32 +476,29 @@ 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 = []
       rows[27..58].each do |row|
         cells = row.find_elements(:css, "td[align=RIGHT]").map { |a| a.text.strip.gsub(",", "") }
         break unless cells[5] && cells[5].to_i > 1
-
-        @output_hash = {
-          "date" => cells[0],
-          "hotel_id" => @hotel.id,
-          "reservation_sales" => cells[1],
-          "access_ppl" => cells[2],
-          "cvr" => cells[3],
-          "reservation_unit_price" => cells[4],
-          "pv" => cells[5],
-          "pc_retained" => cells[6],
-          "pc_deliveries" => cells[7],
-          "pc_total_delivered" => cells[8],
-          "sp_retained" => cells[9],
-          "sp_deliveries" => cells[10],
-          "sp_total_delivered" => cells[11]
+        data << {
+          date: cells[0],
+          reservation_sales: cells[1],
+          access_ppl: cells[2],
+          cvr: cells[3],
+          reservation_unit_price: cells[4],
+          pv: cells[5],
+          pc_retained: cells[6],
+          pc_deliveries: cells[7],
+          pc_total_delivered: cells[8],
+          sp_retained: cells[9],
+          sp_deliveries: cells[10],
+          sp_total_delivered: cells[11]
         }
-        puts "saved in DB:#{@output_hash}" if RakutenDaily.create(@output_hash).valid?
       end
-      @driver.quit
-    rescue StandardError => e
-      @driver.quit
+      data
     end
 
     def monthly_data_past
@@ -513,13 +506,11 @@ module HotelPrice::Rakuten
       @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|
+      rows[19..31].map do |row|
         cells = row.find_elements(:css, "td").map { |a| a.text.strip.gsub(",", "") }
         break unless cells[9] && cells[9].to_i > 1
-
-        data = {
+        {
           date: cells[0].gsub("/", "").to_s + "01",
-          hotel_id: Branch.find_by_rakuten_hotel_id(@config[:rakuten_hotel_id]).hotel_id,
           reservation_sales: cells[1],
           reservation_ppl: cells[2],
           access_ppl: cells[3],
@@ -535,12 +526,7 @@ module HotelPrice::Rakuten
           rmail_delivery_num: cells[13],
           prize: cells[14]
         }
-        puts "db saved : #{data}" if RakutenKaruteReservation.create(data).valid?
       end
-      @driver.quit
-    rescue StandardError => e
-      puts e.to_json
-      @driver.quit
     end
   end
 end

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

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