dater 0.2.0 → 0.2.1

data/Gemfile.lock

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

data/README.md

@@ -37,7 +37,8 @@ Or install it yourself as:
 
 	#To get the converted date:
 
-	date.for("in 2 days") # => yyyy-mm-dd (date for 2 days from the date of today)
+	date.for("in 4 days") # => yyyy-mm-dd (date for 4 days from the date of today)
+	date.for("in 2 weeks") # => yyyy-mm-dd (date for 2 weeks from the date of today)
 	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)
 

data/lib/dater.rb

@@ -46,19 +46,7 @@ module Dater
 				parts=period.split('-')
 			else
 				if (amount=period.scan(/\d+/)).size>0
-					times=self.eval_times(period, @lang)
-					if times[:year]
-						multiply_by = 3600*24*30*12
-					elsif times[:months]
-						multiply_by = 3600*24*30
-					elsif times[:weeks]
-						multiply_by =	3600*24*7
-					elsif times[:days]
-						multiply_by = 3600*24
-					else
-						multiply_by = 1
-					end
-					additional=amount[0].to_i*multiply_by
+					additional=amount[0].to_i*self.multiply_by(period,@lang)
 					@date=Time.now+additional
 				else
 					return period
@@ -73,13 +61,12 @@ module Dater
 		# Param [String] period = the period of time expressed in a literal way
 		# Param [String] lang = the languaje to eval
 		# Return [Hash] times
-		def eval_times(period, lang)
-			times = {}
-			times[:days] 		= true if period.scan(DICTIONARY[:day][lang]).size>0
-			times[:weeks] 	= true if period.scan(DICTIONARY[:week][lang]).size>0
-			times[:months] 	= true if period.scan(DICTIONARY[:month][lang]).size>0
-			times[:year] 		= true if period.scan(DICTIONARY[:year][lang]).size>0
-			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
 		end
 
 		# Return the Time object according to the splitted date in the given array  

data/lib/dater/version.rb

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

metadata

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