eventual 0.5.3 → 0.5.4

data/README.rdoc

@@ -84,6 +84,7 @@ Ejemplos de formatos reconocidos:
 * 21 de marzo
 * 21 marzo
 * domingo 21 de marzo
+* domingo, 21 de marzo
 * 1, 2 y 3 de marzo
 * 1, 2 y 3 marzo
 * lunes 1, martes 2 y miercoles 3 de marzo
@@ -101,6 +102,7 @@ Ejemplos de formatos reconocidos:
 * los lunes y martes del 1 al 22 de marzo del '10
 * los lunes y los martes del 1 al 22 de marzo del '10
 * lunes y martes de diciembre a las 15
+* lunes y martes, de diciembre a las 15
 * lunes y martes de diciembre a las 15:30 hrs.
 * lunes y martes de diciembre a las 15:00 y 16:00 horas
 * lunes y martes de diciembre a las 3 am
@@ -111,6 +113,7 @@ Ejemplos de formatos reconocidos:
 Formatos a reconocer
 
 * todo el año
+* lunes y martes de diciembre, 3:15 p.m.
 
 == INSTALACIÓN:
 

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/eventual/es/event_parser.treetop

@@ -33,7 +33,11 @@ grammar EsDates
   
   ##########
   rule times
-    space 'a' space ('las' / 'la') (time_12 / time_24) ((space 'y' / ',') (time_12 / time_24))* <Eventual::Times>
+    time_range / time_list
+  end
+  
+  rule time_list
+    space 'a' space ('las' / 'la') (time_12 / time_24) ((space 'y' / ',') (time_12 / time_24))* <Eventual::TimeList>
   end
   
   rule time_24
@@ -41,7 +45,11 @@ grammar EsDates
   end
   
   rule time_12
-    space ('0' [0-9] / '1' [0-2] / [0-9]) (':' [0-5] [0-9])?  space? period:(('a'/'p') '.'? space? 'm' '.'? space?) <Eventual::Time12>
+    space ('0' [0-9] / '1' [0-2] / [0-9]) (':' [0-5] [0-9])?  space? period:(('a'/'p') '.'? space? 'm' '.'? ) <Eventual::Time12>
+  end
+  
+  rule time_range
+    space 'de' space ('las' / 'la') first:(time_12 / time_24) space 'a' space ('las' / 'la') last:(time_12 / time_24) <Eventual::TimeRange>
   end
 
   ##########
@@ -58,7 +66,7 @@ grammar EsDates
   end
   
   rule weekday_constrain
-    wdays_node:weekday space <Eventual::WeekdayConstrain>
+    wdays_node:weekday ','? space <Eventual::WeekdayConstrain>
   end
   
   rule weekday_list

data/lib/eventual/es.rb

@@ -1 +1,2 @@
 Treetop.load "#{ File.dirname __FILE__ }/es/event_parser"
+

data/lib/eventual/syntax_nodes.rb

@@ -6,12 +6,12 @@ module Eventual
   WdayListR       = /\b(?:#{ WdaysR.join('|') })/.freeze
 
   class WdayMatchError < StandardError #:nodoc:
-    def initialize value, wday_index
-      @value, @wday_index = value, wday_index
+    def initialize value
+      @value
     end
     
     def to_s
-      "El #{@value.day} de #{MonthNames[@value.month]} del #{@value.year} cae en #{Weekdays[@value.wday]} no #{Weekdays[@wday_index]}"
+      "El #{@value.day} de #{MonthNames[@value.month]} del #{@value.year} cae en #{Weekdays[@value.wday]}"
     end
   end
 
@@ -48,19 +48,13 @@ module Eventual
     attr_accessor :times
     
     # Returns last Date or DateTime of the encompassed period
-    def last
-      to_a.last
-    end
+    def last; to_a.last end
     
     # Returns last Date or DateTime of the encompassed period
-    def first
-      to_a.first
-    end
+    def first; to_a.first end
     
     # Returns an array with all the encompassed Dates or DateTimes
-    def to_a
-      map
-    end
+    def to_a; map end
     
     # Returns true if the weekday (as number) correspons to any allowed weekday
     def date_within_weekdays? date
@@ -78,15 +72,9 @@ module Eventual
       result = false
       walk { |elements| break result = true if elements.include? date }
       
-      unless date.class == Date or times.nil? or times.empty?
-        @time_span  ||= 60
-        return false unless times.inject(nil){ |memo, time|
-          check_against = ::Time.local date.year, date.month, date.day, time.hour, time.minute
-          time          = ::Time.local date.year, date.month, date.day, date.hour, date.min
-          break true if time >= check_against && time < check_against + 60 * @time_span
-        }
-      end
-      result
+      return result if !result or date.class == Date or times.nil?
+
+      times.include? date
     end
     
     private
@@ -96,7 +84,7 @@ module Eventual
           
       walk  = lambda do |elements|
         break unless elements
-        weekdays = elements.first.value if elements.first.class == WeekdayConstrain
+        weekdays = elements.shift.value if WeekdayConstrain === elements.first
         
         elements.reverse.map do |element|
           case element
@@ -105,7 +93,6 @@ module Eventual
             element.year     = year
             element.month    = month
             element.times    = @times
-            
             yield element
           when Year
             year  = element.value
@@ -113,29 +100,37 @@ module Eventual
           when MonthName
             month = element.value
             next nil
-          when WeekdayConstrain
-            next nil
-          when Times
-            @times = element.map
+          when TimeList, TimeRange
+            @times = element
             next nil
-          else
+          else            
             walk.call element.elements
           end
         end.reverse
       end
       walk.call(elements).flatten.compact
     end
+  
+    def make year, month, day
+      return Date.civil(year, month, day) unless times
+      times.make year, month, day
+    end
   end
 
   class Day < Node #:nodoc:
+    def value
+      Date.civil year, month, text_value.to_i
+    end
+    
     def map &block
-      dates = times ? times.map{ |time| DateTime.civil year, month, text_value.to_i, time.hour, time.minute } : [Date.civil(year, month, text_value.to_i)]
-      raise WdayMatchError.new(dates.first, weekdays.first) unless date_within_weekdays? dates.first
-      dates.map(&block)
+      dates = make(year, month, text_value.to_i)
+      dates = [dates] unless Array === dates
+      raise WdayMatchError.new(dates.first) unless date_within_weekdays? dates.first
+      dates.map &block
     end
     
     def include? date
-      map{ |e| e.strftime("%Y-%m-%d") }.include? date.strftime("%Y-%m-%d")
+      map { |element| [*element].map{ |e| e.strftime("%Y-%m-%d") } }.flatten.include? date.strftime("%Y-%m-%d")
     end
   end
 
@@ -152,33 +147,22 @@ module Eventual
     alias node_map map
     private :node_map
     
-    def map
-      array = []
-      range.each do |date|
+    def map &block
+      range.map do |date|
         next unless date_within_weekdays? date
-        next array.push(block_given? ? yield(date) : date) unless times
-        
-        times.each do |time|
-          new_date = DateTime.civil date.year, date.month, date.day, time.hour, time.minute
-          array.push block_given? ? yield(new_date) : new_date
-        end
+        dates = times ? make(date.year, date.month, date.day) : [date]
+        dates.map &block
       end
-      array
     end
   end
 
   class MonthPeriod < Period #:nodoc:
     def first
-      return Date.civil(year, month_name.value) unless times and !times.empty?
-      time = times.first
-      return DateTime.civil(year, month_name.value, 1, time.hour, time.minute)
+      Date.civil year, month_name.value
     end
-    
+
     def last
-      date = (first >> 1) - 1
-      return date unless times and !times.empty?
-      time = times.last
-      DateTime.civil(date.year, date.month, date.day, time.hour, time.minute)
+      Date.civil year, month_name.value, -1
     end
   end
 
@@ -192,32 +176,59 @@ module Eventual
     end
   end
 
-  class Times < Treetop::Runtime::SyntaxNode #:nodoc:
+  class TimeList < Treetop::Runtime::SyntaxNode #:nodoc:
     def map
       walk_times = lambda do |elements|
         break unless elements
-        elements.map { |e| Time === e ? e.value : walk_times.call(e.elements) }
+        elements.map do |element|
+          next walk_times.call(element.elements) unless Time === element
+          block_given? ? yield(element) : element
+        end
       end
-      walk_times.call(elements).flatten.compact.sort_by{ |t| '%02d%02d' % [t.hour, t.minute] }
+      walk_times.call(elements).flatten.compact
+    end
+    
+    def make year, month, day
+      map { |time| DateTime.civil year, month, day, time.hour, time.minute }.sort
+    end
+    
+    def include? date
+      map { |time| time.to_i }.include? date.strftime("%H%M").to_i
     end
   end
-
+  
   class Time < Treetop::Runtime::SyntaxNode #:nodoc:
-    attr_accessor :hour, :minute
     def value
-      @hour, @minute = text_value.scan(/\d+/).map(&:to_i)
-      @minute ||= 0
-      self
+      @value ||= text_value.scan(/\d+/).map(&:to_i)
     end
     
-
+    def hour; value.first end
+    def minute; value[1] || 0 end
+    
+    def to_i
+      ("%02d%02d" % [hour, minute]).to_i
+    end
   end
 
   class Time12 < Time #:nodoc:
-    def value
-      super
-      @hour += 12 if period.text_value.gsub(/[^a-z]/, '') == 'pm'
-      self
+    def pm?
+      @pm ||= true if period.text_value.include? 'pm'
+    end
+    
+    def hour
+      pm? ? super + 12 : super
+    end
+  end
+
+  class TimeRange < Treetop::Runtime::SyntaxNode #:nodoc:
+    def make year, month, day
+      first_time = DateTime.civil year, month, day, first.hour, first.minute
+      last_time  = DateTime.civil year, month, day, last.hour,  last.minute
+      (first_time..last_time)
+    end
+    
+    def include? date
+      (first.to_i..last.to_i).include? date.strftime("%H%M").to_i
     end
   end
 end

data/lib/eventual.rb

@@ -13,7 +13,7 @@ module Eventual
   #
   # Options:
   # +:lang+: 
-  #   Defaults to 'Es', the language to be used for parsing, currently only spanish is supported, hang on.
+  #   Defaults to 'Es', the language to be used for parsing, currently only spanish is supported, please contribute.
   # +:default_year+: 
   #   The default year to be used in case year is not specified in the text, defaults to current year
   # +:default_event_span+: 

data/spec/es_eventual_spec.rb

@@ -9,7 +9,7 @@ describe Eventual, 'Es' do
   describe 'proxy' do
     it "should raise NotImplementedError if using not implemented language" do
       lambda { Eventual.parse 'marzo', :lang => 'WP' }.should raise_error(NotImplementedError)
-    end    
+    end
   end
 
   shared_examples_for 'correctly parses' do
@@ -137,6 +137,17 @@ describe Eventual, 'Es' do
           lambda { Eventual.parse("lunes 21 de marzo").map }.should raise_error(Eventual::WdayMatchError)
         end
       end
+      
+      describe 'date with wday and comma' do
+        describe "parsing 'domingo, 21 de marzo'" do
+          before { @result = Eventual.parse("domingo, 21 de marzo") }
+          it_should_behave_like 'correctly parses'
+        end
+
+        it "should raise WdayMatchError if weekday doesn't correspond to date" do
+          lambda { Eventual.parse("lunes 21 de marzo").map }.should raise_error(Eventual::WdayMatchError)
+        end
+      end
     end
 
     describe 'day list' do
@@ -236,6 +247,14 @@ describe Eventual, 'Es' do
       end
       it_should_behave_like 'correctly parses'
     end
+    
+    describe "lunes y martes, del 1 de octubre al 2 de diciembre del 2008" do
+      before do 
+        @result = Eventual.parse "lunes y martes, del 1 de octubre al 2 de diciembre del 2008"
+        @dates  = (Date.parse('2008-10-1')..DateTime.parse('2008-12-2')).reject{ |day| not [1,2].include?(day.wday) }
+      end
+      it_should_behave_like 'correctly parses'
+    end
   
     describe 'with weekday constrain' do
       describe "wdays for 'lunes y martes del 1 al 22 de marzo del '10" do
@@ -337,6 +356,7 @@ describe Eventual, 'Es' do
         @result = Eventual.parse('1 de enero del 2010 a las 15:00')
         @dates  = [DateTime.civil 2010, 1, 1, 15]
       end
+      
       it_should_behave_like 'correctly parses'
       it_should_behave_like 'outputs DateTime'
     end
@@ -390,6 +410,24 @@ describe Eventual, 'Es' do
       end
     end
     
+    describe 'three times for month range' do
+      before do
+        @result = Eventual.parse('lunes y martes de diciembre a las 16:00, 17:00 y 15:00 horas')
+        @dates  = (
+          (DateTime.parse('2010-12-1T15:00')..DateTime.parse('2010-12-31T15:00')).map + 
+          (DateTime.parse('2010-12-1T16:00')..DateTime.parse('2010-12-31T16:00')).map +
+          (DateTime.parse('2010-12-1T17:00')..DateTime.parse('2010-12-31T17:00')).map
+        ).reject{ |day| not [1,2].include?(day.wday) }
+      end
+      
+      it_should_behave_like 'correctly parses'
+      it_should_behave_like 'outputs DateTime'
+      
+      it "should not include other time" do
+        @result.should_not include(DateTime.parse('2010-12-06T14:00'))
+      end
+    end
+    
     describe 'range with time as 12 hours am' do
       before do
         @result = Eventual.parse('lunes y martes de diciembre a las 3 am')
@@ -423,14 +461,6 @@ describe Eventual, 'Es' do
       end
       it_should_behave_like 'correctly parses'
       it_should_behave_like 'outputs DateTime'
-      
-      it "should include time encompassed in 60 minutes from start" do
-        @result.should include(DateTime.civil(2010, 12, 1, 15, 30))
-      end
-      
-      it "should not include time past 60 minutes from start" do
-        @result.should_not include(DateTime.civil(2010, 12, 1, 16, 00))
-      end
     end
     
     describe 'event defined timespan' do
@@ -440,21 +470,28 @@ describe Eventual, 'Es' do
       end
       it_should_behave_like 'correctly parses'
       it_should_behave_like 'outputs DateTime'
-      
-      it "should include time encompassed in 60 minutes from start" do
-        @result.should include(DateTime.civil(2010, 12, 1, 15, 30))
+    end
+  end
+  
+  describe "with time range" do
+    describe 'single day with time range' do
+      before do
+        @result = Eventual.parse('1 de enero del 2010 de las 15:00 a las 16:00')
+        @ranges = [(DateTime.civil 2010, 1, 1, 15)..(DateTime.civil 2010, 1, 1, 16)]
       end
       
-      it "should not include time past 60 minutes from start" do
-        @result.should include(DateTime.civil(2010, 12, 1, 16, 00))
-      end
+      it { @result.should_not be_nil }
+      it { @result.to_a.size.should == @ranges.map.size }
+      it { @result.should map_dates *@ranges }
+      it { @ranges.each{ |range|  range.each{ |date| @result.should include(date) } } }
+      # it { @result.should_not include(@dates.first - 1) }
+      # it { @result.should_not include(@dates.last + 1) }
+      # it { @dates.select{ |d| @result.include? d }.map{ |d| d.to_s  }.should == @dates.map{ |r| r.to_s  } }
       
-      it "should not include time past 60 minutes from start" do
-        @result.should_not include(DateTime.civil(2010, 12, 1, 17, 00))
-      end
     end
   end
   
+  
   describe 'Marshal dump' do
     describe "month without year parsing 'marzo'" do
       before do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Macario Ortega
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -05:00
+date: 2010-09-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency