dater 0.0.1 → 0.0.2

data/Gemfile.lock

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

data/README.md

@@ -1,15 +1,14 @@
-dater
+Dater
 =====
 
-Convert literal periods of time in a formatted date
-# Dater
-
-Convert a period of time expressed in a literal way like 'in 2 days' to a real date with a given format from today.
+Convert a period of time expressed in a literal way like 'in 2 days' to a formatted future date with a given format. It aims to be helpful in regression tests when you have to deal with dinamic dates.
 
 You can also, convert dates from 'dd/mm/yyyy' to 'yyyy-mm-dd' or viceversa.
 
-You have to be care about only two things in the argument if you want to pass a formatted date to convert:
+If you want to pass a formatted date like dd/mm/yyyy to convert to yyyy-mm-dd, you have to take care about only two things with the argument:
+
 	- Year number must have four digits.
+
 	- Month number must be always in the middle.
 
 ## Installation
@@ -38,13 +37,27 @@ To get the converted date:
 	date.for("in 10 months") # => yyyy-mm-dd (date for 10 months from the date of today)
 	date.for("in 1 year") # => yyyy-mm-dd (date for 1 year from the date of today)
 
+	date.for("today") # => yyyy-mm-dd (date of today)
+
+	date.for("tomorrow") # => yyyy-mm-dd (date of tomorrow)
+
+	date.for("yesterday") # => yyyy-mm-dd (date of yesterday)
+
+If the argument is nil, it will return the date of today.
+
+You'll find format directives at following link:
+
+http://apidock.com/ruby/Time/strftime
+
+It does not work correctly with leap-years and calculates months of 30 days only.
+
 ==================================================
 
 Si deseas usar esta gema en español puedes inicializar la clase de la siguiente manera:
 
 	date=Dater::Resolver.new('%Y-%m-%d', "en")
 
-Con eso puedes pasar argumentos en idioma español (en 2 días, en 10 meses, en 1 año)
+Con eso puedes pasar argumentos en idioma español (por ejemplo 'en 2 días', 'en 10 meses', 'en 1 año')
 
 ==================================================
 

data/lib/dater/version.rb

@@ -1,3 +1,3 @@
 module Dater
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/dater.rb

@@ -11,50 +11,59 @@ module Dater
 		# Param [String] lang = languaje for matching (en=english, es=spanish, pt=portuguese)
 		def initialize(format='%Y-%m-%d', lang="en")
 			@format=format
-			@lang=lang
+			@lang=lang if ["en","es","pt"].include? lang
 		end
 
 		# Convert the period of time passed as argument to the configured format
 		#
 		# Param [String] period = a period of time like "in 3 days" or "in 10 months" or "in 2 years". It could be a formatted date to convert to the wanted format
-		# Return [String] converted date to the configured format 
-		def for(period)
-			return (Time.now+(3600*24)).strftime(@format) if period.nil?
-			if period.include?('/')
-				date=period.split('/')
-				return date.join('-') if date[0].size==4
-				return "#{date[2]}-#{date[1]}-#{date[0]}"
-			elsif period.include?('-')
-				date=period.split('-')
-				return date.join('-') if date[0].size==4
-				return "#{date[2]}-#{date[1]}-#{date[0]}"
-			elsif (amount=period.scan(/\d+/)).size>0
-				case @lang
-				when 'es'
-					days=true if period.scan(/dia(s)?/).size>0
-					months=true if period.scan(/mes(es)?/).size>0
-					year=true if period.scan(/año(s)?/).size>0
-				when 'en'
-					days=true if period.scan(/day(s)?/).size>0
-					months=true if period.scan(/month(s)?/).size>0
-					year=true if period.scan(/year(s)?/).size>0
-				when 'pt'
-					days=true if period.scan(/dia(s)?/).size>0
-					months=true if period.scan(/mes(es)?/).size>0
-					year=true if period.scan(/ano(s)?/).size>0
-				end	
-				if year
-					multiply_by=3600*24*30*12
-				elsif months
-					multiply_by=3600*24*30
+		# 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
+			when 'today','hoy','hoje'
+				return (Time.now).strftime(@format)
+			when 'tomorrow','mañana','manhã'
+				return (Time.now+(3600*24)).strftime(@format)
+			when 'yesterday','ayer','ontem'
+				return (Time.now-(3600*24)).strftime(@format)
+			else
+				if period.include?('/')
+					date=period.split('/')
+					return date.join('-') if date.first.size==4
+					return "#{date[2]}-#{date[1]}-#{date[0]}"
+				elsif period.include?('-')
+					date=period.split('-')
+					return date.join('-') if date.first.size==4
+					return "#{date[2]}-#{date[1]}-#{date[0]}"
+				elsif (amount=period.scan(/\d+/)).size>0
+					case @lang
+					when 'es'
+						days=true if period.scan(/dia(s)?/).size>0
+						months=true if period.scan(/mes(es)?/).size>0
+						year=true if period.scan(/año(s)?/).size>0
+					when 'en'
+						days=true if period.scan(/day(s)?/).size>0
+						months=true if period.scan(/month(s)?/).size>0
+						year=true if period.scan(/year(s)?/).size>0
+					when 'pt'
+						days=true if period.scan(/dia(s)?/).size>0
+						months=true if period.scan(/mes(es)?/).size>0
+						year=true if period.scan(/ano(s)?/).size>0
+					end	
+					if year
+						multiply_by=3600*24*30*12
+					elsif months
+						multiply_by=3600*24*30
+					else
+						multiply_by=3600*24
+					end
+					additional=amount[0].to_i*multiply_by
+					@date=Time.now+additional
+					@date=@date.strftime(@format)			
 				else
-					multiply_by=3600*24
+					return period
 				end
-				additional=amount[0].to_i*multiply_by
-				@date=Time.now+additional
-				@date=@date.strftime(@format)			
-			else
-				return period
 			end
 			return @date
 		end

metadata

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