datetime_diff 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e33f091943c0a09d9cee04ba429f99b505ec2d1
-  data.tar.gz: 9d953f216f8594961c3a620e9189ed6086405d83
+  metadata.gz: 79cb20de634dfcfe68679a1bb7d1233243903a99
+  data.tar.gz: 3d9f607f50770f70a2006d563e3fe141d1884d46
 SHA512:
-  metadata.gz: f20e1880f94e95abea5f63225e282b7700af5d6bdc742191d6a2046e586295088e2923879a47b5e2f16d71d679beafc2e7948b3273789b154a5d71febe16e616
-  data.tar.gz: 0223955b810b84614402151bc4b7017c83d31947470aa7b774cdb9c00257d65f8d245bfda1677cd15577e0f6060687246bf071d0383a7f8a2afb36f73e430fc4
+  metadata.gz: 74feb356476abf3727ef5dd873e0ad24d290f91863b763674761c6d9137d979788c4a2186751cdc9e33ee2edc9df34365c0ea0c3dfbba2c551be77ffba6561ad
+  data.tar.gz: 5eaa6cbd5ef8cd089536b583da276d1b68000339ddc35d907b2fde3a2b3efdda4648662031d11b51aec9bf67db96d95947f41baf06c9ced8c6216507d5a36fa5

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.3.5
+  - add method diff_in_mls
+  - ...
 v0.3.4
   - fix 60 min to 1 hour
 v0.3.3

data/lib/datetime_diff.rb

@@ -1,8 +1,6 @@
-require "datetime_diff/version"
-
 module DateTimeDiff
 
-	def self.diff_to_s mls, format=nil
+	def self.diff_to_s mls, format=nil, options
 
 		mls = (mls * 1000).to_i
 		s = m = h = d = 0
@@ -28,25 +26,40 @@ module DateTimeDiff
 		end
 
 		t = {D: d,
+
 			H: h.to_s.rjust(2,"0"),
+			h: h.to_s,
+
 			M: m.to_s.rjust(2,"0"),
+			mm: m.to_s,
+
 			S: s.to_s.rjust(2,"0"),
+			ss: s.to_s,
+
 			m: mls.to_s.rjust(3,"0")}
 
 		if format
 			r = ""
-			values = format.scan(/\%\S[\S|\s]{1,3}*?(?!%)/)
+			#values = format.scan(/\%\S[\S|\s]{1,3}*?(?!%)/)
+			values = format.scan(/\%\w{1,3}/)
+			
+			zero_left = options[:zero_left] || false
+			
 			for xV in values
-				if values.index(xV) + 1 == values.size
-					r += "#{t[xV.gsub("%","").to_sym]}#{format.scan(/(?<=#{xV})[\s|\S]*?$/)[0]}"
+				number = t[xV.gsub("%","").to_sym]
+				zero_left = false if number.to_i > 0
+				unless zero_left && number.to_i == 0
+					if values.index(xV) + 1 == values.size
+						r += "#{number}#{format.scan(/(?<=#{xV})[\s|\S]*?$/)[0]}"
+					else
+						r += "#{number}#{format.scan(/(?<=#{xV})[\s|\S]*?(?=\%)/)[0]}"
+					end
 				else
-					r += "#{t[xV.gsub("%","").to_sym]}#{format.scan(/(?<=#{xV})[\s|\S]*?(?=\%)/)[0]}"
+					zero_left  = true
 				end
 			end
 			r
 		else
-			r = ""
-			r += "#{d} #{d > 1 ? "days" : "day"} "
 			r += "#{h} #{h > 1 ? "hours" : "hour"} "
 			r += "#{m} #{m > 1 ? "minutes" : "minute"} "
 			r += "#{s} #{s > 1 ? "seconds" : "second"} "
@@ -55,14 +68,23 @@ module DateTimeDiff
 			r.strip.gsub(/\s{2,}/," ")
 		end
 	end
-	def diff dt, format=nil
+	def diff dt, format=nil, options = {}
+		mls = 0
+		if self > dt
+			mls = self.to_time.to_f - dt.to_time.to_f
+		else
+			mls = dt.to_time.to_f - self.to_time.to_f
+		end
+		DateTimeDiff.diff_to_s mls, format, options
+	end
+	def diff_in_mls dt, format=nil, options = {}
 		mls = 0
 		if self > dt
 			mls = self.to_time.to_f - dt.to_time.to_f
 		else
 			mls = dt.to_time.to_f - self.to_time.to_f
 		end
-		DateTimeDiff.diff_to_s mls, format
+		mls
 	end
 end
 

data/lib/datetime_diff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datetime_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - thiago feitosa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler