dateless_time 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beb998e71c803edaa9cc5f5a43de996a3807d73b
-  data.tar.gz: c3518170af494b7996b1a92b46bb2503048855e0
+  metadata.gz: 6ac149024e32610ff56ae354bfad143ad37639d5
+  data.tar.gz: 941a7c524b054ecbd995c48c8b5f44a82c5da92a
 SHA512:
-  metadata.gz: a07b4e6b283c8a966e9783a9bbdab7bc66ad5bbbb15132dbb1d0c4bad3977bbaa4e8c4daf495d20e83c936b85fb3cf26f7993122e140609443689c0f6e781121
-  data.tar.gz: 9c4e6aa1b15cbf44b3e9ba6aa18dd15270b861a3ec0140cf2bff4affd3f73eb88cc9137e06fcf7e08b520e9022f854140ec68a086d7e22c3668b50ca09665059
+  metadata.gz: 4a044edb3457d468247a6d8bf0919ebc71d3ef803b7a08344d7368262c37d7421c954fa0087e906537033108db0fb72038a5c034a65f8b18c131cd03c1e4bdf9
+  data.tar.gz: 56fc6415511cc95bef2d152e04d3f1f337a5d50a5af6551f076bda2fa27f1ae6750549c240be28932ae22e19d04b00b4544b7f2cfc2acdeaf599f7625ed4f471

data/README.md

@@ -20,14 +20,15 @@ As easy as pie.
 
 ## Dependencies
 
-None. No external gems, nothing from the stdlib either.
+No external gems.  
+`date` from the stdlib.  
 
 
 ## Rubies
 
 Tested with:
 
-* MRI `1.9.3`, `2.0.0`, `2.1.0` and `2.1.1`
+* MRI `1.9.3`, `2.0.0`, `2.1.0`, `2.1.1` and `2.1.2`
 * Rubinius `2.2.4`
 * JRuby `1.7.10`
 
@@ -46,6 +47,9 @@ time = DatelessTime.now
 # or a Time object
 time = DatelessTime.new Time.now
 
+# or a DateTime object
+time = DatelessTime.new DateTime.now
+
 # or a String (minutes and seconds are optional)
 time = DatelessTime.new "13:37:00"
 
@@ -58,6 +62,9 @@ time = DatelessTime.new hours: 13, minutes: 37, seconds: 0
 # or an Array (minutes and seconds are optional)
 time = DatelessTime.new [13, 37, 0]
 
+# or another DatelessTime object
+time = DatelessTime.new DatelessTime.new('00:42')
+
 ```
 
 Interface:
@@ -109,21 +116,26 @@ Comparisons:
 ```ruby
 
 @time_1 = DatelessTime.new "11:22"
-@time_1 = DatelessTime.new "11:30"
+@time_2 = DatelessTime.new "11:30"
 
 # all the usual suspects
 
 @time_1 < @time_2
 # => true
 
-# all the usual suspects
 @time_1 == @time_2
 # => false
 
 @time_2.between? @time_1, DatelessTime.new("20:30")
 # => true
 
-#etc...
+array = (1..5).map { DatelessTime.new(rand(DatelessTime::SECONDS_IN_24_HOURS)) }
+array.map(&:to_s)
+# => ["06:51:58", "04:50:32", "14:36:53", "21:36:38", "10:17:12"]
+array.sort.map(&:to_s)
+# => ["04:50:32", "06:51:58", "10:17:12", "14:36:53", "21:36:38"]
+
+# etc...
 
 ```
 

data/dateless_time.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", '~> 10.0'
 
-  spec.add_development_dependency 'minitest', '~> 5.3.1'
+  spec.add_development_dependency 'minitest', '~> 5.3'
 end

data/lib/dateless_time.rb

@@ -1,4 +1,5 @@
-require "dateless_time/version"
+require 'date'
+require 'dateless_time/version'
 
 class DatelessTime
 
@@ -83,11 +84,13 @@ private
   def conditional_init(source)
     case source
     when Time   then init_with_time(source)
+    when DateTime then init_with_datetime(source)
     when String then init_with_string(source)
     when Fixnum then init_with_seconds(source)
     when Hash   then init_with_hash(source)
     when Array  then init_with_array(source)
-    else raise DatelessTime::InitializationError
+    when DatelessTime then init_with_dateless_time(source)
+    else raise DatelessTime::InitializationError, "DatelessTime objects cannot be initialized with instances of #{source.class}."
     end
   end
 
@@ -100,6 +103,14 @@ private
   end
 
 
+  def init_with_datetime(datetime)
+    @hours   = datetime.hour
+    @minutes = datetime.min
+    @seconds = datetime.sec
+    seconds_since_midnight
+  end
+
+
   def init_with_string(string)
     validate_time_string string
     data = time_string_to_array string
@@ -133,6 +144,9 @@ private
   end
 
 
+  def init_with_dateless_time(source)
+    init_with_array([source.hours, source.minutes, source.seconds])
+  end
 
 
 
@@ -179,11 +193,26 @@ private
     end
 
     ary = str.split(":").map(&:to_i)
-    ary[0] += 12 if (am_pm && am_pm == 'pm')
+    ary[0] = adjust_for_am_pm(ary[0], am_pm) if am_pm
     ary
   end
 
 
+  def adjust_for_am_pm(hour, am_pm)
+    if am_pm == 'am'
+      if hour == 12
+        hour = 0
+      end
+    elsif am_pm == 'pm'
+      if hour != 12
+        hour += 12
+      end
+    end
+    hour
+  end
+
+
+
   def validate_time_array(ary)
     if ary.empty?
       raise DatelessTime::InitializationError

data/lib/dateless_time/version.rb

@@ -1,3 +1,3 @@
 class DatelessTime
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/comparable_test.rb

@@ -107,4 +107,16 @@ class ComparableTest < Minitest::Test
     refute @t3.between?(@t1, @t2)
   end
 
+
+  def test_sort
+    @t1 = DatelessTime.new "20:45:10"
+    @t2 = DatelessTime.new "13:30:00"
+    @t3 = DatelessTime.new "9:20"
+    @t4 = DatelessTime.new "20:45:11"
+    @array = [@t1, @t2, @t3, @t4]
+
+    refute_equal @array, @array.sort
+    assert_equal [@t3, @t2, @t1, @t4], @array.sort
+  end
+
 end

data/test/creation_test.rb

@@ -26,6 +26,17 @@ class CreationTest < Minitest::Test
   end
 
 
+  def test_create_with_datetime
+    @datetime = DateTime.new 2014, 1, 1, 13, 37, 42
+    @dl_time = DatelessTime.new @datetime
+
+    assert_equal 13, @dl_time.hours
+    assert_equal 37, @dl_time.minutes
+    assert_equal 42, @dl_time.seconds
+    assert_equal (42 + (37 * 60) + (13 * 60 * 60)), @dl_time.to_i
+  end
+
+
 
   def test_create_with_string
     @dl_time = DatelessTime.new "12:13:14"
@@ -125,6 +136,26 @@ class CreationTest < Minitest::Test
     end
   end
 
+
+
+
+  def test_create_with_borderline_am
+    @dl_time = DatelessTime.new "12:13:14 am"
+    assert_equal 0, @dl_time.hours
+    assert_equal 13, @dl_time.minutes
+    assert_equal 14, @dl_time.seconds
+    assert_equal (14 + (13 * 60) + 0), @dl_time.to_i
+  end
+
+
+  def test_create_with_borderline_pm
+    @dl_time = DatelessTime.new "12:13:14 pm"
+    assert_equal 12, @dl_time.hours
+    assert_equal 13, @dl_time.minutes
+    assert_equal 14, @dl_time.seconds
+    assert_equal (14 + (13 * 60) + (12 * 60 * 60)), @dl_time.to_i
+  end
+
   
 
   def test_create_with_seconds
@@ -290,6 +321,17 @@ class CreationTest < Minitest::Test
   end
 
 
+  def test_create_with_other_dateless_time
+    @other = DatelessTime.now
+    @this  = DatelessTime.new(@other)
+
+    assert_equal @other.hours, @this.hours
+    assert_equal @other.minutes, @this.minutes
+    assert_equal @other.seconds, @this.seconds
+    assert_equal @other.to_i, @this.to_i
+  end
+
+
 
   def test_create_without_argument
     @time = Time.now

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dateless_time
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tommaso Pavese
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: '5.3'
 description: A class to handle dateless time values. DatelessTime objects are a lightweight
   alternative to Ruby's default Time class, and don't care about timezones and DST.
 email: