datet 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/datet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datet}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-14}
+  s.date = %q{2012-07-15}
   s.description = %q{A framework for handeling date- and time-related stuff in Ruby.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

data/lib/datet.rb

@@ -47,6 +47,9 @@ class Datet
   #Thanks to ActiveSupport: http://rubydoc.info/docs/rails/2.3.8/ActiveSupport/CoreExtensions/Time/Calculations
   @@days_in_months = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
   
+  #This date is a monday. It is used to calculate up against, when we calculate 'day_in_week'.
+  @@def_date = Datet.new(1970, 1, 4)
+  
   #Initializes the object. Default is the current time. A time-object can be given.
   #=Examples
   # datet = Datet.new #=> Datet-object with the current date and time.
@@ -392,9 +395,7 @@ class Datet
   #   print "2005 is not a gregorian-leap year."
   # end
   def self.gregorian_leap?(y)
-    if Date.respond_to?(:gregorian_leap?)
-      return Date.gregorian_leap?(y)
-    elsif y % 4 == 0 && y % 100 != 0
+    if y % 4 == 0 && y % 100 != 0
       return true
     elsif y % 400 == 0
       return true
@@ -418,9 +419,34 @@ class Datet
     return @@days_in_months[month]
   end
   
-  #Returns the day in the week. Monday being 1 and sunday being 6.
+  #Returns the amount of days in the current year.
+  def days_in_year
+    return Datet.days_in_year(@t_year)
+  end
+  
+  #Returns the amount of days in the given year.
+  def self.days_in_year(year)
+    return 366 if Datet.gregorian_leap?(year)
+    return 365
+  end
+  
+  #Returns the day in the week. Monday being 0 and sunday being 6.
   def day_in_week
-    diw = self.time.strftime("%w").to_i
+    #This is a monday - 0. Use this date to calculate up against.
+    def_date = Datet.new(1970, 1, 4)
+    
+    if self > def_date
+      days = Datet.days_between(def_date, self)
+      factor = days.to_f / 7.0
+      diw = days - (factor.floor * 7)
+    else
+      days = Datet.days_between(self, def_date)
+      factor = days.to_f / 7.0
+      diw = days - (factor.floor * 7)
+      diw = 7 - diw
+      diw = 0 if diw == 7
+    end
+    
     if diw == 0
       diw = 6
     else
@@ -581,17 +607,38 @@ class Datet
     end
   end
   
+  #Turns the given argument into a new Datet-object. Helps compare datet- to time-objects.
+  #===Examples
+  # time = Datet.arg_to_time(datet) #=> <Datet>-object
+  # time = Datet.arg_to_time(Datet.now) #=> <Datet>-object
+  def self.arg_to_datet(datet)
+    if datet.is_a?(Datet)
+      return datet
+    elsif datet.is_a?(Time)
+      return Datet.new(datet)
+    else
+      raise "Could not handle object of class: '#{datet.class.name}'."
+    end
+  end
+  
+  #Make the class compareable. Also to time-objects.
   include Comparable
   def <=>(timeobj)
-    secs = Datet.arg_to_time(timeobj).to_i
+    timeobj = Datet.arg_to_datet(timeobj)
     
-    if secs > self.to_i
-      return -1
-    elsif secs < self.to_i
-      return 1
-    else
-      return 0
+    tries = [:year, :month, :day, :hour, :min, :sec, :usec]
+    tries.each do |try|
+      res1 = timeobj.__send__(try)
+      res2 = self.__send__(try)
+      
+      if res1 > res2
+        return -1
+      elsif res1 < res2
+        return 1
+      end
     end
+    
+    return 0
   end
   
   #This method is used for adding values to the object based on the current set mode.
@@ -715,10 +762,10 @@ class Datet
   # datet.time #=> 2011-08-01 22:51:11 +0200
   # datet.dbstr #=> "2011-08-01 22:51:11"
   # datet.dbstr(:time => false) #=> "2011-08-01"
-  def dbstr(args = {})
+  def dbstr(args = nil)
     str = "#{"%04d" % @t_year}-#{"%02d" % @t_month}-#{"%02d" % @t_day}"
     
-    if !args.key?(:time) or args[:time]
+    if !args or (!args.key?(:time) or args[:time])
       str << " #{"%02d" % @t_hour}:#{"%02d" % @t_min}:#{"%02d" % @t_sec}"
     end
     
@@ -749,7 +796,7 @@ class Datet
   # Datet.new.day_str(:short => true) #=> "Mon"
   def day_str(args = nil)
     ret = Datet.days_arr[self.time.strftime("%w").to_i]
-    if args.is_a?(Hash) and args[:short]
+    if args and args[:short]
       ret = ret.slice(0, 3)
     end
     
@@ -771,15 +818,26 @@ class Datet
     yot1 = t1.year
     yot2 = t2.year
     
-    if yot1 == yot2
-      days_between = doy2 - doy1
-      return days_between
+    days = 0
+    
+    #If there is a years-difference, then neutralize the first year by counting up to next year and starting from 1/1.
+    if yot1 < yot2
+      diy = Datet.days_in_year(yot1)
+      days += diy - doy1 + 1
+      doy1 = 1
+      yot1 += 1
     end
     
-    upto = 365 - doy1
-    after = doy2
+    #For each year calculate the amount of days in that year and add them to the count.
+    while yot1 < yot2
+      diy = Datet.days_in_year(yot1)
+      days += diy
+      yot1 += 1
+    end
     
-    return upto + after
+    #Last calculate the difference between the two dates and add the count to that.
+    days_between = doy2 - doy1
+    return days_between + days
   end
   
   #Returns a string based on the date and time.

data/spec/datet_spec.rb

@@ -1,5 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+#To make it gettext-compatible.
+def _(str)
+  return str
+end
+
 describe "Datet" do
   it "should have the same 'to_i' as normal time" do
     time = Time.now
@@ -173,4 +178,100 @@ describe "Datet" do
       raise "Expected result: '#{right_res}' but got: '#{res}'." if res != right_res
     end
   end
+  
+  it "should return the right leap years" do
+    tests = {
+      2006 => false,
+      2007 => false,
+      2008 => true,
+      2009 => false,
+      2010 => false,
+      2011 => false,
+      2012 => true,
+      2013 => false
+    }
+    tests.each do |year, expected_res|
+      res = Datet.gregorian_leap?(year)
+      raise "Expected #{expected_res} but got #{res}" if res != expected_res
+      
+      days_in_year = Datet.days_in_year(year)
+      if res
+        exp = 366
+      else
+        exp = 365
+      end
+      
+      raise "Expected #{exp} but got #{days_in_year}" if days_in_year != exp
+    end
+  end
+  
+  it "should be able to tell the amount of days between two dates" do
+    tests = [
+      {:d1 => Datet.new(2006, 1, 1), :d2 => Datet.new(2007, 1, 5), :days_exp => 369},
+      {:d1 => Datet.new(2008, 1, 1), :d2 => Datet.new(2009, 1, 5), :days_exp => 370},
+      {:d1 => Datet.new(2006, 1, 1), :d2 => Datet.new(2009, 1, 5), :days_exp => 1100},
+      {:d1 => Datet.new(2000, 1, 1), :d2 => Datet.new(2010, 1, 5), :days_exp => 3657}
+    ]
+    tests.each do |data|
+      days_betw = Datet.days_between(data[:d1], data[:d2])
+      raise "Expected #{data[:days_exp]} but got #{days_betw}" if days_betw != data[:days_exp]
+    end
+  end
+  
+  it "should be able to calculate the correct week days" do
+    tests = [
+      [Datet.new(1905, 1, 1), 6],
+      [Datet.new(1930, 1, 1), 2],
+      [Datet.new(1940, 1, 1), 0],
+      [Datet.new(1969, 12, 31), 2],
+      [Datet.new(2012, 7, 15), 6],
+      [Datet.new(2012, 7, 16), 0],
+      [Datet.new(2012, 7, 17), 1]
+    ]
+    tests.each do |data|
+      day_in_week = data[0].day_in_week
+      raise "Expected #{data[1]} but got #{day_in_week}" if day_in_week != data[1]
+      
+      diw = data[0].time.strftime("%w").to_i
+      if diw == 0
+        diw = 6
+      else
+        diw -= 1
+      end
+      
+      raise "Time-method didnt return the same: #{diw}, #{day_in_week}" if diw != day_in_week
+    end
+  end
+  
+  it "should be compareable" do
+    tests = [
+      [Datet.new(2012, 6, 1, 14, 1, 1), Datet.new(2010, 6, 1, 14, 1, 1)],
+      [Datet.new(2012, 6, 1, 14, 1, 1), Datet.new(2012, 5, 1, 14, 1, 1)],
+      [Datet.new(2012, 6, 2, 14, 1, 1), Datet.new(2012, 6, 1, 14, 1, 1)],
+      [Datet.new(2012, 6, 1, 14, 1, 1), Datet.new(2012, 6, 1, 13, 1, 1)]
+    ]
+    
+    tests.each do |data|
+      d1 = Datet.new(data[0])
+      d2 = Datet.new(data[1])
+      
+      res_b = data[0] > data[1]
+      res_s = data[0] < data[1]
+      res_e = data[0] == data[1]
+      
+      raise "Expected 'res_bigger' to be true but it wasnt: #{res_b}" if res_b != true
+      raise "Expected 'res_smaller' to be false but it wasnt: #{res_s}" if res_s != false
+      raise "Expected 'res_equal' to be false but it wasnt: #{res_e}" if res_e != false
+    end
+  end
+  
+  it "should be able to return day-strings" do
+    datet = Datet.new(1970, 1, 4)
+    6.times do |i|
+      day_str = datet.day_str
+      exp = Datet.days_arr[i]
+      raise "Expected '#{exp}' but got '#{day_str}' for day-no: '#{i}'." if day_str != exp
+      datet.days + 1
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: datet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-14 00:00:00 +02:00
+date: 2012-07-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4377164739836727244
+      hash: 4324212231909308806
       segments: 
       - 0
       version: "0"