hotel_price 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a4c5a3f6cbbe65473cb75159bffe08427d56715d6c7658c80ddd43be4d6fb2e
-  data.tar.gz: c430e764095d019bfe233172e26afa84aba5d8ddc097b26dd53e0f2e2e6875fc
+  metadata.gz: 3c9d7a1e1951f2c204dd858f69763db0b532ab041c2f86b3467654343f4e49df
+  data.tar.gz: 3049419b19b1ea0e952eb327af9366e7e508d7cc45a551fd0c6454aa2d45bf5b
 SHA512:
-  metadata.gz: 8438a25ced4479c39e48f88f35fc3bc56bdf269fa1423706e7820d29b6a9b8a5060a854ecc58f950964753f3b403972fc8995d580840b70b33506bdeac2cd11f
-  data.tar.gz: b36957e05bc1b67a702714e92ce227131c63fd764934c99aedd4efbdd46517a18874488ccdbc7b890aa5f4fb08a50f507827ba86327cbbba7742c7d3776a2d07
+  metadata.gz: 2e4d6f1152410739ab1b03aa4018ed74ff9870f6cfa76a83ce19807246478d976a894b0ed12ea1f830e3bc53921aa6544d07cef0b3c14fb2a6fe14ac315412d8
+  data.tar.gz: 8d76ffa7b0ba2cd6103bb87b5fb94fe2f9aaae6a313b7e776557fb398e82ffb7adcd5b71ef82e9fcc7c7db40146290bb2d1de2f142fa58d47029c8b5bd524e92

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 /.envrc
+.idea
 
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hotel_price (0.2.1)
+    hotel_price (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/exe/hotel_price

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require 'hotel_price'
+require "hotel_price"
 
-puts HotelPrice.rakuten_travel
+puts HotelPrice.rakuten_travel

data/lib/{jalan.rb → hotel_price/jalan/jalan_api.rb}

@@ -1,4 +1,4 @@
-module Jalan
+module HotelPrice::Jalan
   class JalanAPI
     def initialize api_key
       @api_key = api_key

data/lib/hotel_price/jalan.rb

@@ -0,0 +1,6 @@
+require_relative "./jalan/jalan_api"
+
+module HotelPrice
+  module Jalan
+  end
+end

data/lib/hotel_price/rakuten/rakuten_api.rb

@@ -0,0 +1,78 @@
+module HotelPrice::Rakuten
+  class RakutenAPI
+    def initialize params
+      @config = {
+          rakuten_hotel_id: params[:rakuten_hotel_id] ||= 0,
+          rakuten_api_key: params[:rakuten_api_key] ||= ENV["RT_API_KEY"]
+      }
+    end
+
+    def hotel_info
+      uri = URI.parse("https://app.rakuten.co.jp/services/api/Travel/HotelDetailSearch/20131024?hotelNo=" + @config[:rakuten_hotel_id].to_s + "&applicationId=" + @config[:rakuten_api_key].to_s + "&datumType=1&responseType=large")
+      json = Net::HTTP.get(uri)
+      @result = JSON.parse(json)
+      return "ホテル情報がありませんでした。" if @result["error"] == "not_found"
+      return @result["error_description"] if @result["error"] == "wrong_parameter"
+      @result["hotels"][0].each do |_key, field|
+        field[0].each do |_, value|
+          @data_hash = {
+              rakuten_hotel_id: value["hotelNo"],
+              hotel_name: value["hotelName"],
+              room_price_min: value["hotelMinCharge"],
+              lat: value["latitude"],
+              lon: value["longitude"],
+              tel: value["telephoneNo"],
+              zip_code: value["postalCode"],
+              prefecture: value["address1"],
+              address1: value["address2"],
+              fax: value["faxNo"],
+              access: value["access"],
+              parking_info: value["parkingInformation"],
+              near_station: value["nearestStation"],
+              hotel_img_url: value["hotelImageUrl"],
+              rakuten_review_count: value["reviewCount"],
+              rakuten_review_avg: value["reviewAverage"].to_f
+          }
+        end
+      end
+      @result["hotels"][0].each do |_key, field|
+        field[1].each do |_, value|
+          @data_hash["rakuten_service_review"] = value["serviceAverage"].to_f
+          @data_hash["rakuten_location_review"] = value["locationAverage"].to_f
+          @data_hash["rakuten_room_review"] = value["roomAverage"].to_f
+          @data_hash["rakuten_equipment_review"] = value["equipmentAverage"].to_f
+          @data_hash["rakuten_bath_review"] = value["bathAverage"].to_f
+          @data_hash["rakuten_meal_review"] = value["mealAverage"].to_f
+        end
+      end
+      @result["hotels"][0].each do |_key, field|
+        field[2].each do |_, value|
+          @data_hash["middle_class_code"] = value["middleClassCode"].to_s
+          @data_hash["small_class_code"] = value["smallClassCode"].to_s
+          @data_hash["area_name"] = value["areaName"].to_s
+          @data_hash["hotel_class_code"] = value["hotelClassCode"].to_s
+          @data_hash["checkin_time"] = value["checkinTime"].to_s
+          @data_hash["checkout_time"] = value["checkoutTime"].to_s
+          @data_hash["last_checkin_time"] = value["lastCheckinTime"].to_s
+        end
+      end
+      @result["hotels"][0].each do |_key, field|
+        field[3].each do |_, value|
+          @data_hash["total_room_num"] = value["hotelRoomNum"].to_s
+          room_facilities = []
+          value["roomFacilities"].each_with_index do |f, i|
+            room_facilities[i] = f["item"]
+          end
+          @data_hash["room_facilities"] = room_facilities
+        end
+      end
+      @result["hotels"][0].each do |_key, field|
+        field[4].each do |_, value|
+          @data_hash["hotel_policy_note"] = value["note"].to_s
+          @data_hash["cancel_policy"] = value["cancelPolicy"].to_s
+        end
+      end
+      @data_hash
+    end
+  end
+end

data/lib/hotel_price/rakuten/rakuten_console.rb

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

data/lib/hotel_price/rakuten.rb

@@ -0,0 +1,22 @@
+require_relative "./rakuten/rakuten_api"
+require_relative "./rakuten/rakuten_console"
+
+module HotelPrice
+  module Rakuten
+    def self.review rakuten_hotel_id
+      driver = self.get_selenium_driver
+      driver.get("https://travel.rakuten.co.jp/HOTEL/#{rakuten_hotel_id.to_s}/review.html")
+      sleep 2
+      comment_area = driver.find_elements(:class_name, "commentBox")
+      data = comment_area.map do |f|
+        {
+            date: f.find_element(class_name: "time").text,
+            rakuten_hotel_id: rakuten_hotel_id,
+            comment: f.find_element(class_name: "commentSentence").text
+        }
+      end
+      driver.quit
+      data
+    end
+  end
+end

data/lib/hotel_price/version.rb

@@ -1,3 +1,3 @@
 module HotelPrice
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/hotel_price.rb

@@ -1,15 +1,13 @@
 require "hotel_price/version"
+require "hotel_price/rakuten"
+require "hotel_price/jalan"
 require "selenium-webdriver"
 require "net/http"
 
 module HotelPrice
   class Error < StandardError; end
   def self.rakuten_travel
-    # firefox_capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
-    # @driver = Selenium::WebDriver.for(:remote, url: "http://hub:4444/wd/hub", desired_capabilities: firefox_capabilities)
-    options = Selenium::WebDriver::Firefox::Options.new
-    options.add_argument("-headless")
-    driver = Selenium::WebDriver.for :firefox, options: options
+    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")
     sleep 2
@@ -24,123 +22,14 @@ module HotelPrice
     end
   end
 
-  require "jalan"
+  private
 
-  module RakutenTravel
-    def self.review rakuten_hotel_id
-      # firefox_capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
-      # @driver = Selenium::WebDriver.for(:remote, url: "http://hub:4444/wd/hub", desired_capabilities: firefox_capabilities)
-      options = Selenium::WebDriver::Firefox::Options.new
-      options.add_argument("-headless")
-      driver = Selenium::WebDriver.for :firefox, options: options
-      driver.get("https://travel.rakuten.co.jp/HOTEL/#{rakuten_hotel_id.to_s}/review.html")
-      sleep 2
-      comment_area = driver.find_elements(:class_name, "commentBox")
-      data = comment_area.map do |f|
-        {
-          date: f.find_element(class_name: "time").text,
-          rakuten_hotel_id: rakuten_hotel_id,
-          comment: f.find_element(class_name: "commentSentence").text
-        }
-      end
-      driver.quit
-      data
-    end
-
-    class RakutenConsole
-      def initialize params
-        @config = {
-          login_id: params[:login_id],
-          login_pw: params[:login_pw],
-          chain: params[:chain] ||= false,
-          rakuten_hotel_id: params[:rakuten_hotel_id] ||= 0,
-        }
-      end
-
-      def test
-        @config
-      end
-    end
-
-    class RakutenAPI
-      def initialize params
-        @config = {
-          rakuten_hotel_id: params[:rakuten_hotel_id] ||= 0,
-          rakuten_api_key: params[:rakuten_api_key] ||= ENV["RT_API_KEY"]
-        }
-      end
-
-      def test
-        @config
-      end
+  def self.get_selenium_driver
+    # firefox_capabilities = Selenium::WebDriver::Remote::Capabilities.firefox
+    # @driver = Selenium::WebDriver.for(:remote, url: "http://hub:4444/wd/hub", desired_capabilities: firefox_capabilities)
 
-      def hotel_info
-        uri = URI.parse("https://app.rakuten.co.jp/services/api/Travel/HotelDetailSearch/20131024?hotelNo=" + @config[:rakuten_hotel_id].to_s + "&applicationId=" + @config[:rakuten_api_key].to_s + "&datumType=1&responseType=large")
-        json = Net::HTTP.get(uri)
-        @result = JSON.parse(json)
-        return "ホテル情報がありませんでした。" if @result["error"] == "not_found"
-        return @result["error_description"] if @result["error"] == "wrong_parameter"
-        @result["hotels"][0].each do |_key, value|
-          value[0].each do |_key, value|
-            @data_hash = {
-              rakuten_hotel_id: value["hotelNo"],
-              hotel_name: value["hotelName"],
-              room_price_min: value["hotelMinCharge"],
-              lat: value["latitude"],
-              lon: value["longitude"],
-              tel: value["telephoneNo"],
-              zip_code: value["postalCode"],
-              prefecture: value["address1"],
-              address1: value["address2"],
-              fax: value["faxNo"],
-              access: value["access"],
-              parking_info: value["parkingInformation"],
-              near_station: value["nearestStation"],
-              hotel_img_url: value["hotelImageUrl"],
-              rakuten_review_count: value["reviewCount"],
-              rakuten_review_avg: value["reviewAverage"].to_f
-            }
-          end
-        end
-        @result["hotels"][0].each do |_key, value|
-          value[1].each do |_key, value|
-            @data_hash["rakuten_service_review"] = value["serviceAverage"].to_f
-            @data_hash["rakuten_location_review"] = value["locationAverage"].to_f
-            @data_hash["rakuten_room_review"] = value["roomAverage"].to_f
-            @data_hash["rakuten_equipment_review"] = value["equipmentAverage"].to_f
-            @data_hash["rakuten_bath_review"] = value["bathAverage"].to_f
-            @data_hash["rakuten_meal_review"] = value["mealAverage"].to_f
-          end
-        end
-        @result["hotels"][0].each do |_key, value|
-          value[2].each do |_key, value|
-            @data_hash["middle_class_code"] = value["middleClassCode"].to_s
-            @data_hash["small_class_code"] = value["smallClassCode"].to_s
-            @data_hash["area_name"] = value["areaName"].to_s
-            @data_hash["hotel_class_code"] = value["hotelClassCode"].to_s
-            @data_hash["checkin_time"] = value["checkinTime"].to_s
-            @data_hash["checkout_time"] = value["checkoutTime"].to_s
-            @data_hash["last_checkin_time"] = value["lastCheckinTime"].to_s
-          end
-        end
-        @result["hotels"][0].each do |_key, value|
-          value[3].each do |_key, value|
-            @data_hash["total_room_num"] = value["hotelRoomNum"].to_s
-            room_facilities = []
-            value["roomFacilities"].each_with_index do |f, i|
-              room_facilities[i] = f["item"]
-            end
-            @data_hash["room_facilities"] = room_facilities
-          end
-        end
-        @result["hotels"][0].each do |_key, value|
-          value[4].each do |_key, value|
-            @data_hash["hotel_policy_note"] = value["note"].to_s
-            @data_hash["cancel_policy"] = value["cancelPolicy"].to_s
-          end
-        end
-        @data_hash
-      end
-    end
+    options = Selenium::WebDriver::Firefox::Options.new
+    options.add_argument("-headless")
+    Selenium::WebDriver.for :firefox, options: options
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotel_price
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Fumitake Kawasaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,8 +89,12 @@ files:
 - exe/hotel_price
 - hotel_price.gemspec
 - lib/hotel_price.rb
+- lib/hotel_price/jalan.rb
+- lib/hotel_price/jalan/jalan_api.rb
+- lib/hotel_price/rakuten.rb
+- lib/hotel_price/rakuten/rakuten_api.rb
+- lib/hotel_price/rakuten/rakuten_console.rb
 - lib/hotel_price/version.rb
-- lib/jalan.rb
 homepage: https://github.com/el-fudo/hotel_price
 licenses:
 - MIT