qunar 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8cdffb70710b1fbff0aa1c15ee32d65d4864994
-  data.tar.gz: 78cbb58939792e8e3ff33bda55a9f2c1dd4f85b7
+  metadata.gz: 51295e4766f4a1a4e6943e7022d573cad5e47132
+  data.tar.gz: 8ed3eb0cab6dac6ab8294f44fcabbf6cc1b24153
 SHA512:
-  metadata.gz: c6a440427c2e623c18546607f6beff0c6cf6c8910494b6170f9575fc6778b820d17d024efe1e11fc3c90f1b257e04bd723924a2bc4e51f03b262424ae6f6e7b2
-  data.tar.gz: fd5ff8d88c9ebbcbbe0d26efa82ff9557f6048338ec486adbc1f0e876df038d995bdb4c4f6d7584580189ea999c347056e8ded820c1783f929f9468b70b018b2
+  metadata.gz: e455e2f1626397293367b227e9dacd9b7d8f765034a58c3734c5a332457c393048afae3c949351f3103e3c51d2fffa6c95685f3930ab5718d1bab095392a579a
+  data.tar.gz: 8d0db7e92b9e5b576b59695501d9ced033ac6e81f8e0f09f61f3fbb1306d048506ce3339713e6f98b8417baaa57e787cef4aaa4db77846f7d4b2408a53d5a85f

data/lib/qunar/rank.rb

@@ -27,12 +27,8 @@ module Qunar
       #@page = Capybara.current_session.driver.browser.page_source    #use when choose capybara driver selenium
       @page = Capybara.current_session.driver.browser.body    #use when choose capybara driver webkit
       @hotel = Nokogiri::HTML @page
-      File.open("test1.html","w") do |file|
-        file.puts @page
-      end
     end
 
-
     def rooms
       rooms = []
       # room
@@ -50,6 +46,11 @@ module Qunar
           otas['ota'] = ota
 
           bookable = row.search("a[@class='btn-book']/span").first.text.strip
+          if bookable == '预订'
+            bookable = true
+          else
+            bookable = false
+          end
           otas['bookable'] = bookable
 
           insurance = row.search("p[@class='dbt-ct']").first
@@ -63,13 +64,16 @@ module Qunar
           coupon = row.search("span[@class='fan']/em[@class='pr']").first
 
           if coupon == nil
-            coupon = '0'
+            coupon = 0
           else
-            coupon = coupon.text.sub(/¥/,'').strip
+            coupon = coupon.text.sub(/¥/,'').strip.to_i
           end
 
           otas['coupon'] = coupon
 
+          reserve_detail = row.search("div[@class='clrfix order-detail']").first.text.strip
+          otas['reserve_detail'] = reserve_detail
+
           prepay = row.search("span[@title='需要预先支付房款']").first
           if prepay == nil
             prepay = false

data/lib/qunar/version.rb

@@ -1,3 +1,3 @@
 module Qunar
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/rank_spec.rb

@@ -19,6 +19,8 @@ describe Qunar::Rank do
     expect(sample.rooms[1]['room_type']).to eq '标准大床房'
   end
 
+
+
   it "has 20 otas for the first room type '标准双床房'" do 
     expect(sample.rooms.first['otas'].size).to eq 20
   end
@@ -27,24 +29,27 @@ describe Qunar::Rank do
     expect(sample.rooms[1]['otas'].size).to eq 20
   end 
 
+
   it "first ota of first roomtype names '艺龙旅行网'" do
     #puts subject.rooms.first['otas'].first['ota']
     expect(sample.rooms.first['otas'].first['ota']).to eq '艺龙旅行网'
   end
 
+
   it "first ota of second roomtype names Expedia" do
     #puts subject.rooms.first['otas'].first['ota']
     expect(sample.rooms[1]['otas'].first['ota']).to eq 'Booking.com'
   end
 
   it "first ota of first roomtype is bookable" do
-    expect(sample.rooms.first['otas'].first['bookable']).to eq '预订'
+    expect(sample.rooms.first['otas'].first['bookable']).to eq true
   end
 
-  it "last ota of first roomtype is bookable" do
-    expect(sample.rooms.first['otas'][-1]['bookable']).to eq '订完'
+  it "last ota of first roomtype is not bookable" do
+    expect(sample.rooms.first['otas'][-1]['bookable']).to eq false
   end
 
+
   it "first ota of first roomtype need insurance" do
     expect(sample.rooms.first['otas'].first['insurance']).to eq true
   end
@@ -54,12 +59,15 @@ describe Qunar::Rank do
   end
 
   it "first ota of first roomtype coupon is 0" do
-    expect(sample.rooms.first['otas'].first['coupon']).to eq '0'
+    expect(sample.rooms.first['otas'].first['coupon']).to eq 0
   end
 
-
   it "first ota of first roomtype in shenzhen coupon is 40" do
-    expect(sz_sample.rooms.first['otas'].first['coupon']).to eq '40'
+    expect(sz_sample.rooms.first['otas'].first['coupon']).to eq 40
+  end
+
+  it "first ota of first roomtype reserve_detail is '标准双床房 - 仅提供住宿 - 免费取消'" do
+    expect(sample.rooms.first['otas'].first['reserve_detail']).to eq '标准双床房 - 仅提供住宿 - 免费取消'
   end
 
 
@@ -67,25 +75,25 @@ describe Qunar::Rank do
     expect(sample.rooms.first['otas'][2]['prepay']).to eq true
   end
 
-  it "second ota of first roomtype need prepay" do
+  it "second ota of first roomtype not need prepay" do
     expect(sample.rooms.first['otas'][1]['prepay']).to eq false
   end
 
   it "first ota of first roomtype price" do
-    expect(sample.rooms.first['otas'].first['price']).to eq '918'
+    expect(sample.rooms.first['otas'].first['price']).to eq 918
   end
 
   it "fifth ota of first roomtype price" do
-    expect(sample.rooms.first['otas'][4]['price']).to eq '638'
+    expect(sample.rooms.first['otas'][4]['price']).to eq 638
   end
 
   it "first ota of first roomtype neat_price" do
-    expect(sample.rooms.first['otas'].first['neat_price']).to eq '918'
+    expect(sample.rooms.first['otas'].first['neat_price']).to eq 918
   end
 
   it "sixth ota of first roomtype neat_price" do
     #puts subject.rooms.first['otas'][5]['neat_price']
-    expect(sample.rooms.first['otas'][4]['neat_price']).to eq '734'
+    expect(sample.rooms.first['otas'][4]['neat_price']).to eq 734
   end
-
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qunar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - JusticeChow