qunar 0.1.37 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851aeecc15e69334b7f294ee335552a76c0527b1
-  data.tar.gz: abac57dec98f03e9454b267ebda9f759b2ba76c3
+  metadata.gz: 5b1ce75f252b6fec30181443dcd7e223af33b413
+  data.tar.gz: b41eb8b95cf6ef06b8dae33e8295c055f5cb4592
 SHA512:
-  metadata.gz: 310aab733356aaa23ffc2b420ba70f06e4ef9efb1a6f497d0c992f178e2d23e72c3e9b94abd10c814594d8f8c01ee8f4201bbd7e28716afe423018e63869cb80
-  data.tar.gz: fbb907544e968ee7e06080ee2ad7d3e17c7b9be9723740b10c49b6ee1fefd0e378f761bc50c5cc00604a248beacc8e8fbf8b466e8f4858125317e7382e808280
+  metadata.gz: 6f8ee165e849bdc33790377a367a010a9560e97db86e56e34d38b125f5871fcf3f7c6bbfa80d5d83b38395c355b043cbb6696fa175e3d2f7fc54115a10fec0c5
+  data.tar.gz: 2fa5b86fc6466514fd0adad81b6349cd75696d5f5aa951699b28b186a268bc63faab870dd8c441cc4e3bf2a2ad1a147045e774deb66bb56b1948f1b477bcb607

data/lib/qunar/hotel_list.rb

@@ -1,102 +1,28 @@
 module Qunar
   class HotelList
-
+    include Capybara::DSL
     def initialize(city_url)
       @city = city_url
+      Capybara.current_driver = :webkit  
+      Capybara.default_selector = :xpath
+      Capybara.app_host ='http://touch.qunar.com'
+      page.driver.header 'User-Agent' ,"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.91 Safari/537.36"
     end
 
     # Call ajax for more hotels of each page
     def hotels_in_ajax(page_id)
       sleep(2)   # sleep for 2 seconds
-      @url = "http://touch.qunar.com//h5/hotel/hotellist?cityUrl=#{@city}&page=#{page_id}&tpl=hotel.hotelListTpl"
-      page = HTTParty.get(@url.to_s)
-      @html = Nokogiri::HTML page
-      pois = @html.xpath("//li[@class='qn_bt']")
-      if !pois.empty?
-        hotels = pois.collect { |hotel|
-          title = hotel.at("./div[@class='info qn_arrow_grey r']/div[@class='title']")
+      @uri = "/h5/hotel/hotellist?cityUrl=#{@city}&page=#{page_id}&tpl=hotel.hotelListTpl"
+      page.visit @uri
+      @html = Nokogiri::HTML page.html
+      qn_list = @html.xpath("//li[@class='qn_bt']")
+      # Collect hotels
+        hotels = qn_list.collect { |hotel|
+          title = hotel.at("./div/div[@class='title']")
           item = { :city=>@city, :hotel_id=>hotel['data-seq'], :hotel_name=>title.nil? ? nil : title.text.strip }        
         }
-      end
-      hotels
-    end 
-
-=begin
-   include Capybara::DSL
-
-
-    def initialize(city_en)
-      raise ArgumentError, "initizlize: Argument should be string " if !city_en.instance_of?(String)
-      #Global Setting
-      Capybara.run_server = false
-      Capybara.current_driver = :webkit   #selenium/poltergeist
-
-      # Use XPath as the default selector for the find method
-      Capybara.default_selector = :xpath
-
-      Capybara.app_host = 'http://hotel.qunar.com'
-      # Set user agent 
-       page.driver.header 'User-Agent', "Mozilla/5.0 (compatible; Baiduspider/2.0; +http://www.baidu.com/search/spider.html)"
-
-      # For poltergeist
-      #page.driver.headers={'User-Agent'=> "Mozilla/5.0 (compatible; Baiduspider/2.0; +http://www.baidu.com/search/spider.html)"}
-
-      @city = city_en
-      # log msg
-      puts "正在访问: http://hotel.qunar.com/city/#{@city}"
-      page.visit "/city/#{@city}"
-      @page = Nokogiri::HTML page.html
-    end
-
-    # Wait for ajax, a selector must be passed as capybara will wait for the element
-    def wait_for_ajax(selector)
-      puts "\e[32m Waiting for ajax...\e[0m"
-      # Retry 3 times at most, if still not found, give up
-      limiter = 0
-      begin
-        page.find(selector)  
-      rescue Capybara::ElementNotFound
-        limiter+=1
-        retry if limiter<3
-      end
-    end
-    
-    def hotels_in_page
-      # Scroll down and trigger ajax
-      page.execute_script "window.scrollTo(0, document.body.scrollHeight)"
-      self.wait_for_ajax("//span[@class='hotel_num js_hotel_num'][text()='30']")
-      hotels = []
-      @page = Nokogiri::HTML page.driver.browser.body 
-      @page.css("div.b_result_box").each { |hotel|
-        item = {:city => @city, :hotel_id => hotel['data-id']}
-        item[:hotel_name] = hotel.search("a[@class='e_title js_list_name']").first.text
-        hotels << item
-      }
-      hotels
-    end
-
-    # click `下一页` to navigate to next page
-    def click_next?
-      next_button = page.all("//li[@class='item next ']/a").first
-      return false if next_button.nil?
-      puts "Next page"
-      next_button.click
-      self.wait_for_ajax("//span[@class='hotel_num js_hotel_num'][text()='15']")
-      return true
-    end
-
-    # Get the page number
-    def page_count
-      a_node = @page.css("li.pager_count")
-      a_node.empty? ? 0 : a_node.first.text.split('/')[1].to_i 
-    end
-
-    # Get the screen_shot
-    def screen_shot
-      page.save_screenshot("#{Time.now}.png")
-    end
-=end   
-
+      hotels.empty? ? nil : hotels
+    end  
     # Html file
     def html
       @html

data/lib/qunar/version.rb

@@ -1,3 +1,3 @@
 module Qunar
-  VERSION = "0.1.37"
+  VERSION = "0.1.39"
 end

data/spec/hotel_list_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
   describe Qunar::HotelList do
     sample = Qunar::HotelList.new('beijing_city')
-
+    puts sample.hotels_in_ajax(1)
     it "has 15 hotels in one page" do
       expect(sample.hotels_in_ajax(1).size).to eq 15
     end

data/spec/spec_helper.rb

@@ -77,8 +77,5 @@ RSpec.configure do |config|
 =end
 end
 
-
 require 'qunar'
 
-$qunar_hotel= File.read(File.join(__dir__, 'samples', 'qunar_hotel.html'))
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qunar
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.39
 platform: ruby
 authors:
 - JusticeChow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler