maca-eventual 0.4.5 → 0.4.7

data/Rakefile

@@ -2,16 +2,14 @@ require 'rubygems' unless ENV['NO_RUBYGEMS']
 %w[rake rake/clean fileutils newgem rubigen].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/eventual'
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
+
+
 $hoe = Hoe.new('eventual', Eventual::VERSION) do |p|
   p.developer('Macario Ortega', 'macarui@gmail.com')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.rubyforge_name       = p.name
   
   p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  # path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  # p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
   p.rsync_args = '-av --delete --ignore-errors'
 end
 

data/eventual.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eventual}
-  s.version = "0.4.5"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Macario Ortega"]
-  s.date = %q{2009-08-31}
+  s.date = %q{2009-09-01}
   s.description = %q{}
   s.email = ["macarui@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]

data/lib/eventual.rb

@@ -4,41 +4,40 @@ require 'strscan'
 
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-
 module Eventual
-  VERSION = '0.4.5'
+  VERSION = '0.4.7'
   extend self
 
   WDAY_LIST       = %w(domingo lunes martes miercoles jueves viernes sabado)
   MNAMES          = %w(enero febrero marzo abril mayo junio julio agosto septiembre octubre noviembre diciembre).unshift(nil)
   
-  year     = /(?: (?:del|de))? (\d{4})/
-  horarios = / a las (.*)/
+  year     = /(?: (?:del|de))? (\d{4})/i
+  horarios = / a las (.*)/i
   DAY_LIST = %r{
                  (
                    (?:
                      \d{1,2}
-                     (?-mix: |, | y )
+                     (?-x: |, | y )
                    )+                                        # Lista de número de día
                  )
-                 de\s(#{ MNAMES.compact.join('|') })         # Lista de mes
+                 de\s(#{ MNAMES.compact.join('|') })         # Mes
                  (?:#{ year })?                              # Año opcional
                  (#{ horarios })?                            # Hora opcional
                }ixo
                
   DAY_PERIOD = %r{
                    (
-                     (?:                                     # Dia de la semana opcional
+                     (?:                                     # Dias de la semana opcionales
                        (?:#{ WDAY_LIST.join('|') })            # Nombre del día
-                       (?-mix: |, | y )                        # Concatenador
+                       (?-x: |, | y )                          # Concatenador
                      )*
                    )
-                   (?-mix:del (\d{1,2}))\s                   # Comienzo del periodo
-                   (?:de\s                                   # Mes opcional
+                   (?-x:del (\d{1,2}))\s                   # Comienzo del periodo
+                   (?:de\s                                    # Mes opcional
                      (#{ MNAMES.compact.join('|') })          # Nombre del mes
                      (?:#{ year })?                           # Año opcional
                    \s)?
-                   (?-mix:al (\d{1,2}) de (#{ MNAMES.compact.join('|') })) # Mes requerido
+                   (?-x:al (\d{1,2}) de (#{ MNAMES.compact.join('|') })) # Mes requerido
                    (?:#{ year })?                           # Año opcional
                    (#{ horarios })?                         # Hora opcional
                  }ixo
@@ -46,7 +45,7 @@ module Eventual
   def event_parse string, opts = {}, &block
     parser       = opts.delete(:parser) || (self == Eventual ? DateTime : self)
     use_trailing = opts.delete(:use_trailing)
-    string       = Iconv.iconv("ASCII//IGNORE//TRANSLIT", "UTF-8", string).join.gsub(/'/, '')
+    string       = Iconv.iconv("ASCII//IGNORE//TRANSLIT", "UTF-8", string).join.gsub(/'/, '').gsub(/(\s)+/, '\1')
     results      = []
     scanner      = StringScanner.new string
     
@@ -56,12 +55,13 @@ module Eventual
       when DAY_PERIOD
         wdays, first_day, first_month, first_year, last_day, last_month, last_year, times = $1, $2, $3, $4, $5, $6, $7, $8
         match = $&
-        wdays = wdays.scan( Regexp.new(WDAY_LIST.join('|')) ).collect{ |d| WDAY_LIST.index d }
+        wdays = wdays.scan( Regexp.new(WDAY_LIST.join('|')) ).collect{ |d| WDAY_LIST.index d.downcase }
         last_year   ||= string.match(/\d{4}/) ? $& : Date.today.year
         first_year  ||= last_year
         first_month ||= last_month
-        last_month    = MNAMES.index last_month
-        first_month   = MNAMES.index first_month
+        last_month    = MNAMES.index last_month.downcase
+        first_month   = MNAMES.index first_month.downcase
+        
         make_days     = lambda do |hour, minute|
           first       = make_day parser, first_year, first_month, first_day, hour, minute
           last        = make_day parser, last_year,  last_month,  last_day,  hour, minute
@@ -73,42 +73,40 @@ module Eventual
         end
       
       when DAY_LIST
-        days, month, year, times = $1, MNAMES.index($2), $3, $4
+        days, month, year, times = $1, MNAMES.index($2.downcase), $3, $4
         match     = $&
         days      = days.scan(/\d{1,2}/)
         year    ||= string.match(/\d{4}/) ? $& : Date.today.year
+        
         make_days = lambda do |hour, minute|
           days.map do |day| 
             make_day parser, year, month, day, hour, minute
           end
         end
+      
       else
         break
       end
       
-      extra = scanner.scan(/.*?(?=#{DAY_LIST}|#{DAY_PERIOD}|\n{2}|\z)/m)
-      results +=
+      extra = scanner.scan(/.*?(?=#{DAY_LIST}|#{DAY_PERIOD}|\z)/m).to_s.chomp
+      extra.gsub!(/^(,|\n|\.)/, '')
+      
+      days  =
       if times
-        times.scan( /(\d{2}):(\d{2})/ ).map do |hour, minute| 
-          make_days.call hour, minute
-        end.flatten
+        times.scan( /(\d{2}):(\d{2})/ ).map{ |hour, minute| make_days.call hour, minute }.flatten
       else
         make_days.call nil, nil 
       end
+      
+      days.each { |day| day.instance_variable_set('@extra', extra) } 
+      results += days
     end
 
     raise ArgumentError.new( 'El formato de las fechas parece ser incorrecto' ) if results.empty?
     results.uniq!
     results.sort!
     
-    results.map! do |day|
-      if use_trailing
-        yield day, extra.to_s.gsub(/^[\n|.|,]*/, '')
-      else 
-        yield day
-      end
-    end if block_given?
-    
+    use_trailing ? results.map!{ |day| yield day, day.instance_variable_get('@extra') } : results.map!{ |day| yield day } if block_given?
     results
   end
 

data/spec/es_eventual_spec.rb

@@ -62,18 +62,7 @@ describe 'event parsing' do
     e.should map_times( *r )
   end
 
-  it "should parse a long period" do
-    e = Eventual.event_parse( 'martes y jueves del 1 de enero del 2000 al 31 de diciembre del 2010' )
-    r = (DateTime.parse('2000-1-1T00:00')..DateTime.parse('2010-12-31T00:00') ).reject{ |day| not [2,4].include?(day.wday) }
-    e.should map_times( *r )
-  end
-  
-  it "should parse a long period with multiple times" do
-    e = Eventual.event_parse( 'martes y jueves del 1 de enero del 2000 al 31 de diciembre del 2010 a las 16:00 y 18:00 horas' )
-    r = (DateTime.parse('2000-1-1T16:00')...DateTime.parse('2010-12-31T16:00') ).reject{ |day| not [2,4].include?(day.wday) } +
-        (DateTime.parse('2000-1-1T18:00')...DateTime.parse('2010-12-31T18:00') ).reject{ |day| not [2,4].include?(day.wday) }
-    e.should map_times( *r.sort )
-  end
+
   
   it "should event_parse a period with block" do
     Eventual.event_parse( 'del 5 al 7 de junio 2009' ){ |d| Eventual::WDAY_LIST[ d.wday ] }.should == ['viernes', 'sabado', 'domingo']
@@ -108,13 +97,38 @@ describe 'event parsing' do
       end.should == ['viernes', 'sabado', 'domingo']
     end
     
-    it "should event_parse a several dates" do |d, extra|
+    it "should event_parse a several dates" do
       Eventual.event_parse( "1 de enero del 2009\nSede:El tercer lugar\nCupo: limitado\n2 de enero del 2009\nSede:El tercer lugar\nCupo: limitado", :use_trailing => true ) do |d, extra|
         extra.should == "Sede:El tercer lugar\nCupo: limitado"
         d.to_s
       end.should == ["2009-01-01T00:00:00+00:00", "2009-01-02T00:00:00+00:00"]
     end
+  
+    it "should event_parse a several dates" do
+      Eventual.event_parse( "1 de enero del 2009\nSede 1\n\n2 de enero del 2009\nSede 2", :use_trailing => true ) do |d, extra|
+        [d.to_s, extra]
+      end.should == [["2009-01-01T00:00:00+00:00", "Sede 1"], ["2009-01-02T00:00:00+00:00", "Sede 2"]]
+    end
   end
   
+  describe 'Case sensitivity' do
+    it "should ignore case" do
+      Eventual.event_parse( 'DeL 1 al 3 de ENeRO' ).should map_times( '2009-1-1', '2009-1-2', '2009-1-3' )
+    end
+  end
+  
+  # it "should parse a long period" do
+  #   e = Eventual.event_parse( 'martes y jueves del 1 de enero del 2000 al 31 de diciembre del 2010' )
+  #   r = (DateTime.parse('2000-1-1T00:00')..DateTime.parse('2010-12-31T00:00') ).reject{ |day| not [2,4].include?(day.wday) }
+  #   e.should map_times( *r )
+  # end
+  # 
+  # it "should parse a long period with multiple times" do
+  #   e = Eventual.event_parse( 'martes y jueves del 1 de enero del 2000 al 31 de diciembre del 2010 a las 16:00 y 18:00 horas' )
+  #   r = (DateTime.parse('2000-1-1T16:00')...DateTime.parse('2010-12-31T16:00') ).reject{ |day| not [2,4].include?(day.wday) } +
+  #       (DateTime.parse('2000-1-1T18:00')...DateTime.parse('2010-12-31T18:00') ).reject{ |day| not [2,4].include?(day.wday) }
+  #   e.should map_times( *r.sort )
+  # end
+  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maca-eventual
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors: 
 - Macario Ortega
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency