daodao 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94e13e69f1a94e9ef2457e87b79d059580e4e62b
-  data.tar.gz: b6ff9806987c8b4b28ac3fdbb8802c4728676165
+  metadata.gz: 9b7e9eacbf6cbe5bbfc30e566447703171f97c88
+  data.tar.gz: 6b3d10c511674c81b83d3776fb7d894540a823f2
 SHA512:
-  metadata.gz: 76c7b442362b441f4a038bccf9bb74a4eadcc802692c37049200f2e870f187caffafed1afea874bf05b4228976cc9da6923f1e277da39b8e10f1c495fd498a28
-  data.tar.gz: 1e302326ab4b61b556dad26e114055f29e3d3f067bfc7dba09a8adb6e6cdb9eb11e4e81149058587a2f795dec4d44451323fbd03266ef12ab1d44cba50e65dc4
+  metadata.gz: 016d318b1aa5093632ed066c32b92c0d1fe85d863daaece9451fe5b136f0f285f94c3dfa1bee99a03f1d7c7ff2d96076c5dc29a313ba0823a56cbd97f1a7db93
+  data.tar.gz: f9d53f41a5ed4f21e4961c0f2537aefd8da3fe169807c3e9ff05bf77ed2c8facb0e6541c424cbfbb74258206a1628a072d3805862b4f15f0b8394454527f622c

data/README.md

@@ -28,14 +28,14 @@ Or install it yourself as:
   
 ```ruby    
 require 'daodao' 
-  uri = "/Hotel_Review-g298555-d2682464-Reviews-Four_Seasons_Hotel_Guangzhou-Guangzhou_Guangdong.html"
-  sample = Daodao::Rank.new(uri)
+  hotel_id = "2682464"
+  sample = Daodao::Rank.new(hotel_id)
   puts 'The rooms details are as follow :'
   puts sample.rooms_details
 ```
 This will crawl the rooms details of the target hotel for you.   
 
-`Note:` You can pass other uri to `initialize` representing the hotel page. 
+`Note:` You can pass other hotel_id to `initialize` representing the hotel page. 
 
 #### Get ota's ranking
 

data/lib/daodao.rb

@@ -7,17 +7,28 @@ require 'daodao/rank'
 require 'daodao/hotel'
 require 'daodao/hotel_list'
 module Daodao
-  def self.rank(url)
-    page = Nokogiri::HTML(open(url))
+  def self.rank(hotel_id)
+    url = "http://www.daodao.com/Hotel_Review/d#{hotel_id}"
+    @html = Nokogiri::HTML(open(url))
     row = {}
-    row[:hotel_id] = url.split('-')[2]
-    row[:hotel_name] = page.xpath('//span[@itemprop="name"]').text
+    row[:hotel_id] = hotel_id[/\d+/]
     rank=1
-    page.css("div.provider_meta_overview").each { |item|
-      key = 'rank'+rank.to_s
-      row[key.to_sym] = item.css("span.providerLogo_96x41").xpath('./img/@alt').first.value
-      rank+=1
-    }
+    provider = @html.css("div.no_cpu.offer or span.no_cpu.offer")
+    if provider.empty? 
+      row[:hotel_name] = @html.xpath("//span[@itemprop='name']").text
+      @html.css("div.provider_meta_overview").each { |item|
+        key = 'rank'+rank.to_s
+        row[key.to_sym] = item.at("span[@class='providerLogo_96x41']/img")['alt']
+        rank+=1
+      }
+    else 
+      row[:hotel_name] = @html.xpath("//h1[@id='HEADING']").text
+      provider.each { |item|
+          key = 'rank'+rank.to_s
+          row[key.to_sym] = item['data-vendorname']
+          rank+=1
+        }
+    end
     row
   end
 end

data/lib/daodao/hotel.rb

@@ -6,7 +6,7 @@ module Daodao
     def initialize(hotel_id)
       raise "The argument of class HotelInfo should be string" if !hotel_id.instance_of?(String)
       @id = hotel_id
-      @url = URI("http://daodao.com/Hotel_Review-#{hotel_id}")
+      @url = URI("http://daodao.com/Hotel_Review-d#{hotel_id}")
       @pages = Nokogiri::HTML(open(@url))
     end
       

data/lib/daodao/hotel_list.rb

@@ -18,7 +18,7 @@ module Daodao
         page.xpath("//dl/a").each { |hotel|
           item = {}
           item[:name] = hotel.text
-          item[:url] = hotel['href']
+          item[:id] = hotel['href'].split('-')[2][/\d+/]
           hotel_list.push(item)
         }
       return hotel_list

data/lib/daodao/rank.rb

@@ -2,33 +2,59 @@ module Daodao
   class Rank
     include Capybara::DSL
 
-    def initialize(uri)
-      Capybara.current_driver = :webkit 
-      
+    def initialize(hotel_id)
+      raise ArgumentError, "initizlize: Argument should be string " if !hotel_id.instance_of?(String)
+      Capybara.current_driver = :webkit   
       Capybara.default_selector = :xpath
-
       Capybara.app_host ="http://daodao.com"
+
       page.driver.header "User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.77.4 (KHTML, like Gecko) Version/7.0.5 Safari/537.77.4" 
-      puts " \e[34mBuilding Session...\e[0m"
-      @uri = uri
-      page.visit(URI(uri))
+      @id = hotel_id      
+      uri = "/Hotel_Review/d#{hotel_id}"
+      page.visit URI(uri)
       # Click the div to navigate hidden info
       page.all("//div[@class='tab ']").each do |node|
         node.trigger('click')
       end
       # Expand all divs tagged with '展开报价'
-      page.all("div[@class='provider_meta_overview  mskQC_Meta_RoomTab msk']//*[text()='展开报价']").each do |layout|
-        puts '展开报价...'
+      page.all("//span[text()='展开报价']").each do |layout|
         layout.trigger('click')
       end
-      @page = Nokogiri::HTML(page.html)
+      @html = Nokogiri::HTML(page.html)
+    end
+    
+    def id
+       @id
+    end
+
+    def rank
+      row = {}     
+      row[:hotel_id] = self.id
+      rank=1
+      poi = @html.css("div.no_cpu.offer or span.no_cpu.offer")
+      if poi.empty? 
+        row[:hotel_name] = @html.xpath("//span[@itemprop='name']").text
+        @html.css("div.provider_meta_overview").each { |item|
+          key = 'rank'+rank.to_s
+          row[key.to_sym] = item.at("span[@class='providerLogo_96x41']/img")['alt']
+          rank+=1
+        }
+      else 
+        row[:hotel_name] = @html.xpath("//h1[@id='HEADING']").text
+        poi.each { |item|
+            key = 'rank'+rank.to_s
+            row[key.to_sym] = item['data-vendorname']
+            rank+=1
+          }
+      end
+      row
     end
 
     # Get all the rooms details 
     # @Return: an array, a list of rooms details
     def rooms_details
       otas = []
-      @page.css("div.provider_meta_overview").each { |item|
+      @html.css("div.provider_meta_overview").each { |item|
         row = {}
         row[:ota_name] = item.css("span.providerLogo_96x41").xpath('./img/@alt').first.value
 
@@ -42,7 +68,7 @@ module Daodao
         end
 
         rooms = []
-        dropdown_room_list = @page.css("div.provider_rooms_details")[otas.size]
+        dropdown_room_list = @html.css("div.provider_rooms_details")[otas.size]
         dropdown_room_list.xpath("./a").each do |room_details|       
           room = {}
           room[:room_type] = room_details.at_css("span.room_type").text
@@ -63,30 +89,13 @@ module Daodao
       return otas
     end
 
-    def name
-      @page.xpath('//span[@itemprop="name"]').text
-    end
-    
-    def id
-      @uri.split('-')[2]
-    end
-
-    def rank
-      row = {}     
-      row[:hotel_id] = self.id
-      row[:hotel_name] = self.name
-      rank=1
-      @page.css("div.provider_meta_overview").each { |item|
-        key = 'rank'+rank.to_s
-        row[key.to_sym] = item.css("span.providerLogo_96x41").xpath('./img/@alt').first.value
-        rank+=1
-      }
-      return row
-    end
-       
     def screen_shot
       page.save_screenshot("#{Time.now}.png")
     end
 
+    def html
+      @html
+    end
+
   end
 end

data/lib/daodao/version.rb

@@ -1,3 +1,3 @@
 module Daodao
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/spec/hotel_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe Daodao::Hotel do 
   # hotel in guangzhou
-	gz_sample = Daodao::Hotel.new("d2682464")
+	gz_sample = Daodao::Hotel.new("2682464")
 
 	it "has name '四季酒店'" do 
 		expect(gz_sample.name).to eq '四季酒店'
 	end
 
    it "has id 'd2682464'" do
-    expect(gz_sample.id).to eq 'd2682464'
+    expect(gz_sample.id).to eq '2682464'
   end
 
 	it "has stars 5.0星级" do
@@ -34,7 +34,7 @@ describe Daodao::Hotel do
 
 	#=====================================================================================================
   # hotel in beijing
-	bj_sample = Daodao::Hotel.new("d3256870")
+	bj_sample = Daodao::Hotel.new("3256870")
 
 	it "has name '北京怡亨酒店'" do 
 		expect(bj_sample.name).to eq '北京怡亨酒店'

data/spec/rank_fast_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 describe Daodao do
-  ranks = Daodao.rank('http://www.daodao.com/Hotel_Review-g298555-d2682464-Reviews-Four_Seasons_Hotel_Guangzhou-Guangzhou_Guangdong.html')
+  ranks = Daodao.rank('2682464')
+  puts ranks
   it "The first Ota name 'Booking.com' " do
     expect(ranks[:rank1]).to eq 'Booking.com'
   end

data/spec/rank_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 describe Daodao::Rank do
-  gz_sample = Daodao::Rank.new('/Hotel_Review-g298555-d2682464-Reviews-Four_Seasons_Hotel_Guangzhou-Guangzhou_Guangdong.html')
+  gz_sample = Daodao::Rank.new('2682464')
   details = gz_sample.rooms_details
   p gz_sample.rank
   # screen shot
@@ -38,8 +38,5 @@ describe Daodao::Rank do
     expect(details[4][:rooms_details][0][:room_price]).to eq 2330
   end 
 
-  it "has The hotel name '四季酒店'"do
-    expect(gz_sample.name).to eq "四季酒店"
-  end 
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daodao
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - timlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler