datesplit 0.0.3 → 0.0.4

data/lib/datesplit.rb

@@ -1,41 +1,43 @@
 require 'date'
 class Datesplit
+  include Enumerable
   def initialize(date_string)
     @date_string = String.new(date_string)
   end
 
   def start_date
-    expressions.each do |expression, returns|
-      m = @date_string.match(expression)
-      if m
-        @start_date = Date.parse("#{m.captures[returns.index(:month_only) || returns.index(:month_one)]} #{m.captures[returns.index(:day_one)]} #{m.captures[returns.index(:year_only) || returns.index(:year_one)]}") 
-        break
-      end
-    end  
-    raise "Can't process #{@date_string}" unless @start_date 
-    return @start_date
+    range.begin
   end
     
   def end_date
+    range.end
+  end
+  
+  def range
+    return if @range
     expressions.each do |expression, returns|
       m = @date_string.match(expression)
       if m
-        @end_date = Date.parse("#{m.captures[returns.index(:month_only) || returns.index(:month_two) ]} #{m.captures[returns.index(:day_two)]} #{m.captures[returns.index(:year_only) || returns.index(:year_two)]}") 
+        @start = Date.parse("#{m.captures[returns.index(:month_only) || returns.index(:month_one)]} #{m.captures[returns.index(:day_one)]} #{m.captures[returns.index(:year_only) || returns.index(:year_one)]}")
+        @end = Date.parse("#{m.captures[returns.index(:month_only) || returns.index(:month_two) ]} #{m.captures[returns.index(:day_two)]} #{m.captures[returns.index(:year_only) || returns.index(:year_two)]}") 
         break
       end
     end
-    raise "Can't process #{@date_string}" unless @end_date 
-    return @end_date
-  end
-  
+    raise "Can't process #{@date_string}" unless @start && @end
+    @start..@end
+  end 
+    
   def number_of_days
-    (end_date - start_date).to_i
+    range.to_a.size
   end
   
+  def each(&blk)
+    range.each(&blk)
+  end
+    
   private 
     def expressions
       {
-        
         /(\w+)\.*(?:\t|\s)*(\d+)\w*(?:\t|\s)*(?:\-|to)(?:\t|\s)*(\d+)\w*,*(?:\t|\s)*(\d*)/                                            => [:month_only, :day_one, :day_two, :year_only], # September 13-15, 2011 (Year Optional)
         /(\w+)\.*(?:\t|\s)*(\d+)\w*(?:\t|\s)*(?:\-|to)(?:\t|\s)*(\w+)\.*(?:\t|\s)*(\d+)\w*,*(?:\t|\s)*(\d*)/                          => [:month_one, :day_one, :month_two, :day_two, :year_only], # September 13 to October 15, 2011 (Year Optional)        
         /(\w+)\.*(?:\t|\s)*(\d{1,2})\w*,*(?:\t|\s)*(\d{4})(?:\t|\s)*(?:\-|to)(?:\t|\s)*(\w+)\.*(?:\t|\s)*(\d+)\w*,*(?:\t|\s)*(\d{4})/ => [:month_one, :day_one, :year_one, :month_two, :day_two, :year_two] # September 13, 2012 to October 15 2013 (Year Required)

data/spec/datesplit_spec.rb

@@ -1,46 +1,62 @@
 require 'spec_helper'
 
 describe Datesplit do
-  it "should return dates for 'April 11 to April 20, 2012'" do
+  it "handles a format of '<Month> <Day> to <Month> <Day>, <Year>'" do
     d = Datesplit.new('April 11 to April 20, 2012')
     d.start_date.to_s.should == Date.parse('April 11, 2012').to_s
     d.end_date.to_s.should == Date.parse('April 20, 2012').to_s
   end
   
-  it "should return dates for 'April 11 to April 20'" do
+  it "handles a format of '<Month> <Day> to <Month> <Day>'" do
     d = Datesplit.new('April 11 to April 20')
     d.start_date.to_s.should == Date.parse('April 11').to_s
     d.end_date.to_s.should == Date.parse('April 20').to_s
   end
   
-  it "should return dates for 'April 11th-20th 2012'" do
+  it "handles a format of '<Month> <Day>-<Day> <Year>'" do
     d = Datesplit.new('April 11th-20th 2012')
     d.start_date.to_s.should == Date.parse('April 11 2012').to_s
     d.end_date.to_s.should == Date.parse('April 20 2012').to_s
   end
   
-  it "should return dates for 'April 11 to 20 2012'" do
+  it "handles a format of '<Month> <Day>-<Day>'" do
+    d = Datesplit.new('April 11th-20th')
+    d.start_date.to_s.should == Date.parse('April 11').to_s
+    d.end_date.to_s.should == Date.parse('April 20').to_s
+  end
+  
+  it "handles a format of '<Month> <Day> to <Day> <Year>'" do
     d = Datesplit.new('April 11 to 20 2012')
     d.start_date.to_s.should == Date.parse('April 11 2012').to_s
     d.end_date.to_s.should == Date.parse('April 20 2012').to_s
   end
   
   
-  it "should return dates for 'March 30-April 1, 2012'" do
+  it "handles a format of '<Month> <Day>-<Month> <Day>, <Year>'" do
     d = Datesplit.new('March 30-April 1, 2012')
     d.start_date.to_s.should == Date.parse('March 30 2012').to_s
     d.end_date.to_s.should == Date.parse('April 1 2012').to_s
   end
   
-  it "should return dates for 'Apr 27  to April 29, 2012'" do
-    d = Datesplit.new('Apr 27  to April 29, 2012')
-    d.start_date.to_s.should == Date.parse('Apr 27 2012').to_s
-    d.end_date.to_s.should == Date.parse('April 29, 2012').to_s
-  end
-  
-  it "should return dates for 'April 9, 2012 to January 1st 2013'" do
+  it "handles a format of '<Month> <Day>, <Year> to <Month> <Day> <Year>'" do
     d = Datesplit.new('April 9, 2012 to January 1st 2013')
     d.start_date.to_s.should == Date.parse('April 9 2012').to_s
     d.end_date.to_s.should == Date.parse('January 1 2013').to_s
   end
+  
+  it "returns the correct number of days" do
+    d = Datesplit.new('April 9 to 13')
+    d.number_of_days.should == 5
+  end
+  
+  it "responds properly to each" do
+    d = Datesplit.new('April 9 to 13')
+    total = 0
+    d.each_with_index do |date, i|
+      date.should be_a(Date)
+      total = i
+    end
+    total.should == 4
+  end
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Sean Roberts
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 -04:00
+date: 2011-09-15 00:00:00 -04:00
 default_executable: 
 dependencies: []