duration-formatter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a39c32b6b33eb9cbceb2217076d2885c6cccc9d3
-  data.tar.gz: 605b7729fd220eb86475942fc703efb2fa57242a
+  metadata.gz: 507104638a4a8b8cf7adb5692c352c021a33275a
+  data.tar.gz: 7f95937db867be224021df525f7b5c2eef7490c5
 SHA512:
-  metadata.gz: 8959c57e5da03f7042907d9fc88fb30aca4ca26185839c39b27cac9c212f052aca70b98f420ae8919a3bcf734a78c4808a2d621b8d9488afc668de359de0222b
-  data.tar.gz: 246a2fc74441bdf3e6ef0b5b6c116e3d05867484bad1326135130acef7089fe441cba4323da5822b5be3d72bf1b1f1653b682ba8bcfce39f09058959615d52df
+  metadata.gz: ed666090e24594bbb499ce93e2fd000f24950c5e50a8f0de22d37163f37892471936e01257f49dd5a48bbb4cb9b2cab290a9a6e25c62696b5fad82ce6dc9ec85
+  data.tar.gz: 5ea244b725e9334b8af6501122a6b9f42bfd6804b88081873aeedb2a9d8b12cab26142ac5f82ee1c66c4b3b01986ece413d7e7dbd0b7e7660d3e49401338f201

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duration-formatter (1.0.0)
+    duration-formatter (1.0.1)
       ruby-duration (~> 3.2)
 
 GEM

data/lib/duration_formatter/version.rb

@@ -1,3 +1,3 @@
 module DurationFormatter
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/formatted_duration.rb

@@ -22,22 +22,22 @@ class FormattedDuration
       output << Duration.new(weeks: @weeks).format('%w %~w')
     end
 
-    if weekless_days != 0 && @constraint > 1
-      output << Duration.new(days: weekless_days).format('%d %~d')
-    elsif @days > 0 && @constraint == 2
+    if @days > 0 && @constraint == 2
       output << Duration.new(days: @days).format('%tdu')
+    elsif weekless_days != 0 && @constraint > 1
+      output << Duration.new(days: weekless_days).format('%d %~d')
     end
 
-    if dayless_hours != 0 && @constraint > 0
-      output << Duration.new(hours: dayless_hours).format('%h %~h')
-    elsif @hours > 0 && @constraint == 1
+    if @hours > 0 && @constraint == 1
       output << Duration.new(hours: @hours).format('%thu')
+    elsif dayless_hours != 0 && @constraint > 0
+      output << Duration.new(hours: dayless_hours).format('%h %~h')
     end
 
-    if hourless_minutes != 0
-      output << Duration.new(minutes: hourless_minutes).format('%m %~m')
-    elsif @minutes > 0 && @constraint == 0
+    if @minutes > 0 && @constraint == 0
       output << Duration.new(minutes: @minutes).format('%tmu')
+    elsif hourless_minutes != 0
+      output << Duration.new(minutes: hourless_minutes).format('%m %~m')
     end
 
     output.join(', ')

data/test/lib/formatted_duration_test.rb

@@ -58,8 +58,8 @@ class FormattedDurationTest < Minitest::Test
   # Constraints
 
   def test_days_constraint
-    text = '7 days'
-    output = FormattedDuration.new(10080, :days).format
+    text = '8 days'
+    output = FormattedDuration.new(11520, :days).format
 
     assert_equal text, output
   end
@@ -72,8 +72,8 @@ class FormattedDurationTest < Minitest::Test
   end
 
   def test_minutes_constraint
-    text = '60 minutes'
-    output = FormattedDuration.new(60, :minutes).format
+    text = '80 minutes'
+    output = FormattedDuration.new(80, :minutes).format
 
     assert_equal text, output
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duration-formatter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Richard Venneman
@@ -95,6 +95,7 @@ files:
 - Guardfile
 - README.md
 - Rakefile
+- duration-formatter-1.0.0.gem
 - duration-formatter.gemspec
 - lib/duration-formatter.rb
 - lib/duration_formatter/version.rb