eventual 0.5.8 → 0.5.9

data/.gitignore

@@ -20,4 +20,6 @@ rdoc
 pkg
 eventual.gemspec
 
-## PROJECT::SPECIFIC
+## Bundler
+*.gem
+.bundle

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in inline-style.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    eventual (0.5.9)
+      treetop
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    polyglot (0.3.1)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  eventual!
+  rspec
+  treetop

data/Rakefile

@@ -1,46 +1,10 @@
 require 'rubygems'
-require 'rake'
+require 'bundler'
+require "rspec/core/rake_task"
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name                 = "eventual"
-    gem.summary              = %Q{ Reconocimiento de fechas y periodos en lenguaje natural. Natural language date and period parsing, currently only in spanish. }
-    gem.description          = %Q{ Reconocimiento de fechas y periodos en lenguaje natural. Natural language date and period parsing, currently only in spanish. }
-    gem.email                = "macarui@gmail.com"
-    gem.homepage             = "http://github.com/maca/eventual"
-    gem.authors              = ["Macario Ortega"]
-    gem.post_install_message = %{ \n\n***********************************\nPor favor tenga en cuenta que el API ha cambiado, consulte la página del proyecto: http://github.com/maca/eventual. English implementation is due.\n***********************************\n\n }
-    gem.add_dependency "treetop", ">= 1.4.5"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
+desc "Run specs"
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "eventual #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks

data/lib/eventual.rb

@@ -1,14 +1,20 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift File.dirname(__FILE__)
+
 require 'rubygems'
 require 'treetop'
 require 'date'
 
-require "#{ File.dirname __FILE__ }/eventual/syntax_nodes"
+require "eventual/syntax_nodes"
+
+
+Range.send(:alias_method, :cover?, :include?) unless Range.methods.include? :include?
 
 autoload :EsDatesParser, 'eventual/es'
 
 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
+  #     Eventual.parse( 'del 5 al 7 de junio del 2009' ).to_a
   #     => [#<DateTime: 4909975/2,0,2299161>, #<DateTime: 4909977/2,0,2299161>, #<DateTime: 4909979/2,0,2299161
   #
   # Options:
@@ -32,4 +38,4 @@ module Eventual
     node.year      = year if year
     node
   end
-end
+end

data/lib/eventual/es/event_parser.treetop

@@ -1,30 +1,30 @@
 grammar EsDates
   rule root
-    compound_date (((space 'y' / ',') space / newline) compound_date)* <Eventual::Node> # ((space 'y' / ',') compound_date)*
+    compound_date (((space 'y' / ',') space / newline) compound_date)* <Eventual::Node>
   end
 
   rule compound_date
-    (same_year_date_list / dates) year? times?
+    (date_list / dates) year? times?
   end
 
   rule dates
-    period / date
+    period / single_day
   end
   
   rule period
     weekday_list_constrain? (range / month)
   end
   
-  rule date
-    weekday_constrain? day_number month_name?
-  end
-  
-  rule same_year_date_list
+  rule date_list
     dates (',' space dates)* (space 'y' space dates)
   end
   
   rule range
-    (('del' / 'de' / ',') space)? (month / date) year? space ('al' / 'a') space (month / date) <Eventual::DatePeriod>
+    (('del' / 'de' / ',') space)? (month / single_day) year? space ('al' / 'a') space (month / single_day) <Eventual::DatePeriod>
+  end
+
+  rule single_day
+    weekday_constrain? day_number month_name? / month
   end
 
   rule month

data/lib/eventual/syntax_nodes.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Eventual
   Weekdays        = %w(domingo lunes martes miércoles jueves viernes sábado).freeze
   MonthNames      = %w(enero febrero marzo abril mayo junio julio agosto septiembre noviembre).unshift(nil).freeze
@@ -28,10 +30,10 @@ module Eventual
     def value
       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   += (1..5).to_a 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    = (days.first..days.last).to_a if text.match /\sal?\s/
       days.uniq
     end
   end
@@ -58,10 +60,12 @@ module Eventual
     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{ |e| e } end
     
     # Returns true if the weekday (as number) correspons to any allowed weekday
     def date_within_weekdays? date
@@ -71,15 +75,17 @@ module Eventual
     
     # Invokes block once for each Date or DateTime. Creates a new array containing the values returned by the block.
     def map &block
-      walk { |elements| elements.map &block }
+      walk { |elements| elements.map &block }.compact
     end
     
     # Returns true if the Date or DateTime passed is included in the parsed Dates or DateTimes
     def include? date
       result = false
-      walk { |elements| break result = true if elements.include? date }
-      
-      return result if !result or date.class == Date or times.nil?
+      walk { |elements|
+        break result = true if elements.include? date 
+      }
+
+      return result if !result || date.class == Date || times.nil?
 
       times.include? date
     end
@@ -133,7 +139,7 @@ module Eventual
       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
+      dates.map(&block).compact
     end
     
     def include? date
@@ -148,38 +154,34 @@ module Eventual
     
     def include? date
       return false unless date_within_weekdays? date
-      range.include? date
+      range.cover? date
     end
     
-    alias node_map map
-    private :node_map
-    
     def map &block
       range.map do |date|
         next unless date_within_weekdays? date
-        dates = times ? make(date.year, date.month, date.day) : [date]
-        dates.map &block
-      end
+        (times ? make(date.year, date.month, date.day) : [date]).map(&block)
+      end.compact
     end
   end
 
   class MonthPeriod < Period #:nodoc:
     def first
-      Date.civil year, month_name.value
+      @first ||= Date.civil year, month_name.value
     end
 
     def last
-      Date.civil year, month_name.value, -1
+      @last ||= Date.civil year, month_name.value, -1
     end
   end
 
   class DatePeriod < Period #:nodoc:
     def first
-      node_map.first
+      @first ||= walk { |elements| elements.map{ |e| e } }.first
     end
     
     def last
-      node_map.last
+      @last ||= walk { |elements| elements.map{ |e| e } }.last
     end
   end
 

data/lib/eventual/version.rb

@@ -0,0 +1,3 @@
+module Eventual
+  VERSION = '0.5.9'  
+end

data/spec/es_eventual_spec.rb

@@ -1,4 +1,6 @@
-require "#{File.dirname __FILE__}/spec_helper"
+# encoding: UTF-8
+
+require "spec_helper"
 require 'eventual'
 
 describe Eventual, 'Es' do
@@ -14,18 +16,18 @@ describe Eventual, 'Es' do
 
   shared_examples_for 'correctly parses dates' do
     it { @result.should_not be_nil }
-    it { @result.to_a.size.should == @dates.map.size }
+    it { @result.to_a.size.should == @dates.to_a.size }
     it { @result.should map_dates *@dates }
   end
   
   shared_examples_for 'correctly parses time ranges' do
     it { @result.should_not be_nil }
-    it { @result.to_a.size.should == @ranges.map.size }
+    it { @result.to_a.size.should == @ranges.to_a.size }
     it { @result.should map_dates *@ranges }
   end
 
   shared_examples_for 'includes corresponding dates' do
-    it { @dates.map{ |date| @result.should include(date) } }
+    it { @dates.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  } }
@@ -35,7 +37,7 @@ describe Eventual, 'Es' do
     describe "month without year parsing 'marzo'" do
       before do
         @result = Eventual.parse 'marzo', :lang => 'Es'
-        @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-31')).map
+        @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-31')).to_a
       end
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'
@@ -44,7 +46,7 @@ describe Eventual, 'Es' do
     describe "month without year parsing 'marzo', case insensitive" do
       before do
         @result = Eventual.parse 'MarZo', :lang => 'Es'
-        @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-31')).map
+        @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-31')).to_a
       end
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'
@@ -54,7 +56,7 @@ describe Eventual, 'Es' do
       describe "parsing 'marzo de 2009'" do
         before do
           @result = Eventual.parse "marzo de 2009"
-          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).map
+          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).to_a
         end  
         it_should_behave_like 'correctly parses dates'
         it_should_behave_like 'includes corresponding dates'
@@ -63,7 +65,7 @@ describe Eventual, 'Es' do
       describe "parsing 'marzo del 2009'" do
         before do
           @result = Eventual.parse "marzo del 2009"
-          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).map
+          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).to_a
         end  
         it_should_behave_like 'correctly parses dates'
         it_should_behave_like 'includes corresponding dates'
@@ -72,7 +74,7 @@ describe Eventual, 'Es' do
       describe "parsing 'marzo 2009'" do
         before do
           @result = Eventual.parse "marzo 2009"
-          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).map
+          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).to_a
         end  
         it_should_behave_like 'correctly parses dates'
         it_should_behave_like 'includes corresponding dates'
@@ -81,7 +83,7 @@ describe Eventual, 'Es' do
       describe "parsing 'marzo, 2009'" do
         before do
           @result = Eventual.parse "marzo, 2009"
-          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).map
+          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).to_a
         end  
         it_should_behave_like 'correctly parses dates'
         it_should_behave_like 'includes corresponding dates'
@@ -90,7 +92,7 @@ describe Eventual, 'Es' do
       describe "parsing 'marzo '09'" do
         before do
           @result = Eventual.parse "marzo '09"
-          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).map
+          @dates  = (Date.parse('2009-3-1')..Date.parse('2009-3-31')).to_a
         end  
         it_should_behave_like 'correctly parses dates'
         it_should_behave_like 'includes corresponding dates'
@@ -132,16 +134,15 @@ describe Eventual, 'Es' do
         it_should_behave_like 'includes corresponding dates'
       end
     end
-
   end
 
   describe 'day numbers' do
     describe 'single date' do
       before do
-        @dates = [Date.civil 2010, 3, 21]
+        @dates = [Date.civil(2010, 3, 21)]
       end
 
-      describe "should single day number for '21 de marzo'" do
+      describe "should parse single day number for '21 de marzo'" do
         before { @result = Eventual.parse("21 de marzo") }
         it_should_behave_like 'correctly parses dates'
         it_should_behave_like 'includes corresponding dates'
@@ -153,11 +154,11 @@ describe Eventual, 'Es' do
         it_should_behave_like 'includes corresponding dates'
       end
 
-      # describe "parsing 'marzo 21'" do
-      #   before { @result = Eventual.parse("21 marzo") }
-      #   it_should_behave_like 'correctly parses dates'
-      #   it_should_behave_like 'includes corresponding dates'
-      # end
+      describe "parsing 'marzo 21'" do
+        before { @result = Eventual.parse("21 marzo") }
+        it_should_behave_like 'correctly parses dates'
+        it_should_behave_like 'includes corresponding dates'
+      end
 
       describe 'date with wday' do
         describe "parsing 'domingo 21 de marzo'" do
@@ -165,9 +166,8 @@ describe Eventual, 'Es' do
           it_should_behave_like 'correctly parses dates'
           it_should_behave_like 'includes corresponding dates'
         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)
+          lambda { Eventual.parse("lunes 21 de marzo").to_a }.should raise_error(Eventual::WdayMatchError)
         end
       end
 
@@ -179,16 +179,16 @@ describe Eventual, 'Es' do
         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)
+          lambda { Eventual.parse("lunes 21 de marzo").to_a }.should raise_error(Eventual::WdayMatchError)
         end
       end
     end
 
     describe 'day list' do
       before do
-        @dates = (1..3).map{ |i| Date.civil( 2010, 3, i) }
+        @dates = (1..3).map{ |i| Date.civil(2010, 3, i) }
       end
-
+       
       describe "day list for '1, 2 y 3 de marzo'" do
         before { @result = Eventual.parse("1, 2 y 3 marzo") }
         it_should_behave_like 'correctly parses dates'
@@ -208,7 +208,7 @@ describe Eventual, 'Es' do
       end
 
       it "should raise WdayMatchError if weekday doesn't correspond to date" do
-        lambda { Eventual.parse("lunes 2, martes 2 y jueves 3 de marzo").map }.should raise_error(Eventual::WdayMatchError)
+        lambda { Eventual.parse("lunes 2, martes 2 y jueves 3 de marzo").to_a }.should raise_error(Eventual::WdayMatchError)
       end
     end
   end
@@ -216,7 +216,7 @@ describe Eventual, 'Es' do
   describe 'day range' do
     describe 'period in same month' do
       before do
-        @dates = (1..3).map{ |i| Date.civil( 2010, 3, i) }
+        @dates = (1..3).map{ |i| Date.civil(2010, 3, i) }
       end
 
       describe "day list for '1 al 3 de marzo" do
@@ -317,7 +317,7 @@ describe Eventual, 'Es' do
       describe "wdays for 'fines de semana del 1 al 22 de marzo del '10" do
         before do
           @result = Eventual.parse "fines de semana del 1 al 22 de marzo del '10"
-          @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-22')).map.reject{ |day| not [6,0].include?(day.wday) }
+          @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-22')).to_a.reject{ |day| not [6,0].include?(day.wday) }
         end
         it_should_behave_like 'correctly parses dates'
         it_should_behave_like 'includes corresponding dates'
@@ -326,7 +326,7 @@ describe Eventual, 'Es' do
       describe "wdays for 'entre semana del 1 al 22 de marzo del '10" do
         before do 
           @result = Eventual.parse("entre semana del 1 al 22 de marzo del '10")
-          @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-22')).map.reject{ |day| not (1..5).map.include?(day.wday) }
+          @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-22')).to_a.reject{ |day| not (1..5).map.include?(day.wday) }
         end
         it_should_behave_like 'correctly parses dates'
         it_should_behave_like 'includes corresponding dates'
@@ -385,13 +385,12 @@ describe Eventual, 'Es' do
     describe 'octubre a diciembre del 2008' do
       before do 
         @result = Eventual.parse('octubre a diciembre del 2008')
-        @dates  = (Date.parse('2008-10-1')..DateTime.parse('2008-12-31')).map
+        @dates  = (Date.parse('2008-10-1')..DateTime.parse('2008-12-31')).to_a
       end
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'
     end
 
-
     describe 'lunes y martes de octubre del 2007 a diciembre del 2008' do
       before do 
         @result = Eventual.parse('lunes y martes de octubre del 2007 a diciembre del 2008')
@@ -459,9 +458,8 @@ describe Eventual, 'Es' do
     describe 'single day with time' do
       before do
         @result = Eventual.parse('1 de enero del 2010 a las 15:00')
-        @dates  = [DateTime.civil 2010, 1, 1, 15]
+        @dates  = [DateTime.civil(2010, 1, 1, 15)]
       end
-
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'
       it_should_behave_like 'outputs DateTime'
@@ -510,7 +508,7 @@ describe Eventual, 'Es' do
     describe 'two times for month range' do
       before do
         @result = Eventual.parse('lunes y martes de diciembre a las 16: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).reject{ |day| not [1,2].include?(day.wday) }
+        @dates  = ((DateTime.parse('2010-12-1T15:00')..DateTime.parse('2010-12-31T15:00')).to_a + (DateTime.parse('2010-12-1T16:00')..DateTime.parse('2010-12-31T16:00')).to_a).reject{ |day| not [1,2].include?(day.wday) }
       end
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'
@@ -525,9 +523,9 @@ describe Eventual, 'Es' 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
+        (DateTime.parse('2010-12-1T15:00')..DateTime.parse('2010-12-31T15:00')).to_a + 
+        (DateTime.parse('2010-12-1T16:00')..DateTime.parse('2010-12-31T16:00')).to_a +
+        (DateTime.parse('2010-12-1T17:00')..DateTime.parse('2010-12-31T17:00')).to_a
         ).reject{ |day| not [1,2].include?(day.wday) }
       end
 
@@ -543,7 +541,7 @@ describe Eventual, 'Es' do
     describe 'range with time as 12 hours am' do
       before do
         @result = Eventual.parse('lunes y martes de diciembre a las 3 am')
-        @dates  = ((DateTime.parse('2010-12-1T03:00')..DateTime.parse('2010-12-31T03:00')).map).reject{ |day| not [1,2].include?(day.wday) }
+        @dates  = ((DateTime.parse('2010-12-1T03:00')..DateTime.parse('2010-12-31T03:00')).to_a).reject{ |day| not [1,2].include?(day.wday) }
       end
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'
@@ -557,7 +555,7 @@ describe Eventual, 'Es' do
     describe 'range with time as 12 hours pm' do
       before do
         @result = Eventual.parse('lunes y martes de diciembre a las 3:00 pm')
-        @dates  = ((DateTime.parse('2010-12-1T15:00')..DateTime.parse('2010-12-31T15:00')).map).reject{ |day| not [1,2].include?(day.wday) }
+        @dates  = ((DateTime.parse('2010-12-1T15:00')..DateTime.parse('2010-12-31T15:00')).to_a).reject{ |day| not [1,2].include?(day.wday) }
       end
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'
@@ -584,7 +582,7 @@ describe Eventual, 'Es' 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)]
-        @dates  = @ranges.map{ |range| range.map }.flatten
+        @dates  = @ranges.map{ |range| range.to_a }.flatten
       end
       
       it_should_behave_like 'correctly parses time ranges'
@@ -595,7 +593,7 @@ describe Eventual, 'Es' do
       before do
         @result = Eventual.parse('1 de enero del 2010 de las 15:00 a las 16:00 y de las 17:00 a las 19:00')
         @ranges = [(DateTime.civil 2010, 1, 1, 15)..(DateTime.civil 2010, 1, 1, 16), (DateTime.civil 2010, 1, 1, 17)..(DateTime.civil 2010, 1, 1, 19)]
-        @dates  = @ranges.map{ |range| range.map }.flatten
+        @dates  = @ranges.map{ |range| range.to_a }.flatten
       end
       
       it_should_behave_like 'correctly parses time ranges'
@@ -606,7 +604,7 @@ describe Eventual, 'Es' do
       before do
         @result = Eventual.parse('1 de enero del 2010 de las 15:00 a las 16:00, de las 17:00 a las 19:00 y de las 21:00 a las 22:00')
         @ranges = [(DateTime.civil 2010, 1, 1, 15)..(DateTime.civil 2010, 1, 1, 16), (DateTime.civil 2010, 1, 1, 17)..(DateTime.civil 2010, 1, 1, 19), (DateTime.civil 2010, 1, 1, 21)..(DateTime.civil 2010, 1, 1, 22)]
-        @dates  = @ranges.map{ |range| range.map }.flatten
+        @dates  = @ranges.map{ |range| range.to_a }.flatten
       end
       
       it_should_behave_like 'correctly parses time ranges'
@@ -614,12 +612,11 @@ describe Eventual, 'Es' do
     end
   end
 
-
   describe 'Marshal dump' do
     describe "month without year parsing 'marzo'" do
       before do
         @result = Marshal.load Marshal.dump(Eventual.parse('marzo')).gsub('NaturalDates::', 'NaturalDates::Eventual::Es::')
-        @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-31')).map
+        @dates  = (Date.parse('2010-3-1')..Date.parse('2010-3-31')).to_a
       end
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'
@@ -630,7 +627,7 @@ describe Eventual, 'Es' do
     describe "month without year parsing 'marzo'" do
       before do
         @result = Eventual.parse('marzo', :default_year => 2007)
-        @dates  = (Date.parse('2007-3-1')..Date.parse('2007-3-31')).map
+        @dates  = (Date.parse('2007-3-1')..Date.parse('2007-3-31')).to_a
       end
       it_should_behave_like 'correctly parses dates'
       it_should_behave_like 'includes corresponding dates'

data/spec/spec_helper.rb

@@ -2,9 +2,8 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
-require 'spec'
-require 'spec/autorun'
-require 'date/performance'
+require 'rspec'
+require 'rspec/autorun'
 
 class MapDates
   def description
@@ -32,4 +31,4 @@ end
 
 def map_dates *times
   MapDates.new times, Date
-end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: eventual
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Macario Ortega
@@ -15,61 +14,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -05:00
+date: 2011-03-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: treetop
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
-        - 1
-        - 4
-        - 5
-        version: 1.4.5
-  type: :runtime
+        - 0
+        version: "0"
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: treetop
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        - 0
+        version: "0"
+  type: :runtime
   version_requirements: *id002
-description: " Reconocimiento de fechas y periodos en lenguaje natural. Natural language date and period parsing, currently only in spanish. "
-email: macarui@gmail.com
+description: Reconocimiento de fechas y periodos en lenguaje natural. Natural language date and period parsing in spanish.
+email: 
+- macarui@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/eventual.rb
 - lib/eventual/es.rb
 - lib/eventual/es/event_parser.treetop
 - lib/eventual/syntax_nodes.rb
+- lib/eventual/version.rb
 - spec/es_eventual_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -77,12 +73,9 @@ has_rdoc: true
 homepage: http://github.com/maca/eventual
 licenses: []
 
-post_install_message: " \n\n\
-  ***********************************\n\
-  Por favor tenga en cuenta que el API ha cambiado, consulte la p\xC3\xA1gina del proyecto: http://github.com/maca/eventual. English implementation is due.\n\
-  ***********************************\n\n "
-rdoc_options: 
-- --charset=UTF-8
+post_install_message: 
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -90,7 +83,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -99,7 +91,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -109,7 +100,6 @@ rubyforge_project:
 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/spec_helper.rb
-- spec/es_eventual_spec.rb
+summary: Reconocimiento de fechas y periodos en lenguaje natural. Natural language date and period parsing in spanish.
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.5.8