time_duration_humanizer 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8ced2681ada1e708b76e747e98c9c0afb07a610
-  data.tar.gz: 9b1c0ae8cb749c6e07ba8b52626d388b7ba46d88
+  metadata.gz: c9ea67a4041178b0a9d2e17f55f53b9ca04e8fa6
+  data.tar.gz: 5174c75e85618f1c997978db790f402efb0ce9df
 SHA512:
-  metadata.gz: 94d3825574856ac207fdadfa2f45ee7f64ccee0791901892030204c5e6b4962dbc203db46f5cbf7f3096bd8ec5f6e2c297b5535d51b9506e863c827d8816995c
-  data.tar.gz: b6c7e045bc4d7daffbe5df59e26180abf53a8a127d9bd5a681dbcad921a53f81da66e298fc6f4f0f9b595f15395acc14af63cef4ef1ce0ce8300b01319365526
+  metadata.gz: 65789569eeb769d3ffe6ee4a5155b338d083a5364d5535dba54eeaa5881b328157712feca25a9522d3b7adfdb230f4d053293d3c778fdd3c46569d129ef0f610
+  data.tar.gz: e29a7baa0d550aef8b3d2286396d5207c3d4aa140847ffee0643c5fcaa176ac334d4f72a9fd8782edfd4e4080427da1acb692ef760da83525ccdb5a8c8b930f8

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in time_duration_humanizer.gemspec
 gemspec
 
-gem 'activesupport'
 gem 'i18n'
 gem 'minitest'
 gem 'rake'

data/README.md

@@ -45,7 +45,7 @@ irb(main):006:0> TimeDurationHumanizer.humanize(62208000, { days_in_year: 360 })
 ## Options (second parameter)
 
 * and_at_end - default `true`
-* days_in_year - default `1.year / 1.day` (365.25)
+* days_in_year - default `365.25`
 
 ## Units (third parameter)
 

data/lib/time_duration_humanizer/version.rb

@@ -1,3 +1,3 @@
 module TimeDurationHumanizer
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/time_duration_humanizer.rb

@@ -1,13 +1,21 @@
 require "time_duration_humanizer/version"
 
 module TimeDurationHumanizer
-  @@known_units = [:years, :months, :weeks, :days, :hours, :minutes, :seconds]
+  @@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: 1.year / 1.day
-    }.merge!(options.symbolize_keys)
+      days_in_year: 365.25
+    }.merge!(options)
 
     units = {
       years: true,
@@ -17,14 +25,14 @@ module TimeDurationHumanizer
       hours: true,
       minutes: true,
       seconds: true
-    }.merge!(units.symbolize_keys)
+    }.merge!(units)
 
     values = []
     duration = ''
 
     units.each do |k, v|
-      if v == true && @@known_units.include?(k)
-        u = (k == :years ? options[:days_in_year].days : 1.send(k)).to_i
+      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 }
@@ -36,7 +44,7 @@ module TimeDurationHumanizer
     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].singularize : v[:name]}")}#{separator}"
+      duration += "#{v[:value]} #{I18n.t("time_duration_humanizer.#{v[:value] == 1 ? v[:name].chop : v[:name]}")}#{separator}"
     end
 
     duration

data/time_duration_humanizer.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Nikolay Digaev"]
   spec.email         = ["ffs.cmp@gmail.com"]
 
-  spec.summary       = %q{An Ruby gem for converting seconds into human-readable format.}
-  spec.description   = %q{An Ruby gem for converting seconds into human-readable format (12345 => "3 hours, 25 minutes and 45 seconds").}
+  spec.summary       = %q{A Ruby gem for converting seconds into human-readable format.}
+  spec.description   = %q{A Ruby gem for converting seconds into human-readable format (12345 => "3 hours, 25 minutes and 45 seconds").}
   spec.homepage      = "https://github.com/digaev/time_duration_humanier"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_duration_humanizer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nikolay Digaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,8 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: An Ruby gem for converting seconds into human-readable format (12345
-  => "3 hours, 25 minutes and 45 seconds").
+description: A Ruby gem for converting seconds into human-readable format (12345 =>
+  "3 hours, 25 minutes and 45 seconds").
 email:
 - ffs.cmp@gmail.com
 executables: []
@@ -80,5 +80,5 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: An Ruby gem for converting seconds into human-readable format.
+summary: A Ruby gem for converting seconds into human-readable format.
 test_files: []