datesplit 0.0.2 → 0.0.3

data/lib/datesplit.rb

@@ -8,7 +8,7 @@ class Datesplit
     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)]}") 
+        @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  
@@ -20,7 +20,7 @@ class Datesplit
     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)]}") 
+        @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)]}") 
         break
       end
     end
@@ -35,8 +35,10 @@ class Datesplit
   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], # 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] # September 13 to October 15, 2011 (Year Optional)        
+        
+        /(\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)
       }
     end
 end

data/spec/datesplit_spec.rb

@@ -37,4 +37,10 @@ describe Datesplit do
     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
+    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
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: datesplit
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Sean Roberts
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 Z
+date: 2011-09-14 00:00:00 -04:00
+default_executable: 
 dependencies: []
 
 description: Generate date objects from a date duration string (eg. 'September 9th-12th, 2012')
@@ -29,8 +29,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/datesplit.rb
-- spec/datesplit_spec.rb
-- spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/seanroberts/datesplit
 licenses: []
 
@@ -40,27 +39,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Generate date objects from a date duration string (eg. 'September 9th-12th, 2012')