to_duration 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c88aeaa5f019f1bf7a63698277624b3fb0406e2752344a19f5e9886ee2168f6
-  data.tar.gz: 6821895e880e484887c691806e383b3a1b1956bffd16d71a4a9ff1445e9ebec0
+  metadata.gz: 3f666e8ee38f3e2774197a4efcb96cd72a3eb7a00b86acca35d931e919020a81
+  data.tar.gz: 68f533ca4678c8ee6352f034166bd2da22a42f7cfa950d59479326844b0cd725
 SHA512:
-  metadata.gz: be3f3acb88afa570c9cf86e03f04c39e8afcc9d3b74ca499d7e904f4eb8ad9e58340718879c722691279a628ad35ff22cfdc87988ef6c495ebbff32d3e843e96
-  data.tar.gz: d31929e163e45b969a6097c5f0f89cebdd1dfc899564ca01306fa074fac454353568414ee78a8368e6410c41529ef3133b935421e1696a43ad33ad81004e63f1
+  metadata.gz: 8f7030a9d7454278dcbc104d307945788f707c1e244bd7c2d7b1869d9a161109af45936dbe12c245b1f031469b8ffe096955ad4cdd096e9f35e150db7a0d4b4d
+  data.tar.gz: fd4c42b2819ee1cdfdd00db2a92324f0406ac385876e713ffafc9b5d2ec780a90310b38d7fa55167a784183f8644188b3c38ba117e303e7813d24caf7ca21ad3

data/lib/to_duration.rb

@@ -1,3 +1,9 @@
 require 'to_duration/version'
 require 'to_duration/duration'
 require_relative 'numeric'
+
+module ToDuration
+  def self.t(key, options = {})
+    I18n.t("to_duration.#{key}", options)
+  end
+end

data/lib/to_duration/duration.rb

@@ -49,27 +49,24 @@ module ToDuration
     end
 
     def to_s(options = {})
-      return t('less_than_one_second') if seconds < 1
+      return ToDuration.t('less_than_one_second') if seconds < 1
 
-      options = {}.tap do |defaults|
-        UNITS.keys.each { |k| defaults[k] = k != :weeks }
-      end.merge!(options)
-
-      units_to_s(to_units(options))
-    end
-
-    private
+      units = to_units(options).map do |k, v|
+        "#{v} #{ToDuration.t(k.to_s.chop, count: v)}"
+      end
 
-    def t(key, options = {})
-      I18n.t("to_duration.#{key}", options)
+      units.join(', ').tap do |s|
+        s.gsub!(/,([^,]*)$/, " #{ToDuration.t('and')}\\1") if units.length > 1
+      end
     end
 
-    def to_units(options)
+    def to_units(options = {})
+      options = { weeks: false }.merge!(options)
       duration = Duration.new(seconds)
 
       {}.tap do |units|
         UNITS.keys.each do |k|
-          next if options[k] != true
+          next if options.key?(k) && options[k] != true
 
           count = duration.public_send(k)
           next if count.zero?
@@ -79,13 +76,5 @@ module ToDuration
         end
       end
     end
-
-    def units_to_s(units)
-      units = units.map { |k, v| "#{v} #{t(k.to_s.chop, count: v)}" }
-
-      s = units.join(', ')
-      s.gsub!(/,([^,]*)$/, " #{t('and')}\\1") if units.length > 1
-      s
-    end
   end
 end

data/lib/to_duration/version.rb

@@ -1,3 +1,3 @@
 module ToDuration
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_duration
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Nikolay Digaev