lib/fugit/duration.rb in fugit-0.9.5 vs lib/fugit/duration.rb in fugit-0.9.6
- old
+ new
@@ -1,30 +1,6 @@
-#--
-# Copyright (c) 2017-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
module Fugit
class Duration
attr_reader :original, :h
@@ -116,9 +92,15 @@
s << ' '; s << aa[:l]; s << 's' if v > 1
s << (a.size == 1 ? adn : ', ') if a.size > 0
end
s.string
+ end
+
+ class << self
+ def to_plain_s(o); do_parse(o).to_plain_s; end
+ def to_iso_s(o); do_parse(o).to_iso_s; end
+ def to_long_s(o, opts={}); do_parse(o).to_long_s(opts); end
end
# Warning: this is an "approximation", months are 30 days and years are
# 365 days, ...
#