duration-formatter 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 719df39ecfaa4879706be6e1c4ab68cdb7a9b7df
-  data.tar.gz: 6212e2a572bc0a72cde231bf1aa6db37a543e19f
+  metadata.gz: a39c32b6b33eb9cbceb2217076d2885c6cccc9d3
+  data.tar.gz: 605b7729fd220eb86475942fc703efb2fa57242a
 SHA512:
-  metadata.gz: b73e3c5dfa20f653f594dae622379e892dc59638ae928bfa7f80f02f6d2e661113665c70ebbfe1fe07037b4cc34ce96384b77006c7fce5f0a7f67c135fcc9b5b
-  data.tar.gz: 60734ab1ff638952b4f9e62832cc561085b63a1e91aaf6fc74eaeb580d04b45d46f91034dab7f591eb5bed403065510bb3e38bf83ecd5f6171d5f508c1e3245a
+  metadata.gz: 8959c57e5da03f7042907d9fc88fb30aca4ca26185839c39b27cac9c212f052aca70b98f420ae8919a3bcf734a78c4808a2d621b8d9488afc668de359de0222b
+  data.tar.gz: 246a2fc74441bdf3e6ef0b5b6c116e3d05867484bad1326135130acef7089fe441cba4323da5822b5be3d72bf1b1f1653b682ba8bcfce39f09058959615d52df

data/Gemfile.lock

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

data/README.md

@@ -31,11 +31,14 @@ FormattedDuration.new(1450).format # => 1 day, 10 minutes
 FormattedDuration.new(241).format # => 4 hours, 1 minute
 ```
 
+### Constraints
+
 You can also force a constraint upon the format.
 
-```
+```ruby
+FormattedDuration.new(11520, :days).format # => 15 days (not "2 weeks, 1 day")
 FormattedDuration.new(1440, :hours).format # => 24 hours
-FormattedDuration.new(11520, :days).format # => 15 days
+FormattedDuration.new(80, :minutes).format # => 80 minutes
 ```
 
 ## TODO

data/lib/duration_formatter/version.rb

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

data/lib/formatted_duration.rb

@@ -1,13 +1,12 @@
 require 'ruby-duration'
 
 class FormattedDuration
-  WEEKS_FORMAT = '%w %~w'
-  DAYS_FORMAT = '%d %~d'
-  HOURS_FORMAT = '%h %~h'
-  MINUTES_FORMAT = '%m %~m'
+  CONSTRAINTS = [:minutes, :hours, :days, :weeks]
 
-  def initialize(minutes)
-    @minutes = minutes % 60
+  def initialize(minutes, constraint = :weeks)
+    @constraint = CONSTRAINTS.index(constraint)
+
+    @minutes = minutes
     @hours = minutes / 60
     @days = @hours / 24
     @weeks = @days / 7
@@ -16,12 +15,30 @@ class FormattedDuration
   def format
     weekless_days = @days % 7
     dayless_hours = @hours % 24
+    hourless_minutes = @minutes % 60
     output = []
 
-    output << Duration.new(weeks: @weeks).format(WEEKS_FORMAT) if @weeks != 0
-    output << Duration.new(days: weekless_days).format(DAYS_FORMAT) if weekless_days != 0
-    output << Duration.new(hours: dayless_hours).format(HOURS_FORMAT) if dayless_hours != 0
-    output << Duration.new(minutes: @minutes).format(MINUTES_FORMAT) if @minutes != 0
+    if @weeks != 0 && @constraint > 2
+      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
+      output << Duration.new(days: @days).format('%tdu')
+    end
+
+    if dayless_hours != 0 && @constraint > 0
+      output << Duration.new(hours: dayless_hours).format('%h %~h')
+    elsif @hours > 0 && @constraint == 1
+      output << Duration.new(hours: @hours).format('%thu')
+    end
+
+    if hourless_minutes != 0
+      output << Duration.new(minutes: hourless_minutes).format('%m %~m')
+    elsif @minutes > 0 && @constraint == 0
+      output << Duration.new(minutes: @minutes).format('%tmu')
+    end
 
     output.join(', ')
   end

data/test/lib/formatted_duration_test.rb

@@ -1,6 +1,9 @@
 require 'test_helper'
 
 class FormattedDurationTest < Minitest::Test
+
+  # Full units
+
   def test_weeks_only_duration
     text = '1 week'
     output = FormattedDuration.new(10080).format
@@ -29,6 +32,8 @@ class FormattedDurationTest < Minitest::Test
     assert_equal text, output
   end
 
+  # Composition
+
   def test_weeks_and_days_duration
     text = '1 week, 4 days'
     output = FormattedDuration.new(15840).format
@@ -49,4 +54,27 @@ class FormattedDurationTest < Minitest::Test
 
     assert_equal text, output
   end
+
+  # Constraints
+
+  def test_days_constraint
+    text = '7 days'
+    output = FormattedDuration.new(10080, :days).format
+
+    assert_equal text, output
+  end
+
+  def test_hours_constraint
+    text = '24 hours'
+    output = FormattedDuration.new(1440, :hours).format
+
+    assert_equal text, output
+  end
+
+  def test_minutes_constraint
+    text = '60 minutes'
+    output = FormattedDuration.new(60, :minutes).format
+
+    assert_equal text, output
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duration-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Richard Venneman