dateless_time 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51230f82cbbac016a630c318ca4d61ecb5274769
-  data.tar.gz: 67fe4308f2fbd241819e1db9e23f414db0303504
+  metadata.gz: beb998e71c803edaa9cc5f5a43de996a3807d73b
+  data.tar.gz: c3518170af494b7996b1a92b46bb2503048855e0
 SHA512:
-  metadata.gz: 0c5f0995c0479b2afa745dc7a737480670cbeeacfed805d4d7d7187e88df7be93b04b0db5138107749e486c2f9c3a45f7f56b3007e6c491ce1886af4a3f2bf4f
-  data.tar.gz: aed012ec5c33de7ed5af3a79ed4acdc44b27cfbb3a178cb6286e0bde1c1e61da39a731c4eb7bafdd62a9216e76707196943d07ec7b5469d49865c2f66677b26d
+  metadata.gz: a07b4e6b283c8a966e9783a9bbdab7bc66ad5bbbb15132dbb1d0c4bad3977bbaa4e8c4daf495d20e83c936b85fb3cf26f7993122e140609443689c0f6e781121
+  data.tar.gz: 9c4e6aa1b15cbf44b3e9ba6aa18dd15270b861a3ec0140cf2bff4affd3f73eb88cc9137e06fcf7e08b520e9022f854140ec68a086d7e22c3668b50ca09665059

data/README.md

@@ -84,7 +84,7 @@ time.to_time
 # => 2014-04-01 13:37:42 +0100
 
 # but you can supply a base time object instead
-t.to_time(Time.new(1985, 10, 25, 0, 0, 0, "-08:00"))
+time.to_time(Time.new(1985, 10, 25, 0, 0, 0, "-08:00"))
 # => 1985-10-25 13:37:42 -0800
 
 time.to_time.class
@@ -104,6 +104,29 @@ time.to_a
 
 ```
 
+Comparisons:
+
+```ruby
+
+@time_1 = DatelessTime.new "11:22"
+@time_1 = 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...
+
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -143,9 +166,8 @@ end
 ## To Do
 
 
-1. include and support `Comparable` ([ruby doc](http://ruby-doc.org/core-2.1.0/Comparable.html))
-2. implement the `+` and `-` artimetic operators, in a way consistent with Ruby's `Time`
-3. nice to have: other methods from `Time`'s public interface
+1. implement the `+` and `-` artimetic operators, in a way consistent with Ruby's `Time`
+2. nice to have: other methods from `Time`'s public interface
 
 
 

data/dateless_time.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.name          = "dateless_time"
   spec.version       = DatelessTime::VERSION
   spec.author        = "Tommaso Pavese"
-  spec.description   = %q{A class to handle dateless time values.}
-  spec.summary       = %q{A class to handle dateless time values. DatelessTime objects are a lightweight alternative Ruby's default Time class, and don't care about timezones and DST.}
+  spec.description   = %q{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.}
+  spec.summary       = %q{A class to handle dateless time values.}
   spec.homepage      = "https://github.com/tompave/dateless_time"
   spec.license       = "MIT"
 

data/lib/dateless_time.rb

@@ -2,6 +2,8 @@ require "dateless_time/version"
 
 class DatelessTime
 
+  include Comparable
+
   SECONDS_IN_24_HOURS = 86400
 
   MAX_HOURS = 24
@@ -30,8 +32,8 @@ class DatelessTime
 
 
   def to_time(base = Time.now)
-    @time_value ||= Time.new(base.year, base.month, base.day,
-                        @hours, @minutes, @seconds, base.utc_offset)
+    @time_value = Time.new(base.year, base.month, base.day,
+                      @hours, @minutes, @seconds, base.utc_offset)
   rescue
     nil
   end
@@ -68,6 +70,12 @@ class DatelessTime
   end
 
 
+  def <=>(other)
+    raise TypeError unless other.is_a?(DatelessTime)
+    to_i <=> other.to_i
+  end
+
+
 
 private
 

data/lib/dateless_time/version.rb

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

data/test/comparable_test.rb

@@ -0,0 +1,110 @@
+require 'test_helper'
+
+class ComparableTest < Minitest::Test
+
+  def test_base_compare
+    @t1 = DatelessTime.new "10:30:00"
+    @t2 = DatelessTime.new "15:45:10"
+
+    assert_equal 1,  @t2 <=> @t1
+    assert_equal -1, @t1 <=> @t2
+    assert_equal 0,  @t1 <=> @t1
+  end
+
+
+  def test_base_compare_2
+    @t1 = DatelessTime.new [11, 15]
+    @t2 = DatelessTime.new [21]
+
+    assert_equal 1,  @t2 <=> @t1
+    assert_equal -1, @t1 <=> @t2
+    assert_equal 0,  @t1 <=> @t1
+  end
+
+
+  def test_less_than
+    @t1 = DatelessTime.new "10:30:00"
+    @t2 = DatelessTime.new "15:45:10"
+
+    assert @t1 < @t2
+    refute @t1 == @t2
+    refute @t2 < @t1
+    refute @t1 < @t1
+  end
+
+
+  def test_less_or_equal_to
+    @t1 = DatelessTime.new "10:30:00"
+    @t2 = DatelessTime.new "15:45:10"
+    @t3 = DatelessTime.new "10:30:00"
+
+    assert @t1 <= @t2
+    assert @t1 <= @t3
+    refute @t1 == @t2
+    assert @t1 == @t3
+    refute @t2 <= @t1
+    assert @t3 <= @t1
+  end
+
+
+  def test_greater_than
+    @t1 = DatelessTime.new "15:45:10"
+    @t2 = DatelessTime.new "10:30:00"
+
+    assert @t1 > @t2
+    refute @t1 == @t2
+    refute @t2 > @t1
+    refute @t1 > @t1
+  end
+
+
+  def test_greater_or_equal_to
+    @t1 = DatelessTime.new "15:45:10"
+    @t2 = DatelessTime.new "10:30:00"
+    @t3 = DatelessTime.new "15:45:10"
+
+    assert @t1 >= @t2
+    assert @t1 >= @t3
+    refute @t1 == @t2
+    assert @t1 == @t3
+    refute @t2 >= @t1
+    assert @t3 >= @t1
+  end
+
+
+  def test_equal_to
+    @t1 = DatelessTime.new "15:45:10"
+    @t2 = DatelessTime.new "10:30:00"
+    @t3 = DatelessTime.new "15:45:10"
+
+    refute @t1 == @t2
+    assert @t1 == @t3
+    assert @t3 == @t1
+  end
+
+
+  # != is defined on BasicObjct, not Comparable (I think)
+  # Oh, well.
+  #
+  def test_not_equal_to
+    @t1 = DatelessTime.new "15:45:10"
+    @t2 = DatelessTime.new "10:30:00"
+    @t3 = DatelessTime.new "15:45:10"
+
+    assert @t1 != @t2
+    refute @t1 != @t3
+    refute @t3 != @t1
+  end
+
+
+  def test_between
+    @t1 = DatelessTime.new "10:45:10"
+    @t2 = DatelessTime.new "13:30:00"
+    @t3 = DatelessTime.new "20:20:10"
+
+    assert @t2.between?(@t1, @t3)
+    refute @t1.between?(@t2, @t3)
+    refute @t3.between?(@t1, @t2)
+  end
+
+end

data/test/query_test.rb

@@ -27,6 +27,23 @@ class QueryTest < Minitest::Test
   end
 
 
+  def test_to_time_with_different_bases_should_change
+    @to_time = @dl_time.to_time
+    now = Time.now
+    expected = Time.new(now.year, now.month, now.day, 13, 37, 42, now.utc_offset)
+
+    assert_equal Time, @to_time.class
+    assert_equal expected, @to_time
+
+
+    base = Time.new(1990, 11, 10, 12, 13, 14)
+    @to_time = @dl_time.to_time(base)
+    
+    assert_equal Time, @to_time.class
+    assert_equal Time.new(1990, 11, 10, 13, 37, 42), @to_time
+  end
+
+
   def test_to_s
     assert_equal "13:37:42", @dl_time.to_s
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dateless_time
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tommaso Pavese
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.3.1
-description: A class to handle dateless time values.
+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: 
 executables: []
 extensions: []
@@ -66,6 +67,7 @@ files:
 - dateless_time.gemspec
 - lib/dateless_time.rb
 - lib/dateless_time/version.rb
+- test/comparable_test.rb
 - test/creation_test.rb
 - test/query_test.rb
 - test/test_helper.rb
@@ -92,9 +94,9 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A class to handle dateless time values. DatelessTime objects are a lightweight
-  alternative Ruby's default Time class, and don't care about timezones and DST.
+summary: A class to handle dateless time values.
 test_files:
+- test/comparable_test.rb
 - test/creation_test.rb
 - test/query_test.rb
 - test/test_helper.rb