dater 0.3.1 → 0.3.2

data/.gitignore

@@ -11,8 +11,12 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-
+*.lock
+*.txt
+Rakefile
 # YARD artifacts
 .yardoc
 _yardoc
 doc/
+test.rb
+Gemfile.lock

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dater (0.3.1)
+    dater (0.3.2)
 
 GEM
   remote: https://rubygems.org/

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+
+task :uninstall do 
+
+	system "gem uninstall dater"
+	system "rm -rf pkg"
+	system "rake install"
+
+end

data/lib/dater/version.rb

@@ -1,3 +1,3 @@
 module Dater
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/dater.rb

@@ -1,11 +1,12 @@
 # encoding: utf-8
 require 'date'
+require_relative 'translator'
 
 module Dater
   
 	class Resolver
 		
-		attr_accessor :format, :lang
+		attr_accessor :format
 
 
 		# Creates a Dater::Resolver object
@@ -16,7 +17,7 @@ module Dater
 		def initialize(format='%Y-%m-%d', lang="en", today_for_nil=false)
 			@today_for_nil=today_for_nil
 			@format=format
-			@lang=lang if ["en","es","pt"].include? lang 
+			@translate=Dater::Translator.new(lang) 
 		end
 
 
@@ -30,7 +31,8 @@ module Dater
 				period = now.strftime(@format) if today_for_nil
 				return period
 			else
- 				@last_date = @date = time_for_period(period)
+				translated = @translate.this period
+ 				@last_date = @date = time_for_period(no_special_chars(translated))
 				@date.strftime(@format) if @date.respond_to? :strftime
 			end
 		end
@@ -41,52 +43,12 @@ module Dater
 			self.for(period)
 		end
 
+		def lang= lang
+			@translate=Dater::Translator.new(lang) 
+		end
 
 		private 
 
-		PORTUGUESE = {
-			day:/dia/i,
-			week:/semana/i,
-			month:/mes/i,
-			year:/ano/i,
-			today:/hoje/,
-			tomorrow:/amanhã/i,
-			yesterday:/ontem/i,
-			in:/em/i,
-			next:/prox/i,
-			later:/depois/i,
-			ago:/atras/i, 
-			before:/antes/i,
-			monday:/segunda/i,
-			tuesday:/terca/i,
-			wednesday:/quarta/i,
-			thursday:/quinta/i,
-			friday:/sexta/i,
-			saturday:/sabado/i,
-			sunday:/domingo/i
-		}
-
-		SPANISH = {
-			day:/dia/i,
-			week:/semana/i,
-			month:/mes/i,
-			year:/año/i,
-			today:/hoy/i,
-			tomorrow:/mañana/i,
-			yesterday:/ayer/i,
-			in:/en/i,
-			next:/prox/i,
-			later:/despues/i,
-			ago:/atras/i,
-			before:/antes/i,
-			monday:/lunes/i,
-			tuesday:/martes/i,
-			wednesday:/miercoles/i,
-			thursday:/jueves/i,
-			friday:/viernes/i,
-			saturday:/sabado/i,
-			sunday:/domingo/i
-		}
 
 		TIME_IN_SECONDS = {
 			day: 86400,
@@ -97,79 +59,58 @@ module Dater
 
 		WEEKDAYS 	= [	"sunday",	"monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
 
-		def spanish_translator word
-			word.split(" ").map do |word|
-				translate_from_spanish word				
-			end.join(" ")
-		end
 		
-		def translate_from_spanish word
-			SPANISH.each_pair do |k,v|
-				return k.to_s if word =~ v
-			end
-			word
-		end
-
-		def portuguese_translator word
-			word.split(" ").map do |word|
-				translate_from_portuguese word				
-			end.join(" ")
-		end
-
-		def translate_from_portuguese word
-			PORTUGUESE.each_pair do |k,v|
-				return k.to_s if word =~ v
-			end
-			word
-		end
 
 		# Returns the formatted date according to the given period of time expresed in a literal way
 		# 
 		# @param [String] period = time expressed literally (e.g: in 2 days)
 		# @return [String] formatted time
-		def time_for_period(period=nil)
-			word = english_for no_special_chars(period)
+		def time_for_period(string=nil)
 			
-			@last_date = case word
 			
-			when /today/i
+			@last_date = case string
+			
+			when /today/,/now/
 				now
 
-			when /tomorrow/i
+			when /tomorrow/
 				tomorrow_time
 
-			when /yesterday/i
+			when /yesterday/
 				yesterday_time
 
-			when /sunday/i, /monday/i, /tuesday/i, /wednesday/i, /thursday/i, /friday/i, /saturday/i 				
-				time_for_weekday(word)
+			when /sunday/, /monday/, /tuesday/, /wednesday/, /thursday/, /friday/, /saturday/ 				
+				time_for_weekday(string)
 
-			when /next/i
-				now + period_of_time_from_string(word.gsub("next","1"))
+			when /next/
+				now + period_of_time_from_string(string.gsub("next","1"))
 
-			when /last/i
-				now - period_of_time_from_string(word.gsub("last","1"))				
+			when /last/
+				now - period_of_time_from_string(string.gsub("last","1"))				
 
-			when /before/i
+			when /\d[\sa-zA-Z]+\sbefore/
 				@last_date ||= now 
-				@last_date -=  period_of_time_from_string(word)
+				@last_date -=  period_of_time_from_string(string)
 
-			when /ago/i
+			when /\d[\sa-zA-Z]+\sago/
 				@last_date  ||= now 
-				now - period_of_time_from_string(word)
+				now - period_of_time_from_string(string)
 
-			when /later/i
+			when /\d[\sa-zA-Z]+\slater/
 				@last_date ||= now
-				@last_date +=  period_of_time_from_string(word)
-
-			when /in/i
-				now + period_of_time_from_string(word)
+				@last_date +=  period_of_time_from_string(string)
 
-			when /day/i, /month/i, /week/i, /year/i
-				move_to(word)
+			when /in/,/\d\sdays?/, /\d\smonths?/, /\d\sweeks?/, /\d\syears?/
+				now + period_of_time_from_string(string)
 
 			when /\d+.\d+.\d+/
-				time_from_date(word)	
+				time_from_date(string)	
+
+			when /rand/,/future/
+				now + rand(100_000_000)
+
+			when /past/
+				now - rand(100_000_000)
 			end
 				
 				return @last_date
@@ -189,23 +130,7 @@ module Dater
 			@last_date = Time.now + TIME_IN_SECONDS[:day]
 		end
 
-		def english_for(word=nil)
-			unless word.nil?
-				word = no_special_chars(word.downcase)
-			end
-			case @lang
-			when /es/,/sp/
-				spanish_translator word				
-			when /pt/,/port/
-				portuguese_translator word
-			else
-				word
-			end
-		end
-
-
 		
-
 		# Returns one week/month/year of difference from today's date. Formatted or not according to formatted param
 		#
 		# @param [String] period = the factor of difference (day, week, month, year) from today's date
@@ -229,17 +154,27 @@ module Dater
 		end
 
 		def time_for_weekday(word)
-			day = WEEKDAYS.select{ |day| day if day==word.scan(/[a-zA-Z]+/).last }.join
+			day = extract_day_from word
 			@count = Time.now
-			
-			# Add one day if today is the same required week day 
-			@count += move_a_day(word) if is_required_day?(@count, day)
-			
-			until is_required_day?(@count, day)
+			begin
 				@count+= move_a_day(word)
-			end
+			end until is_required_day?(@count, day)
 			@count
+		end
 
+		def extract_day_from word
+			WEEKDAYS.select{ |day| day if day==word.scan(/[a-zA-Z]+/).last }.join
+		end
+
+		# Method to know if the day is the required day
+		# 
+		# @param [Time] time
+		# @param [String] day = to match in case statement
+		# @return [Boolean] = true if day is the required day
+		def is_required_day?(time, day)
+			day_to_ask = "#{day}?"
+			result = eval("time.#{day_to_ask}") if time.respond_to? day_to_ask.to_sym
+			return result
 		end
 
 		# Return a day to add or substrac according to the given word
@@ -272,7 +207,7 @@ module Dater
 		# @param [String] period 
 		# @return [Fixnum] multiplication factor for a day
 		def day_mult(period)
-			TIME_IN_SECONDS[:day] if is_day?(english_for period)		 
+			TIME_IN_SECONDS[:day] if is_day? period		 
 		end
 
 		# Scans if period has week word
@@ -288,7 +223,7 @@ module Dater
 		# @param [String] period 
 		# @return [Fixnum] multiplication factor for a week
 		def week_mult(period)
-			TIME_IN_SECONDS[:week] if is_week?(english_for period)
+			TIME_IN_SECONDS[:week] if is_week? period
 		end
 
 		# Scans if period has month word
@@ -304,7 +239,7 @@ module Dater
 		# @param [String] period 
 		# @return [Fixnum] multiplication factor for a month
 		def month_mult(period)
-			TIME_IN_SECONDS[:month] if is_month?(english_for period)
+			TIME_IN_SECONDS[:month] if is_month? period
 		end
 
 		# Scans if period string contain year word
@@ -320,42 +255,18 @@ module Dater
 		# @param [String] period = the string to convert to
 		# @return [Fixnum] multiplication factor for a year
 		def year_mult(period)
-			TIME_IN_SECONDS[:year] if is_year?(english_for period)
+			TIME_IN_SECONDS[:year] if is_year? period
 		end
 
 		# Returns seconds to multiply by for the given string
 		# 
 		# @param [String] period = the period of time expressed in a literal way
 		# @return [Fixnum] number to multiply by
-		def multiply_by(period)
-			return day_mult(period) || week_mult(period) || month_mult(period) || year_mult(period) || 1
+		def multiply_by(string)
+			return day_mult(string) || week_mult(string) || month_mult(string) || year_mult(string) || 1
 		end
 	
-		# Method to know if the day is the required day
-		# 
-		# @param [Time] time
-		# @param [String] day = to match in case statement
-		# @return [Boolean] = true if day is the required day
-		def is_required_day?(time, day)
-			case english_for(day).to_s
-			when /monday/i
-				time.monday? 
-			when /tuesday/i
-				time.tuesday? 
-			when /wednesday/i
-				time.wednesday? 
-			when /thursday/i
-				time.thursday? 
-			when /friday/i
-				time.friday? 
-			when /saturday/i
-				time.saturday? 
-			when /sunday/i
-				time.sunday? 
-			else
-				false
-			end
-		end
+		
 
 		# Return the Time object according to the splitted date in the given array  
 		# 
@@ -380,7 +291,6 @@ module Dater
 		# 
 		# 
 		def method_missing(meth)
-			# if meth.to_s =~ /^(next_|próximo_|proximo_|last_|último_|ultimo_|in_|\d_|for).+$/i
 			self.class.send :define_method, meth do
 				string = meth.to_s.gsub("_"," ")
 				self.for("for('#{string}')")
@@ -393,20 +303,7 @@ module Dater
 		end
 
 		def no_special_chars(arg)
-			arg.\
-			gsub('á', 'a').\
-			gsub('é', 'e').\
-			gsub('í', 'i').\
-			gsub('ó', 'o').\
-			gsub('ú', 'u').\
-			gsub('ç', 'c').\
-			gsub('Á', 'a').\
-			gsub('É', 'e').\
-			gsub('Í', 'i').\
-			gsub('Ó', 'o').\
-			gsub('Ú', 'u').\
-			gsub('Ñ', 'n').\
-			gsub('Ç', 'c')
+			arg.gsub(/(á|Á)/, 'a').gsub(/(é|É)/, 'e').gsub(/(í|Í)/, 'i').gsub(/(ó|Ó)/, 'o').gsub(/(ú|Ú)/, 'u').gsub(/(ç|Ç)/, 'c').downcase
 		end
 	end
 end

data/lib/translator.rb

@@ -0,0 +1,126 @@
+# encoding: utf-8
+
+module Dater
+  
+	class Translator
+
+		SUPPORTED_LANGUAGES = ["en","es","pt"]
+		
+		PORTUGUESE = {
+			day:/dia/,
+			week:/semana/,
+			month:/mes/,
+			year:/ano/,
+			today:/hoje/,
+			tomorrow:/amanhã/,
+			yesterday:/ontem/,
+			in:/em/,
+			next:/prox/,
+			later:/depois/,
+			ago:/atras/, 
+			before:/antes/,
+			monday:/segunda/,
+			tuesday:/terca/,
+			wednesday:/quarta/,
+			thursday:/quinta/,
+			friday:/sexta/,
+			saturday:/sabado/,
+			sunday:/domingo/,
+			rand:/acaso/,
+			futura:/futur/,
+			past:/passad/
+		}
+
+		SPANISH = {
+			day:/dia/,
+			week:/semana/,
+			month:/mes/,
+			year:/año/,
+			today:/hoy/,
+			tomorrow:/mañana/,
+			yesterday:/ayer/,
+			in:/en/,
+			next:/prox/,
+			later:/despues/,
+			ago:/atras/,
+			before:/antes/,
+			monday:/lunes/,
+			tuesday:/martes/,
+			wednesday:/miercoles/,
+			thursday:/jueves/,
+			friday:/viernes/,
+			saturday:/sabado/,
+			sunday:/domingo/,
+			rand:/aleator/,
+			future:/futur/,
+			past:/pasad/
+		}
+
+		def initialize(lang)
+			raise "Languaje #{lang} not supported" unless SUPPORTED_LANGUAGES.include? lang
+			@lang = lang
+			@dictionary = @lang == "es" ? SPANISH : PORTUGUESE
+		end
+
+		def this word
+			return word if @lang=="en"
+			mapper word
+		end
+
+		def mapper word
+			word.split(" ").map do |word|
+				get_english_for word				
+			end.join(" ")
+		end
+		
+		def get_english_for word
+			@dictionary.each_pair do |k,v|
+				return k.to_s if word =~ v
+			end
+			word
+		end
+
+
+
+
+		# def english_for(word=nil)
+			
+		# 	case @lang
+		# 	when "es"
+		# 		spanish_translator word				
+		# 	when "pt"
+		# 		portuguese_translator word
+		# 	else
+		# 		word
+		# 	end
+		# end
+
+		# def spanish_translator word
+		# 	word.split(" ").map do |word|
+		# 		translate_from_spanish word				
+		# 	end.join(" ")
+		# end
+		
+		# def translate_from_spanish word
+		# 	SPANISH.each_pair do |k,v|
+		# 		return k.to_s if word =~ v
+		# 	end
+		# 	word
+		# end
+
+		# def portuguese_translator word
+		# 	word.split(" ").map do |word|
+		# 		translate_from_portuguese word				
+		# 	end.join(" ")
+		# end
+
+		# def translate_from_portuguese word
+		# 	PORTUGUESE.each_pair do |k,v|
+		# 		return k.to_s if word =~ v
+		# 	end
+		# 	word
+		# end
+
+
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dater
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ files:
 - dater.gemspec
 - lib/dater.rb
 - lib/dater/version.rb
+- lib/translator.rb
 homepage: http://romgrod.github.io/dater/
 licenses:
 - MIT
@@ -75,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3507902839117874013
+      hash: 3211044642615986663
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3507902839117874013
+      hash: 3211044642615986663
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25