eventual 0.5.2 → 0.5.3

data/README.rdoc

@@ -64,7 +64,7 @@ Ejemplos:
   => false
   
   # Pero se puede cambiar
-  dates           = Eventual.parse( 'del 5 al 7 de junio del 2007 a las 16:00', :default_event_span => 120)
+  dates = Eventual.parse( 'del 5 al 7 de junio del 2007 a las 16:00', :default_event_span => 120)
   dates.include? DateTime.civil(2007, 6, 6, 17, 00)
   => true
   
@@ -114,7 +114,11 @@ Formatos a reconocer
 
 == INSTALACIÓN:
 
-  [sudo] gem install eventual -s http://gemcutter.org
+  [sudo] gem install eventual
+  
+== Documentation
+
+http://rdoc.info/projects/maca/eventual
 
 == LICENCIA:
 

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/eventual/syntax_nodes.rb

@@ -4,8 +4,8 @@ module Eventual
   ShortMonthNames = %w(ene feb mar abr may jun jul ago sept oct nov dic).freeze
   WdaysR          = [/d/, /l/, /ma/, /mi/, /j/, /v/, /s/].freeze
   WdayListR       = /\b(?:#{ WdaysR.join('|') })/.freeze
-  # :nodoc: 
-  class WdayMatchError < StandardError
+
+  class WdayMatchError < StandardError #:nodoc:
     def initialize value, wday_index
       @value, @wday_index = value, wday_index
     end
@@ -14,8 +14,8 @@ module Eventual
       "El #{@value.day} de #{MonthNames[@value.month]} del #{@value.year} cae en #{Weekdays[@value.wday]} no #{Weekdays[@wday_index]}"
     end
   end
-  # :nodoc: 
-  class Year < Treetop::Runtime::SyntaxNode
+
+  class Year < Treetop::Runtime::SyntaxNode #:nodoc:
     def value
       match  = text_value.match(/(')?(\d{2,4})/)
       value  = match[2].to_i
@@ -23,8 +23,8 @@ module Eventual
       value
     end
   end
-  # :nodoc: 
-  class WeekdayConstrain < Treetop::Runtime::SyntaxNode
+
+  class WeekdayConstrain < Treetop::Runtime::SyntaxNode #:nodoc:
     def value
       text    = wdays_node.text_value.sub('semana', '')
       days    = text.scan(WdayListR).map{ |d| WdaysR.index /#{d}/ }
@@ -33,8 +33,8 @@ module Eventual
       days.uniq
     end
   end
-  # :nodoc: 
-  class MonthName < Treetop::Runtime::SyntaxNode
+
+  class MonthName < Treetop::Runtime::SyntaxNode #:nodoc:
     def value
       ShortMonthNames.index(text_value.downcase.match(/#{ ShortMonthNames.join('|') }/).to_s) + 1
     end
@@ -65,7 +65,7 @@ module Eventual
     # Returns true if the weekday (as number) correspons to any allowed weekday
     def date_within_weekdays? date
       return true unless weekdays
-      weekdays.include?(date.wday)
+      weekdays.include? date.wday
     end
     
     # Invokes block once for each Date or DateTime. Creates a new array containing the values returned by the block.
@@ -79,13 +79,12 @@ module Eventual
       walk { |elements| break result = true if elements.include? date }
       
       unless date.class == Date or times.nil? or times.empty?
-        @time_span ||= 60
-        within_time = times.inject(nil) { |memo, time|
-          first = ::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 >= first and time < first + 60 * @time_span
+        @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
         }
-        return false unless within_time
       end
       result
     end
@@ -128,8 +127,7 @@ module Eventual
     end
   end
 
-  # :nodoc: 
-  class Day < Node
+  class Day < Node #:nodoc:
     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
@@ -137,11 +135,11 @@ module Eventual
     end
     
     def include? date
-      to_a.include? date
+      map{ |e| e.strftime("%Y-%m-%d") }.include? date.strftime("%Y-%m-%d")
     end
   end
-  # :nodoc: 
-  class Period < Node
+
+  class Period < Node #:nodoc:
     def range
       (first..last)
     end
@@ -168,8 +166,8 @@ module Eventual
       array
     end
   end
-  # :nodoc: 
-  class MonthPeriod < Period
+
+  class MonthPeriod < Period #:nodoc:
     def first
       return Date.civil(year, month_name.value) unless times and !times.empty?
       time = times.first
@@ -183,8 +181,8 @@ module Eventual
       DateTime.civil(date.year, date.month, date.day, time.hour, time.minute)
     end
   end
-  # :nodoc: 
-  class DatePeriod < Period
+
+  class DatePeriod < Period #:nodoc:
     def first
       node_map.first
     end
@@ -193,8 +191,8 @@ module Eventual
       node_map.last
     end
   end
-  # :nodoc: 
-  class Times < Treetop::Runtime::SyntaxNode
+
+  class Times < Treetop::Runtime::SyntaxNode #:nodoc:
     def map
       walk_times = lambda do |elements|
         break unless elements
@@ -203,17 +201,19 @@ module Eventual
       walk_times.call(elements).flatten.compact.sort_by{ |t| '%02d%02d' % [t.hour, t.minute] }
     end
   end
-  # :nodoc: 
-  class Time < Treetop::Runtime::SyntaxNode
+
+  class Time < Treetop::Runtime::SyntaxNode #:nodoc:
     attr_accessor :hour, :minute
     def value
       @hour, @minute = text_value.scan(/\d+/).map(&:to_i)
       @minute ||= 0
       self
     end
+    
+
   end
-  # :nodoc: 
-  class Time12 < Time
+
+  class Time12 < Time #:nodoc:
     def value
       super
       @hour += 12 if period.text_value.gsub(/[^a-z]/, '') == 'pm'

data/lib/eventual.rb

@@ -10,14 +10,15 @@ module Eventual
   # Parses dates specified in natural language and returns an Eventual::Node object
   #     Eventual.parse( 'del 5 al 7 de junio del 2009' ).map
   #     => [#<DateTime: 4909975/2,0,2299161>, #<DateTime: 4909977/2,0,2299161>, #<DateTime: 4909979/2,0,2299161
-  #   Options:
-  #     +:lang+: 
-  #       Defaults to 'Es', the language to be used for parsing, currently only spanish is supported, hang on.
-  #     +:default_year+: 
-  #       The default year to be used in case year is not specified in the text, defaults to current year
-  #     +:default_event_span+: 
-  #       The duration in minutes an event has, defaults to 60
   #
+  # Options:
+  # +:lang+: 
+  #   Defaults to 'Es', the language to be used for parsing, currently only spanish is supported, hang on.
+  # +:default_year+: 
+  #   The default year to be used in case year is not specified in the text, defaults to current year
+  # +:default_event_span+: 
+  #   The duration in minutes an event has, defaults to 60
+  # 
   def self.parse text, opts = {}
     lang    = opts.delete(:lang) || 'Es'
     year    = opts.delete(:default_year)
@@ -26,7 +27,9 @@ module Eventual
     raise ArgumentError, "Expected option `:default_year` to be an integer"        if year && !(Integer === year)
     raise ArgumentError, "Expected option `:default_event_span` to be an integer"  if span && !(Integer === span)
     
-    node = const_get("#{ lang.to_s[0..1].capitalize }DatesParser").new.parse(text)
+    parser = const_get("#{ lang.to_s[0..1].capitalize }DatesParser") rescue raise( NotImplementedError.new("Parsing has not yet been implemented for the language '#{lang}'"))
+    node   = parser.new.parse(text) 
+
     node.year      = year if year
     node.time_span = span if span
     node

data/spec/es_eventual_spec.rb

@@ -5,6 +5,12 @@ describe Eventual, 'Es' do
   before do
     Date.stub!(:today).and_return Date.civil(2010)
   end
+  
+  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
 
   shared_examples_for 'correctly parses' do
     it { @result.should_not be_nil }
@@ -409,6 +415,44 @@ describe Eventual, 'Es' do
         @result.should_not include(DateTime.parse('2010-12-06T14:00'))
       end
     end
+  
+    describe 'event default timespan' do
+      before do
+        @result = Eventual.parse('1 de diciembre del 2010 a las 15:00')
+        @dates  = [DateTime.parse('2010-12-1T15:00')]
+      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
+      before do
+        @result = Eventual.parse('1 de diciembre del 2010 a las 15:00', :default_event_span => 120)
+        @dates  = [DateTime.parse('2010-12-1T15:00')]
+      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 include(DateTime.civil(2010, 12, 1, 16, 00))
+      end
+      
+      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

metadata

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