vrbo 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b7990c46d5ee84bfe3fd1451a4c2b5045287090
-  data.tar.gz: 2df091092b778145702253ab076dac53cffdc98e
+  metadata.gz: 72cf31755f44dfcc866e18686ed537ff8c18a007
+  data.tar.gz: ff2eb37a978de9dbc58e7acc9d500adae7a23ffe
 SHA512:
-  metadata.gz: 1ef5432869ea892dffe895657a580d461bb8781baf56f7efde18aeae557305c920f431b4e3371d037cac35fc65f99b54cb0fbe2edff2f5530fe7a1773cf883e9
-  data.tar.gz: 83dab6f78e95e01ec3d963a6c23930eeaae0c3121ffcf21c0209d88ef56eef527d66f1bd80b68814c45e942d74f972d1d69d42b7f9b9dc11e4ac214cb466bbc7
+  metadata.gz: 9e9e470bb51bb3fbb8c89664b4a1a386cd33a5d648f325dd28450d2e773e72b101ad8f1fa91423a074cca0a1bf5b0774f4929b7627c735460bdd9ebfaec554e0
+  data.tar.gz: df400f306a153603eb0ee3d7787ed9b238637bddb16812e7fbf9c86dbbd6590169cb1380dffe752faa260e2afcfe0b9fcfea73f69474ea7911a41fd56b813942

data/Rakefile

@@ -1 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake'
+require 'rake/testtask'
+
+task default: :test
+
+Rake::TestTask.new do |t|
+  t.pattern = 'test/**/*_test.rb'
+end

data/lib/vrbo/availability.rb

@@ -1,21 +1,32 @@
 module VRBO
   class Availability
 
-    attr_accessor :start_at, :duration, :error
+    attr_accessor :start_at, :duration, :error, :dates
 
-    def initialize(dates = [])
-      dates = dates || []
+    # assumes dates are in ascending order
+    def initialize(the_dates = nil)
+      @dates = the_dates || []
       if dates.any?
         @start_at = Date.parse(dates.shift)
       else
         @start_at = Date.today
         @error = 'Maybe... But likely there was an error.'
       end
-      @duration = calc_duration(dates)
+      @duration = count_continuous_dates
     end
 
-    def calc_duration(dates)
-      1 + dates.each_with_index.sum { |the_date, i| Date.parse(the_date) - (start_at + i) == 1 ? 1 : 0 }
+    def count_continuous_dates
+      i = -1
+      count = 1
+      dates.each do |the_date|
+        diff = Date.parse(the_date) - (start_at + (i += 1))
+        if diff.to_i == 1
+          count += 1
+        else
+          break
+        end
+      end
+      count
     end
   end
 end

data/lib/vrbo/calendar.rb

@@ -4,11 +4,11 @@ module VRBO
   class Calendar
     extend ClassMethods
 
-    attr_accessor :id, :available_dates, :cells
+    attr_accessor :id, :available_dates, :days
 
     def initialize(calendar_id = nil)
       @id = calendar_id || VRBO.config.calendar_id
-      @cells = {}
+      @days = {}
       @available_dates = []
     end
 
@@ -23,32 +23,39 @@ module VRBO
 
     def find_all_available_dates
       today = Date.today
-      @available_dates = today.upto(today + 365).map { |date| availability_for(date) }.compact
+      @available_dates = today.upto(today + 365).map { |date| date_if_available(date) }.compact
     end
 
-    def availability_for(date)
+    def date_if_available(date)
       m = date.month.to_s
-      cells[m] ||= find_cells_for(date).map { |cell| cell.children.to_s.strip }
+      days[m] ||= collect_days_for_month(date)
+      date.to_s if days[m].include?(date.day.to_s)
+    end
 
-      if cells[m].include?(date.day.to_s)
-        date.to_s
-      else
-        nil
-      end
+    def collect_days_for_month(date)
+      scrape_table_for(date).map { |cell| cell.children.to_s.strip }
     end
 
-    def find_cells_for(date)
+    def scrape_table_for(date)
       calendar.search('.cal-month').at(table_xpath(date)).search('td:not(.strike)')
     end
 
     def calendar
-      @calendar ||= agent.get("http://www.vrbo.com/#{id}/calendar")
+      @calendar ||= agent.get(calendar_url)
     end
 
     def agent
       @agent ||= Mechanize.new
     end
 
+    def calendar_url
+      if id
+        "http://www.vrbo.com/#{id}/calendar"
+      else
+        raise ArgumentError, 'You must provide a calendar id'
+      end
+    end
+
     # March 2014
     def table_xpath(date)
       "//b[contains(text(), '#{date.strftime('%B %Y')}')]/following-sibling::table"

data/lib/vrbo/version.rb

@@ -1,3 +1,3 @@
 module VRBO
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/vrbo.rb

@@ -19,4 +19,8 @@ module VRBO
     @config ||= Configuration.new
   end
 
+  def reset_config
+    @config = nil
+  end
+
 end

data/test/support/calendar_dates.rb

@@ -0,0 +1,45 @@
+module CalendarDates
+
+  module Stubs
+    def collect_days_for_month(date)
+      dates = date.upto(date.next_month).to_a
+      dates.map(&:day).map(&:to_s).take(3)
+    end
+  end
+
+  def available?(list, a = today, b = tomorrow)
+    vrbo_calendar.available?(a, b, list)
+  end
+
+  def all
+    prep [today, tomorrow]
+  end
+
+  def random
+    prep all.shuffle
+  end
+
+  def arrival_only
+    prep [today]
+  end
+
+  def depart_only
+    prep [tomorrow]
+  end
+
+  def prep(list)
+    list.map(&:to_s)
+  end
+
+  def today
+    @today ||= Date.today
+  end
+
+  def tomorrow
+    @tomorrow ||= today + 1
+  end
+
+  def vrbo_calendar
+    @vrbo_calendar ||= VRBO::Calendar.prepend(Stubs).new
+  end
+end

data/test/vrbo/availability_test.rb

@@ -0,0 +1,23 @@
+$: << 'test'
+require 'minitest/autorun'
+require 'vrbo'
+require 'support/calendar_dates'
+
+class AvailabilityTest < MiniTest::Unit::TestCase
+  include CalendarDates
+
+  def test_new_with_params
+    availability = VRBO::Availability.new(all << (tomorrow + 2).to_s)
+    assert_equal today, availability.start_at
+    assert_equal 2, availability.duration
+    assert_nil availability.error
+  end
+
+  def test_new_without_params
+    availability = VRBO::Availability.new
+    assert_equal today, availability.start_at
+    assert_equal 1, availability.duration
+    assert_includes availability.error, 'error'
+  end
+
+end

data/test/vrbo/calendar_test.rb

@@ -0,0 +1,70 @@
+$: << 'test'
+require 'minitest/autorun'
+require 'vrbo'
+require 'support/calendar_dates'
+
+class CalendarTest < MiniTest::Unit::TestCase
+  include CalendarDates
+
+  def calendar_id
+    212121
+  end
+
+  def test_available_with_all
+    assert_equal true, available?(all)
+  end
+
+  def test_available_with_random
+    assert_equal true, available?(random)
+  end
+
+  def test_available_with_arrival
+    assert_equal true, available?(arrival_only)
+  end
+
+  def test_available_with_depart
+    assert_equal false, available?(depart_only)
+  end
+
+  def test_available_with_empty
+    assert_equal false, available?([])
+  end
+
+  def test_available_with_edge
+    assert_equal true, available?(all, today, tomorrow + 1)
+  end
+
+  def test_available_with_exceeding
+    assert_equal false, available?(all, today, tomorrow + 2)
+  end
+
+  def test_find_all_available_dates
+    # 3 days taken for each month (36) + 1 day padding
+    assert_equal 37, vrbo_calendar.find_all_available_dates.length
+    assert_equal today.to_s, vrbo_calendar.available_dates.first
+    assert_equal (today + 365).to_s, vrbo_calendar.available_dates.last
+    assert_equal vrbo_calendar.days.length, 12
+  end
+
+  def test_passing_calendar_id
+    cal = VRBO::Calendar.new(calendar_id)
+    assert_equal calendar_id, cal.id
+    assert_equal "http://www.vrbo.com/#{calendar_id}/calendar", cal.calendar_url
+  end
+
+  def test_no_calendar_id_given
+    assert_raises ArgumentError do
+      VRBO::Calendar.new.calendar_url
+    end
+  end
+
+  def test_calendar_id_from_config
+    VRBO.configure do |config|
+      config.calendar_id = calendar_id
+    end
+    cal = VRBO::Calendar.new
+    VRBO.reset_config
+    assert_equal calendar_id, cal.id
+    assert_equal "http://www.vrbo.com/#{calendar_id}/calendar", cal.calendar_url
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vrbo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Buckley
@@ -84,6 +84,9 @@ files:
 - lib/vrbo/class_methods.rb
 - lib/vrbo/configuration.rb
 - lib/vrbo/version.rb
+- test/support/calendar_dates.rb
+- test/vrbo/availability_test.rb
+- test/vrbo/calendar_test.rb
 - vrbo.gemspec
 homepage: ''
 licenses:
@@ -109,4 +112,7 @@ rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Scrapes a VRBO calendar using Mechanize
-test_files: []
+test_files:
+- test/support/calendar_dates.rb
+- test/vrbo/availability_test.rb
+- test/vrbo/calendar_test.rb