duration-formatter 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 507104638a4a8b8cf7adb5692c352c021a33275a
-  data.tar.gz: 7f95937db867be224021df525f7b5c2eef7490c5
+  metadata.gz: 6c15a7267c925c45ad91c80e956db0d5fc57ee2a
+  data.tar.gz: d0a69ecac8179b8c1e0cd79931413ba69ae7f2c9
 SHA512:
-  metadata.gz: ed666090e24594bbb499ce93e2fd000f24950c5e50a8f0de22d37163f37892471936e01257f49dd5a48bbb4cb9b2cab290a9a6e25c62696b5fad82ce6dc9ec85
-  data.tar.gz: 5ea244b725e9334b8af6501122a6b9f42bfd6804b88081873aeedb2a9d8b12cab26142ac5f82ee1c66c4b3b01986ece413d7e7dbd0b7e7660d3e49401338f201
+  metadata.gz: afd682c2028e8f80d1986035eaa364d59a2fcfc6581ab04aaaf8ed25c681e6e2fa68d8d90835ad8249b502ab3a4c825ad803e370b662dfafeedfef8924d84197
+  data.tar.gz: fef1f3c1efa3825d34d15462cc317405779972356873e66ac9ee30b97a51d96702f56f7330610b5c95f9500e6abc8e61e643e27c8f4a72a043aca00205e909a8

data/.gitignore

@@ -1 +1,2 @@
-coverage
+coverage
+tmp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duration-formatter (1.0.1)
+    duration-formatter (1.1.1)
       ruby-duration (~> 3.2)
 
 GEM
@@ -78,6 +78,7 @@ DEPENDENCIES
   guard (~> 2.12)
   guard-minitest (~> 2.4)
   rake (~> 10.4)
+  simplecov (~> 0.9)
 
 BUNDLED WITH
-   1.10.3
+   1.10.5

data/duration-formatter.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'guard', '~> 2.12'
   s.add_development_dependency 'guard-minitest', '~> 2.4'
+  s.add_development_dependency 'simplecov', '~> 0.9'
   s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
 end

data/lib/duration_formatter/version.rb

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

data/lib/formatted_duration.rb

@@ -2,44 +2,42 @@ require 'ruby-duration'
 
 class FormattedDuration
   CONSTRAINTS = [:minutes, :hours, :days, :weeks]
+  FORMATS = { weeks: '%w %~w', days: '%tdu', hours: '%thu', minutes: '%tmu' }
+  BARE_FORMATS = { days: '%d %~d', hours: '%h %~h', minutes: '%m %~m' }
+  BARE = { days: 7, hours: 24, minutes: 60 }
 
   def initialize(minutes, constraint = :weeks)
     @constraint = CONSTRAINTS.index(constraint)
-
     @minutes = minutes
     @hours = minutes / 60
     @days = @hours / 24
     @weeks = @days / 7
+    @output = []
   end
 
   def format
-    weekless_days = @days % 7
-    dayless_hours = @hours % 24
-    hourless_minutes = @minutes % 60
-    output = []
+    append(:weeks, @weeks, '%w %~w') if @weeks > 0 && @constraint > 2
+    add(:days, @days, 2)
+    add(:hours, @hours, 1)
+    add(:minutes, @minutes, 0)
 
-    if @weeks != 0 && @constraint > 2
-      output << Duration.new(weeks: @weeks).format('%w %~w')
-    end
+    @output.join(', ')
+  end
 
-    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
+  def append(unit, value, format)
+    opts = {}
+    opts[unit] = value
 
-    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
+    @output << Duration.new(opts).format(format)
+  end
 
-    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
+  def add(unit, value, constraint)
+    bare = value % BARE[unit]
 
-    output.join(', ')
+    if value > 0 && @constraint == constraint
+      append(unit, value, FORMATS[unit])
+    elsif bare > 0 && @constraint > constraint - 1
+      append(unit, bare, BARE_FORMATS[unit])
+    end
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,13 @@
 # Coverage
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start if ENV['CODECLIMATE_REPO_TOKEN']
+if ENV['CODECLIMATE_REPO_TOKEN']
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+elsif ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_group 'Libraries', 'lib'
+  end
+end
 
 # Source files
 require './lib/formatted_duration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duration-formatter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Richard Venneman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-duration
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,6 @@ files:
 - Guardfile
 - README.md
 - Rakefile
-- duration-formatter-1.0.0.gem
 - duration-formatter.gemspec
 - lib/duration-formatter.rb
 - lib/duration_formatter/version.rb