timerizer 0.1.3 → 0.1.4

data/lib/timerizer.rb

@@ -457,6 +457,21 @@ class WallClock
     end
   end
 
+  # Takes a string and turns it into a WallClock time
+  # @param [String] string The string to convert
+  # @return [WallClock] The time as a WallClock
+  # @example
+  #   WallClock.from_string("10:30 PM")
+  #     # => 10:30:00 PM
+  #   WallClock.from_string("13:01:23")
+  #     # => 1:01:23 PM
+  # @see #to_s
+  def self.from_string(string)
+    time, meridiem = string.split(' ', 2)
+    hour, minute, second = time.split(':', 3)
+    WallClock.new(hour.to_i, minute.to_i, second.to_i || 0, meridiem || :am)
+  end
+
   # Returns the time of the WallClock on a date
   # @param [Date] date The date to apply the time on
   # @return [Time] The time after the given date
@@ -562,20 +577,38 @@ class WallClock
 
   # Convert {WallClock} to a human-readable format.
   # @param [Symbol] system The hour system to use (`:twelve_hour` or `:twenty_four_hour`; default `:twelve_hour`)
+  # @param [Hash] options Extra options for the string to use
+  # @option options [Boolean] :use_seconds Whether or not to include seconds in the conversion to a string
+  # @option options [Boolean] :include_meridian Whether or not to include the meridian for a twelve-hour time
   # @example
-  #   time = WallClock.new(5, 37, :pm)
+  #   time = WallClock.new(5, 37, 41, :pm)
   #   time.to_s
-  #     => "5:37:00 PM"
-  #   time.to_s(:twenty_four_hour)
-  #     => "17:37:00"
+  #     => "5:37:41 PM"
+  #   time.to_s(:twenty_four_hour, :use_seconds => true)
+  #     => "17:37:41"
+  #   time.to_s(:twelve_hour, :use_seconds => false, :include_meridiem => false)
+  #     => "5:37"
+  #   time.to_s(:twenty_four_hour, :use_seconds =>false)
+  #     => "17:37"
   # @raise ArgumentError Argument isn't a proper system
-  def to_s(system = :twelve_hour)
+  def to_s(system = :twelve_hour, options = {})
+    options  = {:use_seconds => true, :include_meridiem => true}.merge(options)
     pad = "%02d"
-    if(system == :twelve_hour)
-      meridiem = self.meridiem.to_s.upcase
-      "#{self.hour(system)}:#{pad % self.minute}:#{pad % self.second} #{meridiem}"
-    elsif(system == :twenty_four_hour)
-      "#{self.hour(system)}:#{pad % self.minute}:#{pad % self.second}"
+    meridiem = self.meridiem.to_s.upcase
+    hour = self.hour(system)
+    minute = pad % self.minute
+    second = pad % self.second
+
+    string = [hour, minute].join(':')
+    if options[:use_seconds]
+      string = [string, second].join(':')
+    end
+
+    case system
+    when :twelve_hour
+      options[:include_meridiem] ? [string, meridiem].join(' ') : string
+    when :twenty_four_hour
+      string
     else
       raise ArgumentError, "system should be :twelve_hour or :twenty_four_hour"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timerizer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: