time_duration_humanizer 0.1.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9ea67a4041178b0a9d2e17f55f53b9ca04e8fa6
-  data.tar.gz: 5174c75e85618f1c997978db790f402efb0ce9df
+  metadata.gz: 6dc5cfeb08e314bd679827105e34469f282f551d
+  data.tar.gz: 69ddae6813267280ba8eca00bec1213428385513
 SHA512:
-  metadata.gz: 65789569eeb769d3ffe6ee4a5155b338d083a5364d5535dba54eeaa5881b328157712feca25a9522d3b7adfdb230f4d053293d3c778fdd3c46569d129ef0f610
-  data.tar.gz: e29a7baa0d550aef8b3d2286396d5207c3d4aa140847ffee0643c5fcaa176ac334d4f72a9fd8782edfd4e4080427da1acb692ef760da83525ccdb5a8c8b930f8
+  metadata.gz: 433d18188f3a68944ffb9727847665c2e1c096c8e9ee8e96d936612d21c073bbc94a0e4c699e9e2dc8c5c1ecc61724981b0b529950fee07e4801c218d58768ca
+  data.tar.gz: dd1d1f12ce0e547e8de922b117f1f87358c64287b7e4aff1cad001b998e6472a46cb828881d6ed8b618dad4d1279c98263b10ed462cbebeaf7f3b3f0957abbd4

data/README.md

@@ -23,39 +23,36 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-irb(main):001:0> TimeDurationHumanizer.humanize(12345)
+irb(main):001:0> 12345.to_duration
 => "3 hours, 25 minutes and 45 seconds"
 
-irb(main):002:0> TimeDurationHumanizer.humanize(12345, { and_at_end: false })
+irb(main):002:0> 12345.to_duration(and_at_end: false)
 => "3 hours, 25 minutes, 45 seconds"
 
-irb(main):003:0> TimeDurationHumanizer.humanize(1234567890)
+irb(main):003:0> 1234567890.to_duration
 => "39 years, 1 month, 14 days, 5 hours, 31 minutes and 30 seconds"
 
-irb(main):004:0> TimeDurationHumanizer.humanize(1234567890, {}, { weeks: true })
+irb(main):004:0> 1234567890.to_duration(weeks: true)
 => "39 years, 1 month, 2 weeks, 5 hours, 31 minutes and 30 seconds"
 
-irb(main):005:0> TimeDurationHumanizer.humanize(62208000)
+irb(main):005:0> 62208000.to_duration
 => "1 year, 11 months, 24 days and 18 hours"
 
-irb(main):006:0> TimeDurationHumanizer.humanize(62208000, { days_in_year: 360 })
+irb(main):006:0> 62208000.to_duration(days_in_year: 360)
 => "2 years"
 ```
 
-## Options (second parameter)
+## Options
 
-* and_at_end - default `true`
-* days_in_year - default `365.25`
-
-## Units (third parameter)
-
-* years - default `true`
-* months - default `true`
-* weeks - default `false`
-* days - default `true`
-* hours - default `true`
-* minutes - default `true`
-* seconds - default `true`
+* `and_at_end` - default `true`
+* `days_in_year` - default `365.25`
+* `year` - default `true`
+* `month` - default `true`
+* `week` - default `false`
+* `day` - default `true`
+* `hour` - default `true`
+* `minute` - default `true`
+* `second` - default `true`
 
 ## Localization
 
@@ -65,20 +62,27 @@ In your Rails application edit `config/locales/en.yml`:
 en:
   time_duration_humanizer:
     and: and
-    year: year
-    years: years
-    month: month
-    months: months
-    week: week
-    weeks: weeks
-    day: day
-    days: days
-    hour: hour
-    hours: hours
-    minute: minute
-    minutes: minutes
-    second: second
-    seconds: seconds
+    year:
+      one: year
+      other: years
+    month:
+      one: month
+      other: months
+    week:
+      one: week
+      other: weeks
+    day:
+      one: day
+      other: days
+    hour:
+      one: hour
+      other: hours
+    minute:
+      one: minute
+      other: minutes
+    second:
+      one: second
+      other: seconds
 ```
 
 ## Contributing

data/lib/time_duration_humanizer.rb

@@ -1,52 +1,61 @@
-require "time_duration_humanizer/version"
-
-module TimeDurationHumanizer
-  @@units = {
-    years: 31557600,
-    months: 2592000,
-    weeks: 604800,
-    days: 86400,
-    hours: 3600,
-    minutes: 60,
-    seconds: 1
-  }
-
-  def self.humanize(seconds, options = {}, units = {})
-    options = {
-      and_at_end: true,
-      days_in_year: 365.25
-    }.merge!(options)
-
-    units = {
-      years: true,
-      months: true,
-      weeks: false,
-      days: true,
-      hours: true,
-      minutes: true,
-      seconds: true
-    }.merge!(units)
-
-    values = []
-    duration = ''
-
-    units.each do |k, v|
-      if v == true && @@units.keys.include?(k)
-        u = k == :years ? (options[:days_in_year] * @@units[:days]).to_i : @@units[k]
-        value = seconds >= u ? seconds / u : 0
-        if value > 0
-          values << { name: k.to_s, value: value }
-          seconds -= value * u
-        end
-      end
-    end
+require 'time_duration_humanizer/version'
+
+class Numeric
+  UNITS = {
+    year: 315_576_00,
+    month: 259_200_0,
+    week: 604_800,
+    day: 864_00,
+    hour: 3600,
+    minute: 60,
+    second: 1
+  }.freeze
+
+  DEFAULTS = {
+    and_at_end: true,
+    days_in_year: 365.25,
+    year: true,
+    month: true,
+    week: false,
+    day: true,
+    hour: true,
+    minute: true,
+    second: true
+  }.freeze
+
+  def to_duration(options = {})
+    options = DEFAULTS.dup.merge!(options)
+    units = to_duration_units(options).map { |v| t_duration_unit(v) }
+    last = if units.length > 1 && options[:and_at_end] == true
+             " #{I18n.t('time_duration_humanizer.and')} #{units.pop}"
+           else
+             ''
+           end
+    units.join(', ') + last
+  end
 
-    l = values.length
-    values.each_with_index do |v, i|
-      separator = i == l - 1 ? '' : (i == l - 2 && options[:and_at_end] == true ? " #{I18n.t('time_duration_humanizer.and')} " : ', ')
-      duration += "#{v[:value]} #{I18n.t("time_duration_humanizer.#{v[:value] == 1 ? v[:name].chop : v[:name]}")}#{separator}"
+  private
+
+  def to_duration_units(options)
+    units = []
+    seconds = to_i
+
+    UNITS.each do |k, v|
+      next if options[k] != true
+
+      secs = k == :year ? (options[:days_in_year] * UNITS[:day]).to_i : v
+      value = seconds >= secs ? seconds / secs : 0
+      if value > 0
+        units << { name: k, value: value }
+        seconds -= value * secs
+      end
     end
+    units
+  end
 
-    duration
+  def t_duration_unit(unit)
+    "#{unit[:value]} " + I18n.t(
+      "time_duration_humanizer.#{unit[:name]}", count: unit[:value]
+    )
   end
 end

data/lib/time_duration_humanizer/version.rb

@@ -1,3 +1,3 @@
 module TimeDurationHumanizer
-  VERSION = "0.1.6"
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_duration_humanizer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Nikolay Digaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for converting seconds into human-readable format.