dater 0.2.1 → 0.2.2

data/Gemfile.lock

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

data/lib/dater/version.rb

@@ -1,3 +1,3 @@
 module Dater
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/dater.rb

@@ -9,13 +9,13 @@ module Dater
 		attr_accessor :format, :lang
 
 		DICTIONARY = {
-			day:  		{ "en"=>/day(s)?/, 	"es" => /d(i|í)a(s)?/,"pt" => /dia(s)?/},
-			week: 		{ "en"=>/week(s)?/, "es" => /semana(s)?/, "pt" => /semana(s)?/},
-			month: 		{ "en"=>/month(s)?/,"es" => /mes(es)?/, 	"pt" => /mes(es)?/},
-			year: 		{ "en"=>/year(s)?/, "es" => /año(s)?/, 		"pt" => /ano(s)?/},
-			today: 		{ "en"=>'today', 		"es" => 'hoy', 				"pt" => 'hoje'},
-			tomorrow: { "en"=>'tomorrow', "es" => 'mañana',			"pt" => 'manhã'},
-			yesterday:{ "en"=>'yesterday',"es" => 'ayer', 			"pt" => 'ontem'}
+			day:  		{ "en"=>/days/, 		"es" => /(dias|días)/,"pt" => /dias/, 	:mult =>	86400},
+			week: 		{ "en"=>/weeks/, 		"es" => /semanas/, 		"pt" => /semanas/, :mult =>	604800},
+			month: 		{ "en"=>/months/,		"es" => /meses/, 			"pt" => /meses/, 	:mult =>  2592000},
+			year: 		{ "en"=>/years/, 		"es" => /años/, 			"pt" => /anos/, 	:mult =>  31536000},
+			today: 		{ "en"=>'today', 		"es" => 'hoy', 				"pt" => 'hoje' 	},
+			tomorrow: { "en"=>'tomorrow', "es" => 'mañana',			"pt" => 'manhã' 	},
+			yesterday:{ "en"=>'yesterday',"es" => 'ayer', 			"pt" => 'ontem' 	}
 		}
 
 		# Creates a Dater::Resolver object
@@ -33,26 +33,21 @@ module Dater
 		# Return [String] converted date to the configured format. If period is nil, returns date for tomorrow 
 		def for(period=nil)
 			return (Time.now).strftime(@format) if period.nil?
-			case period.downcase 	
+			@date=case period.downcase 	
 			when DICTIONARY[:today][@lang]
-				return (Time.now).strftime(@format)
+				self.today(false)
 			when DICTIONARY[:tomorrow][@lang]
-				return (Time.now+(3600*24)).strftime(@format)
+				self.tomorrow(false)
 			when DICTIONARY[:yesterday][@lang]
-				return (Time.now-(3600*24)).strftime(@format)
-			when /\d+\/\d+\/\d+/
-				parts=period.split('/')
-			when /\d+\-\d+\-\d+/
-				parts=period.split('-')
+				self.yesterday(false)
+			when /\d+.\d+.\d+/
+				time_from_date(period)	
+			when /\d+\s.+/
+				Time.now+period.scan(/\d+/)[0].to_i*self.multiply_by(period,@lang)
 			else
-				if (amount=period.scan(/\d+/)).size>0
-					additional=amount[0].to_i*self.multiply_by(period,@lang)
-					@date=Time.now+additional
-				else
-					return period
-				end
+				return period
 			end
-			@date=time_from_date(parts) unless parts.nil?
+			 # unless parts.nil?
 			return @date.strftime(@format)
 		end
 
@@ -62,28 +57,82 @@ module Dater
 		# Param [String] lang = the languaje to eval
 		# Return [Hash] times
 		def multiply_by(period, lang)
-			return 3600*24 				if period.scan(DICTIONARY[:day][lang]).size>0
-			return 3600*24*7			if period.scan(DICTIONARY[:week][lang]).size>0
-			return 3600*24*30			if period.scan(DICTIONARY[:month][lang]).size>0
-			return 3600*24*30*12	if period.scan(DICTIONARY[:year][lang]).size>0
-			return 1
+			mult = 1
+			mult = DICTIONARY[:day][:mult] if is_day?(period, lang)
+			mult = DICTIONARY[:week][:mult] if is_week?(period, lang)
+			mult = DICTIONARY[:month][:mult] if is_month?(period, lang)
+			mult = DICTIONARY[:year][:mult] if is_year?(period, lang)
+			return mult
+		end
+
+		def is_day?(period, lang)
+			period.scan(DICTIONARY[:day][lang]).size > 0 ? true : false
+		end
+
+		def is_week?(period, lang)
+			period.scan(DICTIONARY[:week][lang]).size > 0 ? true : false
+		end
+
+		def is_month?(period, lang)
+			period.scan(DICTIONARY[:month][lang]).size > 0 ? true : false
+		end
+
+		def is_year?(period, lang)
+			period.scan(DICTIONARY[:year][lang]).size > 0 ? true : false
 		end
 
 		# Return the Time object according to the splitted date in the given array  
-		# 
+		# |
 		# Param [Array] date = date splitted
 		# Return [Time] 
 		def time_from_date(date)
-			date.map!{|i| i.to_i}
-			if date.first.to_s.size==4
-				return Date.new(date[0],date[1],date[2]).to_time
+			numbers=date.scan(/\d+/).map!{|i| i.to_i}
+			if numbers.first.to_s.size==4  
+				return Date.new(numbers[0],numbers[1],numbers[2]).to_time 
 			else
-				return Date.new(date[2],date[1],date[0]).to_time
+				return Date.new(numbers[2],numbers[1],numbers[0]).to_time
 			end
 		end
 
 		def para(period)
 			self.for(period)
 		end
+
+		def today(formatted=true)
+			formatted ?  Time.now.strftime(@format) :Time.now
+		end
+
+		def hoy
+			self.today(true)
+		end
+
+		def hoje
+			self.today(true)
+		end
+
+		def yesterday(formatted=true)
+			formatted ? (Time.now-(3600*24)).strftime(@format) : Time.now-(3600*24)
+		end
+
+		def ayer
+			self.yesterday(true)
+		end
+
+		def ontem
+			self.yesterday(true)
+		end
+
+		def tomorrow(formatted=true)
+			formatted ? (Time.now+(3600*24)).strftime(@format) : (Time.now+(3600*24))
+		end
+
+		def mañana
+			self.tomorrow(true)
+		end
+
+		def manhã
+			self.tomorrow(true)
+		end
+
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dater
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: