hour-ruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a1be05c48e54df485856e200079e23f03e93ccdc785b9c5f20253cab6ef1918
-  data.tar.gz: 949992e1b0c54a94a17f964f4ad7114791ec95b83bd4ff3a8c6f15026be4ebb2
+  metadata.gz: 5b8bac3638cd0e4086e0929f7fc05aae9d6e165495dc9427a2a02a587f1b1f20
+  data.tar.gz: 2afec0e7ad09044471bf724c2d09070a3d251c7eb676538484f4f62ec3d29b8d
 SHA512:
-  metadata.gz: 99b789a3f010f5c95acff8bfae7d8a71a88a68d18261287d53b8b01859cdc84c0ee99dd7229c4a4a9e2d2329e3a761bf0eb17074081497bf731231238b79d668
-  data.tar.gz: 8bcba1a83adb64a842d9f4c51b802c003502239d93542b735508e7ef86670dd08db5de3e701c1653832d73915e5545a4cbc9f6c47cf3b455f74187bd0dbdf868
+  metadata.gz: 61261cd9e0c2e96aaa73b97f3429ed99c2a3a6880f6e9e7a32efba3fb22b8f517c4b3b3f3e6f2c5e05a52061063e213872366c2cb9ded37329d9c83cd1383f86
+  data.tar.gz: e242de3802e2e9b424968617b49900d280e0e95d18b002cf48c87551c42e1931ef70522753693afe94783ac0fae0991bc773e9bc8778cc838862b944c5d55fed

data/README.md

@@ -28,10 +28,13 @@ puts "It's #{hour.to_s}!"
 puts "The system time is #{Hour.now}!"
 ```
 
+# Development
+
+Use `vagrant up` to start a VM. Once everything's ready, it's `vagrant ssh`. Upon login, you'll be connected to a tmux session. To sleep, it's `vagrant suspend`.
+
 # TODO
 
 - Rubocop.
-- Travis.
 - Release version 0.1.
 
 [Gem version]: https://rubygems.org/gems/hour-ruby

data/lib/hour.rb

@@ -56,13 +56,13 @@ class Hour
   end
 
   # TODO: Test me and document me.
-  def self.now
-    self.from_time(Time.now)
+  def self.now(**opts)
+    self.from_time(Time.now, **opts)
   end
 
   # TODO: document and write tests.
-  def self.from_time(time)
-    self.new(time.hour, time.min, time.sec)
+  def self.from_time(time, s: true)
+    self.new(time.hour, time.min, s ? time.sec : false)
   end
 
   # Build an hour instance from an hour string.
@@ -71,17 +71,17 @@ class Hour
   #     Hour.parse("1:00", "%h:%m?") # Will work with "1:00" or just "1".
   #
   # TODO: Implement me, test me and document me.
-  def self.parse(serialised_hour, formatting_string = nil)
+  def self.parse(serialised_hour, s: true)
     args = serialised_hour.split(':').map(&:to_i)
 
-    case args.length
-    when 3
+    if args.length == 3 && s
       self.new(*args)
-    when (0..2)
-      # TODO: if formatting_string ...
-      raise ArgumentError.new("If format is not H:M:S, formatting string must be provided.")
-    when (4..Float::INFINITY) # Until we have infinite ranges like (4..) in Ruby 2.6.
-      raise ArgumentError, "Too many arguments."
+    elsif args.length == 2 && !s
+      self.new(*(args << false))
+    elsif ((0..2).include?(args.length) && s) || ((0..1).include?(args.length) && !s)
+      raise ArgumentError, "Too few segments (#{args.inspect})."
+    elsif ((4..Float::INFINITY).include?(args.length) && s) || ((3..Float::INFINITY).include?(args.length) && !s)
+      raise ArgumentError, "Too many segments (#{args.inspect})."
     end
   end
 
@@ -95,7 +95,7 @@ class Hour
       raise ArgumentError.new("Use either minutes OR seconds, not both.")
     end
 
-    if minutes > 0
+    if minutes > 0 || (minutes == 0 && seconds == 0)
       self.new(h: minutes / 60, m: minutes % 60)
     else
       self.from(minutes: seconds / 60) + self.new(s: seconds % 60)
@@ -121,7 +121,7 @@ class Hour
       raise ArgumentError.new("Minutes must be a number between 0 and 60.")
     end
 
-    if @s > 60
+    if @s.respond_to?(:round) && @s > 60
       raise ArgumentError.new("Seconds must be a number between 0 and 60.")
     end
   end
@@ -132,7 +132,15 @@ class Hour
   def +(other)
     hours = @h + other.h + (@m + other.m + ((@s + other.s) / 60)) / 60
     minutes = (@m + other.m + ((@s + other.s) / 60)) % 60
-    seconds = (@s + other.s) % 60
+
+    if @s && other.s
+      seconds = (@s + other.s) % 60
+    elsif (!@s) && (!other.s)
+      seconds = false
+    else
+      raise "TODO: how to resolve this?"
+    end
+
     self.class.new(hours, minutes, seconds)
   end
 
@@ -159,17 +167,28 @@ class Hour
   #     Hour.new(m: 1, s: 10).seconds.value # => 10
   #     Hour.new(1, 45, 10  ).seconds.total # => (1 * 60 * 60) + (45 * 60) + 10
   def seconds
-    SecondUnit.new(self)
+    SecondUnit.new(self) if @s
   end
 
-  # TODO: Add formatting string support.
-  # TODO: Pad 0s. I. e. "#{self.hours}:#{format('%02d', self.minutes_over_the_hour)}"
+  # Returns string representation of the hour instance.
+  #
+  #     Hour.new(m: 1, s: 10 ).to_s # => "1:10"
+  #     Hour.new(1, 45, false).to_s # => "1:45"
+  #
+  # TODO: Allow formatting string (to format hours to 2 digits etc).
   def to_s(format = nil)
-    "#{@h}:#{@m}:#{@s}"
+    [(@h unless @h.zero?), format('%02d', @m), (format('%02d', @s) if @s)].compact.join(':')
   end
 
   alias_method :inspect, :to_s
 
+  # Provisional.
+  def to_decimal
+    decimal = (@m / 60.0) + (@s / 3600.0)
+    "#{@h}.#{decimal}"
+    @h + decimal
+  end
+
   def to_time(today = Time.now)
     Time.new(today.year, today.month, today.day, self.hours, self.minutes_over_the_hour)
   end

data/spec/hour_spec.rb

@@ -18,9 +18,27 @@ describe Hour do
   end
 
   describe "#to_s" do
-    pending "implement me" #do
-      # TODO
-    #end
+    it "pads minutes and seconds with zeros" do
+      hour = Hour.new(1, 9, 5)
+      expect(hour.to_s).to eql('1:09:05')
+    end
+
+    it "omits hours if it's less than 60 minutes" do
+      hour = Hour.new(m: 52)
+      expect(hour.to_s).to eql('52:00')
+    end
+
+    context "with seconds disabled" do
+      it "returns %HH:%MM" do
+        hour = Hour.new(1, 9, false)
+        expect(hour.to_s).to eql('1:09')
+      end
+    end
+
+    context "with hours disabled" do
+      # This would be 90:00 for 1.5 hours.
+      pending "not implemented"
+    end
   end
 
   describe "#+" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hour-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - James C Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies: []
 description: "."
 email: james@101ideas.cz