units-time 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd753e92ae05a7b8124067b1530096616392cb33
-  data.tar.gz: 16ded8e6519cdc289e8ea6f452a7e985571ac602
+  metadata.gz: 76fe6741c76332996673e18c6d299f1fa85dc014
+  data.tar.gz: b7c77366854058091dd6223196cfdb63950269b9
 SHA512:
-  metadata.gz: d2e4132b9194102097f6ebcfbf1c78145f6467965c19df49d30b61808b5732a168c38e00af35a371af8357d34bc730568be7bf628c87f075d276851098d4ea65
-  data.tar.gz: 0c3f079769f959f77f58913f79396a87bbbed7032b5fe435933f7ac6e3c3fc715fd91352412d3afca32362d56025f745d72052f7b0cdb75ffd8120650bce5113
+  metadata.gz: 074f4a4717ef00dd8023f4daa8dbe1760aa7caaf6dc056bf825cccd2c2c2dde311ca8d5e4761e888da96b8750f6d0c5f37644a2c4fb9ad2992f64c78f25d4ee4
+  data.tar.gz: df29e7ca34b97c40740e8e6fb450224c46f1a9cf1a6f92d6b4b483a6f15b2c65ebd6852f196e9f67c4ed64223910ac6ac0be69400447c87ead00d3ee24ec2cd8

data/Manifest.txt

@@ -4,6 +4,8 @@ Manifest.txt
 README.md
 Rakefile
 lib/units-time.rb
+lib/units-time/timedelta.rb
+lib/units-time/timestamp.rb
 lib/units-time/version.rb
 test/helper.rb
 test/test_units_time.rb

data/lib/units-time/timedelta.rb

@@ -0,0 +1,92 @@
+# encoding: utf-8
+
+
+class Timedelta
+
+  attr_reader :seconds
+
+  def initialize( seconds=0 )
+    @seconds = seconds
+  end
+
+
+  def ==( other )
+    if other.is_a?( self.class )
+      @seconds == other.seconds
+    else
+      false
+    end
+  end
+  alias_method :eql?, :==
+
+  def *( other )
+    if other.is_a?( Integer )
+      self.class.new( @seconds * other )
+    else
+      raise TypeError.new( "[Timedelta] mul(tiplication) - wrong type >#{other.inspect}< #{other.class.name} - integer number expected" )
+    end
+  end
+
+  def +( other )
+    if other.is_a?( self.class )
+      self.class.new( @seconds + other.seconds )
+    else
+      raise TypeError.new( "[Timedelta] add(ition) - wrong type >#{other.inspect}< #{other.class.name} - Timedelta expected" )
+    end
+  end
+
+  def -( other )
+    if other.is_a?( self.class )
+      self.class.new( @seconds - other.seconds )
+    else
+      raise TypeError.new( "[Timedelta] sub(straction) - wrong type >#{other.inspect}< #{other.class.name} - Timedelta expected" )
+    end
+  end
+
+
+  ### for details on coerce
+  ##   see https://blog.dnsimple.com/2017/01/ruby-coercion-protocols-part-2/
+  ##   and http://wiki.c2.com/?RubyCoerce
+  ##
+  ## note: just switch left and right will NOT work with subtraction
+  ##   e.g. 2+3.seconds  == 3.seconds+2  BUT
+  ##        2-3.seconds  != 3.seconds-2  !!!!!
+
+  ## note: safe integer used for coerce dispatch
+  class SafeInteger
+    def initialize( value )
+      @value = value
+    end
+    ## it's safe to swap left and right for multiplication (it's communicative)
+    def *( other ) other.*( @value ); end
+  end
+
+  def coerce( other )
+    if other.is_a?( Integer )
+      [SafeInteger.new(other), self]
+    else
+      raise TypeError.new( "[Timedelta] coerce - wrong type >#{other.inspect}< #{other.class.name} - Integer number expected" )
+    end
+  end
+
+
+  include Comparable
+
+  def <=>( other )
+    if other.is_a?( self.class )
+      @seconds <=> other.seconds
+    else
+      raise TypeError.new( "[Timedelta] <=> - wrong type >#{other.inspect}< #{other.class.name} - Timedelta expected" )
+    end
+  end
+
+
+  ## todo/fix: always freeze by default (timedelta is immutable) - why? why not?
+  def self.zero()  @@zero ||= new(0).freeze; end
+
+  alias_method :to_i,   :seconds     ## add to integer conversion - why? why not?
+  alias_method :to_int, :seconds
+  ## note: same as:
+  ##  def to_i()   @seconds; end    ## add to integer conversion - why? why not?
+  ##  def to_int() @seconds; end
+end # class Timedelta

data/lib/units-time/timestamp.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+
+
+class Timestamp
+
+  def self.now() new( Time.now.to_i ); end
+
+  attr_reader :seconds
+
+  def initialize( seconds=Time.now.to_i )
+    @seconds = seconds    ## seconds since Jan 1st, 1970 (unix epoch time)
+  end
+
+  def ==( other )
+    if other.is_a?( self.class )
+      @seconds == other.seconds
+    else
+      false
+    end
+  end
+  alias_method :eql?, :==
+
+  def +( other )
+    if other.is_a?( Timedelta )
+      self.class.new( @seconds + other.seconds )
+    else
+      raise TypeError.new( "[Timestamp] add(ition) - wrong type >#{other.inspect}< #{other.class.name} - Timedelta expected" )
+    end
+  end
+
+  def -( other )
+    if other.is_a?( Timedelta )
+      self.class.new( @seconds - other.seconds )
+    else
+      raise TypeError.new( "[Timestamp] sub(straction) - wrong type >#{other.inspect}< #{other.class.name} - Timedelta expected" )
+    end
+  end
+
+
+  include Comparable
+
+  def <=>( other )
+    if other.is_a?( self.class )
+      @seconds <=> other.seconds
+    else
+      raise TypeError.new( "[Timestamp] <=> - wrong type >#{other.inspect}< #{other.class.name} - Timestamp expected" )
+    end
+  end
+
+
+  ## todo/fix: always freeze by default (timestamp is immutable) - why? why not?
+  def self.zero()  @@zero ||= new(0).freeze; end
+
+  alias_method :to_i,   :seconds     ## add to integer conversion - why? why not?
+  alias_method :to_int, :seconds
+end  ## class Timestamp

data/lib/units-time/version.rb

@@ -4,7 +4,7 @@ module UnitsTime
 
   MAJOR = 1
   MINOR = 0
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/units-time.rb

@@ -7,6 +7,8 @@ require 'time'
 
 ## our own code
 require 'units-time/version'    # note: let version always go first
+require 'units-time/timestamp'
+require 'units-time/timedelta'
 
 
 
@@ -18,155 +20,6 @@ require 'units-time/version'    # note: let version always go first
 #    - you CAN only compare (<=>) timestamp to timestamp but NOT timedelta !!
 #    - you CAN only compare (<=>) timedelta to timedelta but NOT timestamp !!
 
-class Timestamp
-
-  def self.now() new( Time.now.to_i ); end
-
-  attr_reader :seconds
-
-  def initialize( seconds=Time.now.to_i )
-    @seconds = seconds    ## seconds since Jan 1st, 1970 (unix epoch time)
-  end
-
-  def ==( other )
-    if other.is_a?( self.class )
-      @seconds == other.seconds
-    else
-      ## note: allow for now integer comparision too - why? why not?
-      if other.is_a?( Integer )
-        @seconds == other
-      else
-        false
-      end
-    end
-  end
-  alias_method :eql?, :==
-
-  def +( other )
-    if other.is_a?( Timedelta )
-      self.class.new( @seconds + other.seconds )
-    else
-      ## fix/todo: use TypeError!!!!
-      raise ArgumentError.new( "[Timestamp] add(ition) - wrong type #{other.inspect} - Timedelta expected" )
-    end
-  end
-
-  def -( other )
-    if other.is_a?( Timedelta )
-      self.class.new( @seconds - other.seconds )
-    else
-      ## fix/todo: use TypeError!!!!
-      raise ArgumentError.new( "[Timestamp] sub(straction) - wrong type #{other.inspect} - Timedelta expected" )
-    end
-  end
-
-
-  include Comparable
-
-  def <=>( other )
-    if other.is_a?( self.class )
-      @seconds <=> other.seconds
-    else
-      ## fix/todo: use TypeError!!!!
-      raise ArgumentError.new( "[Timestamp] <=> - wrong type #{other.inspect} - Timestamp expected" )
-    end
-  end
-
-
-  ## todo/fix: always freeze by default (timestamp is immutable) - why? why not?
-  def self.zero()  @@zero ||= new(0).freeze; end
-
-  alias_method :to_i,   :seconds     ## add to integer conversion - why? why not?
-  alias_method :to_int, :seconds
-end  ## class Timestamp
-
-
-
-class Timedelta
-
-  attr_reader :seconds
-
-  def initialize( seconds=0 )
-    @seconds = seconds
-  end
-
-
-  def ==( other )
-    if other.is_a?( self.class )
-      @seconds == other.seconds
-    else
-      ## note: allow for now integer comparision too - why? why not?
-      if other.is_a?( Integer )
-        @seconds == other
-      else
-        false
-      end
-    end
-  end
-  alias_method :eql?, :==
-
-  def *( other )
-    if other.is_a?( Integer )
-      self.class.new( @seconds * other )
-    else
-      ## fix/todo: use TypeError!!!!
-      raise ArgumentError.new( "[Timedelta] mul(tiplication) - wrong type #{other.inspect} - integer number expected" )
-    end
-  end
-
-  def +( other )
-    if other.is_a?( self.class )
-      self.class.new( @seconds + other.seconds )
-    else
-      ## fix/todo: use TypeError!!!!
-      raise ArgumentError.new( "[Timedelta] add(ition) - wrong type #{other.inspect} - Timedelta expected" )
-    end
-  end
-
-  def -( other )
-    if other.is_a?( self.class )
-      self.class.new( @seconds - other.seconds )
-    else
-      ## fix/todo: use TypeError!!!!
-      raise ArgumentError.new( "[Timedelta] sub(straction) - wrong type #{other.inspect} - Timedelta expected" )
-    end
-  end
-
-
-  ### for details on coerce
-  ##   see https://blog.dnsimple.com/2017/01/ruby-coercion-protocols-part-2/
-  def coerce( other )
-    if other.is_a?( Integer )
-      [self, other]    ## allow communitative - switch left and right e.g. 365*24.hours to 24.hours*365
-    else
-      ## fix/todo: use TypeError!!!!
-      raise ArgumentError.new( "[Timedelta] coerce - wrong type #{other.inspect} - Integer number expected" )
-    end
-  end
-
-
-  include Comparable
-
-  def <=>( other )
-    if other.is_a?( self.class )
-      @seconds <=> other.seconds
-    else
-      ## fix/todo: use TypeError!!!!
-      raise ArgumentError.new( "[Timedelta] <=> - wrong type #{other.inspect} - Timedelta expected" )
-    end
-  end
-
-
-  ## todo/fix: always freeze by default (timedelta is immutable) - why? why not?
-  def self.zero()  @@zero ||= new(0).freeze; end
-
-  alias_method :to_i,   :seconds     ## add to integer conversion - why? why not?
-  alias_method :to_int, :seconds
-  ## note: same as:
-  ##  def to_i()   @seconds; end    ## add to integer conversion - why? why not?
-  ##  def to_int() @seconds; end
-end # class Timedelta
-
 
 ### "global" converter functions use like
 ##    Timestamp(0)  or Timedelta(0)

data/test/test_units_time.rb

@@ -13,7 +13,7 @@ class TestUnitsTime < MiniTest::Test
 def test_timstamp
   now = Timestamp.now
 
-  assert_equal now.to_i, now
+  assert_equal Timestamp.new( now.to_i ), now
 
   assert_equal now+31_536_000.secs,  now+1.year
   assert_equal now+1_209_600.secs,   now+1.fortnight

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: units-time
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gerald Bauer
@@ -55,6 +55,8 @@ files:
 - README.md
 - Rakefile
 - lib/units-time.rb
+- lib/units-time/timedelta.rb
+- lib/units-time/timestamp.rb
 - lib/units-time/version.rb
 - test/helper.rb
 - test/test_units_time.rb