datetime_diff 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79cb20de634dfcfe68679a1bb7d1233243903a99
-  data.tar.gz: 3d9f607f50770f70a2006d563e3fe141d1884d46
+  metadata.gz: e90c28f83a23dda05a4dd059242ca70674a15ae8
+  data.tar.gz: 3a8f087c6c03359d38b4a57473888d4497e98aa3
 SHA512:
-  metadata.gz: 74feb356476abf3727ef5dd873e0ad24d290f91863b763674761c6d9137d979788c4a2186751cdc9e33ee2edc9df34365c0ea0c3dfbba2c551be77ffba6561ad
-  data.tar.gz: 5eaa6cbd5ef8cd089536b583da276d1b68000339ddc35d907b2fde3a2b3efdda4648662031d11b51aec9bf67db96d95947f41baf06c9ced8c6216507d5a36fa5
+  metadata.gz: 7ec5607e888b67d92290d922cd74c7f711d2ad92e2a8f454557508bad9fcb5a4a7b72cdd830c1bd6042c2fa53b378044b6b29acf9a407a663bdf0a5d3c7c0f49
+  data.tar.gz: 1323e568e6da511f2d396cf12c21d66b34c78d18d96b71d7e474761cdef99d4713c614f3dc5d0e5e6c0ad52c824d7392f542e6b76e7c53ab465598b67fb9ab95

data/lib/datetime_diff.rb

@@ -1,3 +1,5 @@
+require "datetime_diff/version"
+
 module DateTimeDiff
 
 	def self.diff_to_s mls, format=nil, options
@@ -43,16 +45,31 @@ module DateTimeDiff
 			#values = format.scan(/\%\S[\S|\s]{1,3}*?(?!%)/)
 			values = format.scan(/\%\w{1,3}/)
 			
-			zero_left = options[:zero_left] || false
+			zero_left = !options[:zero_left] || false
 			
 			for xV in values
-				number = t[xV.gsub("%","").to_sym]
-				zero_left = false if number.to_i > 0
-				unless zero_left && number.to_i == 0
+				number = t[xV.gsub("%","").to_sym].to_i
+				zero_left = false if number > 0
+				unless zero_left && number == 0
 					if values.index(xV) + 1 == values.size
-						r += "#{number}#{format.scan(/(?<=#{xV})[\s|\S]*?$/)[0]}"
+						x = format.scan(/(?<=#{xV})[\s|\S]*?$/)[0]
+					else
+						x = "#{format.scan(/(?<=#{xV})[\s|\S]*?(?=\%)/)[0]}"
+					end
+					if x.strip[0] == "[" && x.strip[-1] == "]"
+						values_ = x.gsub(/\[|\]/, '').split(',')
+						while values_.size < 3
+							values_.unshift nil
+						end
+						if number == 0 && values_[0]
+							r += "#{number}#{values_[0]}"
+						elsif number == 1 && values_[1]
+							r += "#{number}#{values_[1]}"
+						elsif number > 1 && values_[2]
+							r += "#{number}#{values_[2]}"
+						end
 					else
-						r += "#{number}#{format.scan(/(?<=#{xV})[\s|\S]*?(?=\%)/)[0]}"
+						r += "#{number}#{x}"
 					end
 				else
 					zero_left  = true

data/lib/datetime_diff/version.rb

@@ -1,3 +1,3 @@
 module DateTimeDiff
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datetime_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - thiago feitosa