eventual 0.5.6 → 0.5.7

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/lib/eventual/es/event_parser.treetop

@@ -12,7 +12,7 @@ grammar EsDates
   end
   
   rule period
-    weekdays_constrain? (range / month)
+    weekday_list_constrain? (range / month)
   end
   
   rule date
@@ -60,7 +60,6 @@ grammar EsDates
     time_range ((space 'y' / ',') time_range)* <Eventual::TimeRangeList>
   end
 
-  ##########
   rule month_name
     (((space 'de') / ',')? space)? ('enero' / 'febrero' / 'marzo' / 'abril' / 'mayo' / 'junio' / 'julio' / 'agosto' / 'septiembre' / 'octubre' / 'noviembre' / 'diciembre') <Eventual::MonthName>
   end
@@ -69,10 +68,14 @@ grammar EsDates
     ((space 'de' 'l'?) / ',')? space ([1-9] [0-9] [0-9] [0-9] / "'" [0-9] [0-9]) <Eventual::Year>
   end
   
-  rule weekdays_constrain
-    wdays_node:(weekday_list / weekdays / weekday) (',' / (space ('del' / 'de' / 'durante todo' / 'durante')))? space <Eventual::WeekdayConstrain>
+  rule weekday_list_constrain
+    wdays_node:(weekday_period / weekday_list / weekdays / weekday) (',' / (space ('del' / 'de' / 'durante todo' / 'durante')))? space <Eventual::WeekdayConstrain>
   end
   
+  rule weekday_period
+    ('de' space)? weekday space 'a' space weekday 
+  end
+
   rule weekday_constrain
     wdays_node:weekday ','? space <Eventual::WeekdayConstrain>
   end

data/lib/eventual/syntax_nodes.rb

@@ -26,13 +26,21 @@ module Eventual
 
   class WeekdayConstrain < Treetop::Runtime::SyntaxNode #:nodoc:
     def value
-      text    = wdays_node.text_value.sub('semana', '')
+      text    = wdays_node.text_value.sub('semana', '').sub(/^de\s/, '')
       days    = text.scan(WdayListR).map{ |d| WdaysR.index /#{d}/ }
       days   += (1..5).map if text.include?('entre')
       days   += [6,0] if text.include?('fines')
+      days.sort!
+      days    = (days.first..days.last).map if text.match /\sal?\s/
       days.uniq
     end
   end
+  
+  class WeekdayPeriodConstrain < WeekdayConstrain #:nodoc:
+    def value
+      text_value.scan() 
+    end
+  end
 
   class MonthName < Treetop::Runtime::SyntaxNode #:nodoc:
     def value
@@ -236,4 +244,4 @@ module Eventual
       (first.to_i..last.to_i).include? date.strftime("%H%M").to_i
     end
   end
-end
+end

data/spec/es_eventual_spec.rb

@@ -361,6 +361,23 @@ describe Eventual, 'Es' do
           it_should_behave_like 'includes corresponding dates'
         end
       end
+
+      describe 'wday range' do
+        before do
+          @dates = (Date.parse('2010-3-1')..Date.parse('2010-3-22')).reject{ |day| not [1,2,3,4,5].include?(day.wday) }
+        end
+        describe "wdays for 'lunes a viernes del 1 al 22 de marzo del '10" do
+          before { @result = Eventual.parse("lunes a viernes del 1 al 22 de marzo del '10") }
+          it_should_behave_like 'correctly parses dates'
+          it_should_behave_like 'includes corresponding dates'
+        end
+
+        describe "wdays for 'de lunes a viernes del 1 al 22 de marzo del '10" do
+          before { @result = Eventual.parse("de lunes a viernes del 1 al 22 de marzo del '10") }
+          it_should_behave_like 'correctly parses dates'
+          it_should_behave_like 'includes corresponding dates'
+        end
+      end
     end
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eventual
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Macario Ortega
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -05:00
+date: 2010-10-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 4
@@ -35,9 +38,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -81,26 +86,30 @@ 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.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Reconocimiento de fechas y periodos en lenguaje natural. Natural language date and period parsing, currently only in spanish.
 test_files: 
-- spec/es_eventual_spec.rb
 - spec/spec_helper.rb
+- spec/es_eventual_spec.rb