holden-hostelify 0.2.0 → 0.2.1

data/Manifest

@@ -1,10 +1,10 @@
 Manifest
 README.rdoc
 Rakefile
+hostelify.gemspec
 lib/hostel.rb
 lib/hostel/gomio.rb
 lib/hostel/hostel.rb
-lib/hostel/hostel_available.rb
 lib/hostel/hostelbookers.rb
 lib/hostel/hostelworld.rb
 lib/test.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
  
-Echoe.new('hostelify', '0.2.0') do |p|
+Echoe.new('hostelify', '0.2.1') do |p|
   p.description = "Simple Hostel Webscrapper."
   p.url = "http://github.com/holden/hostelify"
   p.author = "Holden Thomas"

data/hostelify.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hostelify}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Holden Thomas"]
-  s.date = %q{2009-09-09}
+  s.date = %q{2009-09-10}
   s.description = %q{Simple Hostel Webscrapper.}
   s.email = %q{holden.thomas@gmail.com}
-  s.extra_rdoc_files = ["README.rdoc", "lib/hostel.rb", "lib/hostel/gomio.rb", "lib/hostel/hostel.rb", "lib/hostel/hostel_available.rb", "lib/hostel/hostelbookers.rb", "lib/hostel/hostelworld.rb", "lib/test.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/hostel.rb", "lib/hostel/gomio.rb", "lib/hostel/hostel.rb", "lib/hostel/hostel_available.rb", "lib/hostel/hostelbookers.rb", "lib/hostel/hostelworld.rb", "lib/test.rb", "spec/_helper.rb", "spec/hb_find_by_hostel.spec", "spec/hb_find_hostels.spec", "spec/hw_find_by_hostel.spec", "spec/hw_find_hostels.spec", "hostelify.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/hostel.rb", "lib/hostel/gomio.rb", "lib/hostel/hostel.rb", "lib/hostel/hostelbookers.rb", "lib/hostel/hostelworld.rb", "lib/test.rb"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "hostelify.gemspec", "lib/hostel.rb", "lib/hostel/gomio.rb", "lib/hostel/hostel.rb", "lib/hostel/hostelbookers.rb", "lib/hostel/hostelworld.rb", "lib/test.rb", "spec/_helper.rb", "spec/hb_find_by_hostel.spec", "spec/hb_find_hostels.spec", "spec/hw_find_by_hostel.spec", "spec/hw_find_hostels.spec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/holden/hostelify}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Hostelify", "--main", "README.rdoc"]

data/lib/hostel.rb

@@ -6,6 +6,5 @@ require 'date'
 require 'htmlentities'
 require 'iconv'
 require 'hostel/hostel'
-require 'hostel/hostel_available'
 require 'hostel/hostelworld'
 require 'hostel/hostelbookers'

data/lib/hostel/hostel.rb

@@ -1,11 +1,61 @@
 class Hostel
-  attr_accessor :hostel_id, :name, :address, :description, :facilities, :ratings, :directions, :geo, :images, :video, :availability, :price
+  attr_accessor :hostel_id, :name, :address, :description, :facilities, :ratings, :directions, :geo, :images, :video, :availability
+  attr_accessor :rating, :dorm, :single, :unavailable
 
   def initialize(options = {})
       options.each {
         |k,v|
         self.send( "#{k.to_s}=".intern, v)
       }
+  end
+
+end
+
+class HostelCollection < Array
+  # This collection does everything an Array does, plus
+  # you can add utility methods like names.
+
+  def ids
+    collect do |i|
+      i.hostel_id
+    end
+  end
+  
+  def names
+    collect do |i|
+      i.name
     end
+  end
+  
+  def descs
+    collect do |i|
+      i.description
+    end
+  end
+  
+end
+
+class HostelAvailable
+  attr_accessor :name, :price, :spots, :bookdate
+  
+  def initialize(name, price, spots, bookdate)
+    @name = name
+    @price = price
+    @spots = spots
+    @bookdate = bookdate
+  end
+  
+end
+
+module Retryable
+  extend self
+
+  def try times = 1, options = {}, &block
+    val = yield
+  rescue options[:on] || Exception
+    retry if (times -= 1) > 0
+  else
+    val
+  end
+end
 
-end

data/lib/hostel/hostelbookers.rb

@@ -18,11 +18,14 @@ class Hostelbookers
       date = Date.strptime(options[:date])
       data = setSearch(url,options[:date],options[:no_days])
     else
-      data = Hpricot(open(url))
+      Retryable.try 3 do
+        data = Hpricot(open(url))
+      end
     end
     
     data = data.search("//div[@id='propertyResultsList']")
-    @results = []
+    #@results = []
+    @results = HostelCollection.new
       #coder = HTMLEntities.new
     (data/"tr.propertyRow").each do |row|
       name = row.at("a.propertyTitle").inner_text
@@ -34,7 +37,8 @@ class Hostelbookers
       single = row.at("td.private/text()")
       hb_id = url.match(/[\d]{2,5}.$/).to_s.to_i
       
-      @results << Hostel.new(:hostel_id => hb_id, :name => name, :description => desc, :ratings => rating, :price => dorm)
+      #@results << Hostel.new(:hostel_id => hb_id, :name => name, :description => desc, :rating => rating, :dorm => dorm, :single => single)
+      @results << Hostel.new(:hostel_id => hb_id, :name => name, :description => desc, :rating => rating, :dorm => dorm, :single => single)
     end    
     return @results
   end
@@ -51,7 +55,9 @@ class Hostelbookers
       options = @default_options.merge(options)
       data = setSearch_id(url,options[:date],options[:no_days])
     else
-      data = Hpricot(open(url))
+      Retryable.try 3 do
+        data = Hpricot(open(url))
+      end
     end
     
     hostel.hostel_id = id
@@ -119,7 +125,7 @@ class Hostelbookers
       hostel.availability = @availables
     end
     
-    hostel
+    return hostel
   end
   
   def self.setSearch(url,date,no_days)
@@ -129,12 +135,18 @@ class Hostelbookers
       form = page.form_with(:name => 'searchForm') # => WWW::Mechanize::Form
       form.field_with(:name => 'intnights').options[no_days.to_i-1].select
       form.dtearrival = date #d/m/y
-      page = agent.submit(form)
+      
+      Retryable.try 3 do
+        page = agent.submit(form)
+      end
       
       #to dollars!
       form = page.forms[0]
       form.field_with(:name => 'strSelectedCurrencyCode').options[5].select
-      page = agent.submit(form)
+      
+      Retryable.try 3 do
+        page = agent.submit(form)
+      end
       
       data = page.search('//div[@id="content"]')
 
@@ -148,14 +160,18 @@ class Hostelbookers
         form = page.form_with(:name => 'frmCheckAvailBook') # => WWW::Mechanize::Form
         form.field_with(:name => 'intNights').options[no_days.to_i-1].select
         form.dteArrival = date #d/m/y
-        page = agent.submit(form)
         
+        Retryable.try 3 do
+          page = agent.submit(form)
+        end
         #change currency to dollars
         form = page.forms[1]
         #puts form.name
         form.field_with(:name => 'strSelectedCurrencyCode').options[5].select
-        page = agent.submit(form)
         
+        Retryable.try 3 do
+          page = agent.submit(form)
+        end
         data = page.search('//div[@id="content"]')
 
         return data

data/lib/hostel/hostelworld.rb

@@ -14,7 +14,9 @@ class Hostelworld
   def self.parse_html(url)
     f = open(url)
     f.rewind
-    data = Hpricot(Iconv.conv('utf-8', f.charset, f.readlines.join("\n")))
+    Retryable.try 3 do
+      data = Hpricot(Iconv.conv('utf-8', f.charset, f.readlines.join("\n")))
+    end
   end
   
   def self.find_hostel_by_id(options)
@@ -105,7 +107,7 @@ class Hostelworld
     end
     
     data = data.search("//div[@id='content']")
-    @results = []
+    @results = HostelCollection.new
 
     (data/"div.hostelListing").each do |row|
       name = row.at("h3").inner_text
@@ -116,22 +118,16 @@ class Hostelworld
       type = row.at("div.hostelListingImage/span").inner_text
       hostel_id = url.match(/[\d]*$/).to_s
       
-      #@main_values = { :hostel_id => hostel_id, :name => name, :desc => desc, :type => type, :rating => rating }
-      #@extra = {}
-      
       if options[:date]
         #price_USD = row.at("span.blueBeds").inner_text #need to fix float
         dorm = (row.at("p.hostelListingRate/span.blueBeds/text()")).to_s.gsub(/[A-Z$]*/,'')
         single = row.at("p.hostelListingPrivateRate/span.blueBeds/text()").to_s.gsub(/[A-Z$]*/,'')
         available = row/"ul.hostelListingDates/li.noAvail/text()"
         available = available.to_a.join(',').split(',')
-        #available2 = row/"ul.hostelListingDates"/"text()"
-        #@extra = { :dorm => dorm, :single => single, :unavailable => available }
-        @results << Hostel.new(:hostel_id => hostel_id, :name => name, :description => desc, :ratings => rating, :price => dorm, :availability => available)
+        @results << Hostel.new(:hostel_id => hostel_id, :name => name, :description => desc, :rating => rating, :dorm => dorm, :single => single, :unavailable => available)
       else
-        @results << Hostel.new(:hostel_id => hostel_id, :name => name, :description => desc, :ratings => rating)
+        @results << Hostel.new(:hostel_id => hostel_id, :name => name, :description => desc, :rating => rating)
       end
-      #@results << @main_values.merge(@extra)
     end
     return @results
   end
@@ -150,8 +146,11 @@ class Hostelworld
 
       #the form name
       form = page.forms.first # => WWW::Mechanize::Form
-      page = agent.submit(form)
-
+      
+      Retryable.try 3 do
+        page = agent.submit(form)
+      end
+      
       #form must be submitted twice because the people writing hostelworld are retards
       form = page.forms.first # => WWW::Mechanize::Form
       form.field_with(:name => 'selMonth').options[month-1].select
@@ -161,7 +160,10 @@ class Hostelworld
       form.field_with(:name => 'Persons').options[no_ppl.to_i-1].select
       form.field_with(:name => 'Currency').options[4].select #US Currency
 
-      page = agent.submit(form)
+      Retryable.try 3 do
+        page = agent.submit(form)
+      end
+      
       data = page.search("//div[@id='content']")
 
       return data

data/spec/hb_find_hostels.spec

@@ -16,7 +16,7 @@ describe "test hostelbookers hostel listings" do
   end
   
   it "rating should be high for first choices" do
-    @h.first.ratings.to_i.should be > 50 
+    @h.first.rating.to_i.should be > 50 
   end
   
   it "desc should have a certain length <" do

data/spec/hw_find_by_hostel.spec

@@ -61,7 +61,7 @@ end
 
 describe "with dates to get availabilty and verify output!" do
   before(:all) do
-    @h = Hostelworld.find_hostel_by_id(:id => 20763, :date => (Date.today+10).to_s)
+    @h = Hostelworld.find_hostel_by_id(:id => 20763, :date => (Date.today+20).to_s)
   end
   
   it "get first availability and check it merit" do

data/spec/hw_find_hostels.spec

@@ -16,11 +16,11 @@ describe "finds list of hostels" do
   
   
   it "rating should be high for first choices" do
-    @h.first.ratings.to_i.should be > 50 
+    @h.first.rating.to_i.should be > 50 
   end
   
   it "desc should have a certain length <" do
-    @h.first.description.length.should be > 100 
+    @h.first.description.length.should be > 80
   end
   
   it "has a hostel number" do
@@ -36,7 +36,7 @@ describe "find hostels with dates" do
   end
   
   it "rating should be high for first choices" do
-    @h.first.ratings.to_i.should be > 50 
+    @h.first.rating.to_i.should be > 50 
   end
   
   it "desc should have a certain length <" do
@@ -48,15 +48,15 @@ describe "find hostels with dates" do
   end
   
   it "has dorm rooms for greater than $5" do
-    @h.first.price.to_i.should be > 5
+    @h.first.dorm.to_i.should be > 5
   end
   
   it "has available rooms!" do
-    @h.first.availability.first.should be nil
+    @h.first.unavailable.first.should be nil
   end
   
   it "has unavailable rooms!" do
-    @h.last.availability.first.should_not be nil
+    @h.last.unavailable.first.should_not be nil
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: holden-hostelify
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Holden Thomas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-09 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,7 +24,6 @@ extra_rdoc_files:
 - lib/hostel.rb
 - lib/hostel/gomio.rb
 - lib/hostel/hostel.rb
-- lib/hostel/hostel_available.rb
 - lib/hostel/hostelbookers.rb
 - lib/hostel/hostelworld.rb
 - lib/test.rb
@@ -32,10 +31,10 @@ files:
 - Manifest
 - README.rdoc
 - Rakefile
+- hostelify.gemspec
 - lib/hostel.rb
 - lib/hostel/gomio.rb
 - lib/hostel/hostel.rb
-- lib/hostel/hostel_available.rb
 - lib/hostel/hostelbookers.rb
 - lib/hostel/hostelworld.rb
 - lib/test.rb
@@ -44,9 +43,9 @@ files:
 - spec/hb_find_hostels.spec
 - spec/hw_find_by_hostel.spec
 - spec/hw_find_hostels.spec
-- hostelify.gemspec
 has_rdoc: true
 homepage: http://github.com/holden/hostelify
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -72,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hostelify
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Simple Hostel Webscrapper.

data/lib/hostel/hostel_available.rb

@@ -1,11 +0,0 @@
-class HostelAvailable
-  attr_accessor :name, :price, :spots, :bookdate
-  
-  def initialize(name, price, spots, bookdate)
-    @name = name
-    @price = price
-    @spots = spots
-    @bookdate = bookdate
-  end
-  
-end