datet 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/datet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datet}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-15}
+  s.date = %q{2012-07-16}
   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

@@ -92,6 +92,29 @@ class Datet
       return nil
     end
     
+    #Handle nil-support.
+    all_nil = true
+    args.each do |arg|
+      if arg != 0 and arg
+        all_nil = false
+        break
+      end
+    end
+    
+    if all_nil
+      @t_nil = true
+      @t_year = 0
+      @t_month = 0
+      @t_day = 0
+      @t_hour = 0
+      @t_min = 0
+      @t_sec = 0
+      @t_usec = 0
+      return nil
+    end
+    
+    
+    #Normal date-calculation support.
     days_left = 0
     months_left = 0
     hours_left = 0
@@ -508,6 +531,17 @@ class Datet
     return diw
   end
   
+  #Returns the week-number of the year (1..53).
+  def week_no(args = nil)
+    week_no = (self.day_of_year.to_f / 7).to_i + 1
+    
+    if args and args[:mfirst] and self.day_in_week == 1
+      week_no -= 1
+    end
+    
+    return week_no
+  end
+  
   #Returns the days name as a string.
   def day_name
     return @@day_names[self.day_in_week]
@@ -553,6 +587,13 @@ class Datet
     return @t_hour
   end
   
+  #Returns the hour as an integer in the twelve-hour-clock.
+  def hour_thc
+    hour = @t_hour
+    hour -= 12 if hour > 12
+    return hour
+  end
+  
   #Returns the minute as an integer.
   def min
     return @t_min
@@ -568,6 +609,15 @@ class Datet
     return @t_usec
   end
   
+  #Returns "am" or "pm" based on the hours values.
+  def ampm
+    if @t_hour <= 12
+      return "am"
+    else
+      return "pm"
+    end
+  end
+  
   #Changes the year to the given year.
   # datet = Datet.now #=> 2014-05-03 17:46:11 +0200
   # datet.year = 2005
@@ -583,25 +633,20 @@ class Datet
   end
   
   #Returns the day in month as an integer.
-  def date
+  def day
     Thread.current[:datet_mode] = :days
     return @t_day
   end
   
-  #Changes the date to a given date.
+  #Changes the day to a given day.
   #===Examples
   # datet.time #=> 2005-05-03 17:46:11 +0200
-  # datet.date = 8
+  # datet.day = 8
   # datet.time #=> 2005-05-08 17:46:11 +0200
-  def date=(newday)
+  def day=(newday)
     newday = newday.to_i
-    
-    if newday <= 0
-      self.add_days(newday - 1)
-    else
-      @t_day = newday
-    end
-    
+    raise ArgumentError, "Invalid day: '#{newday}'." if newday < 0 or newday > self.days_in_month
+    @t_day = newday
     return self
   end
   
@@ -612,23 +657,8 @@ class Datet
   # datet.time #=> 2012-05-09 05:36:08 +0200
   def hour=(newhour)
     newhour = newhour.to_i
-    day = @t_day
-    
-    loop do
-      break if newhour >= 0
-      day += -1
-      newhour += 24
-    end
-    
-    loop do
-      break if newhour < 24
-      day += 1
-      newhour += -24
-    end
-    
+    raise ArgumentError, "Invalid hour: '#{newhour}'." if newhour < 0 or newhour > 60
     @t_hour = newhour
-    
-    self.date = day if day != @t_day
     return self
   end
   
@@ -638,7 +668,9 @@ class Datet
   # datet.min = 35
   # datet.time #=> 2012-05-09 05:35:08 +0200
   def min=(newmin)
-    @t_min = newmin.to_i
+    newmin = newmin.to_i
+    raise ArgumentError, "Invalid minute: '#{newmin}'." if newmin < 0 or newmin > 60
+    @t_min = newmin
   end
   
   #Changes the second to a given new second.
@@ -647,10 +679,17 @@ class Datet
   # datet.sec = 20
   # datet.time #=> 2012-05-09 05:35:20 +0200
   def sec=(newsec)
+    newsec = newsec.to_i
+    raise ArgumentError, "Invalid second: '#{newsec}'." if newsec < 0 or newsec > 60
     @t_sec = newsec.to_i
   end
   
-  alias :day :date
+  #Changes the usecond of the object.
+  def usec=(newusec)
+    newusec = newusec.to_i
+    raise ArgumentError, "Invalid usecond: '#{newusec}'." if newusec < 0 or newusec > 1000000
+    @t_usec = newusec
+  end
   
   #Changes the month to a given new month.
   #===Examples
@@ -659,7 +698,7 @@ class Datet
   # datet.time #=> 2012-07-09 05:35:20 +0200
   def month=(newmonth)
     newmonth = newmonth.to_i
-    raise ArgumentError, "Invalid month: '#{newmonth}'." if newmonth <= 0
+    raise ArgumentError, "Invalid month: '#{newmonth}'." if newmonth <= 0 or newmonth > 12
     @t_month = newmonth
   end
   
@@ -853,6 +892,12 @@ class Datet
     return false
   end
   
+  #Returns true if this date is a nullstamp (0000-00-00 or something like it).
+  def nullstamp?
+    return true if @t_nil
+    return false
+  end
+  
   #Returns the day of the year (0-365) as an integer.
   #===Examples
   # Datet.new.day_of_year #=> 123
@@ -1320,4 +1365,94 @@ class Datet
     
     return date_str
   end
+  
+  #See the documentation for Time#strftime. It emulates that method.
+  #This method is not complete yet and only contains some functionality.
+  def strftime(str)
+    replaces = {}
+    res = "#{str}"
+    
+    str.scan(/(%%|%(\^|)([A-z]))/) do |match|
+      #The does the functionality of actually having a '%' in the string.
+      if match[0] == "%%"
+        replaces["%%"] = "%"
+        next
+      end
+      
+      #Set up replace-hash for later replace.
+      bigsign = match[1]
+      letter = match[2]
+      
+      le = "%#{bigsign}#{letter}"
+      
+      #Skip if letter has already been set.
+      next if replaces.key?(le)
+      
+      case letter
+        when "Y"
+          replaces[le] = @t_year
+        when "m"
+          replaces[le] = "%02d" % @t_month
+        when "d"
+          replaces[le] = "%02d" % @t_day
+        when "e"
+          replaces[le] = @t_day
+        when "H"
+          replaces[le] = "%02d" % @t_hour
+        when "k"
+          replaces[le] = @t_hour
+        when "l"
+          replaces[le] = self.hour_thc
+        when "I"
+          replaces[le] = "%02d" % self.hour_thc
+        when "M"
+          replaces[le] = "%02d" % @t_min
+        when "S"
+          replaces[le] = "%02d" % @t_sec
+        when "T"
+          replaces[le] = "#{"%02d" % @t_hour}:#{"%02d" % @t_min}:#{"%02d" % @t_sec}"
+        when "R"
+          replaces[le] = "#{"%02d" % @t_hour}:#{"%02d" % @t_min}"
+        when "r"
+          replaces[le] = "#{"%02d" % self.hour_thc}:#{"%02d" % @t_min}:#{"%02d" % @t_sec} #{self.ampm.upcase}"
+        when "B"
+          replaces[le] = self.month_name
+        when "b", "h"
+          replaces[le] = self.month_name[0, 3]
+        when "j"
+          replaces[le] = self.day_of_year
+        when "A"
+          replaces[le] = self.day_name
+        when "a"
+          replaces[le] = self.day_name[0, 3]
+        when "w"
+          replaces[le] = self.day_in_week
+        when "u"
+          replaces[le] = self.day_in_week(:mfirst => true) + 1
+        when "s"
+          replaces[le] = self.to_i
+        when "p"
+          replaces[le] = self.ampm.upcase
+        when "P"
+          replaces[le] = self.ampm
+        when "V"
+          replaces[le] = self.week_no
+        when "W"
+          replaces[le] = self.week_no(:mfirst => true)
+      end
+      
+      #Replace should be uppercase.
+      if bigsign == "^" and replaces.key?(le)
+        replaces[le] = replaces[le].to_s.upcase
+      end
+    end
+    
+    #Do the actual replaces.
+    replaces.each do |key, val|
+      res = res.gsub(key, val.to_s)
+    end
+    
+    #Return the replaced string.
+    return res
+  end
 end

data/spec/datet_spec.rb

@@ -337,4 +337,122 @@ describe "Datet" do
     datet.find(:incr => :month, :wday => 5)
     raise "Expected dbstr to be '1970-05-08' but it wasnt: '#{datet.dbstr(:time => false)}'." if datet.dbstr(:time => false) != "1970-05-08"
   end
+  
+  it "should be able to calculate week numbers" do
+    tests = [
+      [Datet.new(1985, 1, 1), 1],
+      [Datet.new(1985, 12, 31), 53]
+    ]
+    tests.each do |data|
+      res = data[0].week_no
+      raise "Expected '#{data[1]}' but got '#{res}'." if res != data[1]
+    end
+  end
+  
+  it "should emulate strftime" do
+    datet = Datet.new(1985, 6, 17, 10, 30, 25)
+    
+    tests = {
+      "%Y" => 1985,
+      "%m" => "06",
+      "%d" => "17",
+      "%e" => 17,
+      "%H" => 10,
+      "%l" => 10,
+      "%I" => 10,
+      "%k" => 10,
+      "%M" => 30,
+      "%S" => 25,
+      "%T" => "10:30:25",
+      "%R" => "10:30",
+      "%r" => "10:30:25 AM",
+      "%p" => "am",
+      "%P" => "AM",
+      "%B" => "June",
+      "%^B" => "JUNE",
+      "%b" => "Jun",
+      "%h" => "Jun",
+      "%^b" => "JUN",
+      "%j" => 168,
+      "%A" => "Monday",
+      "%^A" => "MONDAY",
+      "%a" => "Mon",
+      "%^a" => "MON",
+      "%w" => 1,
+      "%s" => datet.to_i,
+      "%P" => "am",
+      "%p" => "AM",
+      "%V" => 25,
+      "%W" => 24,
+      "%%Y" => "%Y",
+      "%%%%%Y" => "%%1985",
+      "%%%%%%%%%Y" => "%%%%1985"
+    }
+    
+    tests.each do |key, val|
+      res = datet.strftime(key)
+      raise "Expected '#{val}' but got: '#{res}' for '#{key}'." if val.to_s != res
+      
+      res2 = datet.time.strftime(key)
+      raise "Expected res to be the same as time res but it wasnt: '#{res}', '#{res2}' for '#{key}'." if res != res2
+    end
+  end
+  
+  it "should handle nil-dates gently" do
+    datet = Datet.new(0, 0, 0)
+    
+    tests = [
+      [:dbstr, "0000-00-00 00:00:00"]
+    ]
+    tests.each do |data|
+      res = datet.__send__(data[0])
+      raise "Expected '#{data[1]}' but got '#{res}'." if res != data[1]
+    end
+  end
+  
+  it "should not be possible to set invalid months and dates" do
+    datet = Datet.new
+    
+    begin
+      datet.month = 14
+      raise "Should have raised error."
+    rescue ArgumentError
+      #ignore
+    end
+    
+    begin
+      datet.usec = 1000005
+      raise "Should have raised error."
+    rescue ArgumentError
+      #ignore.
+    end
+    
+    begin
+      datet.sec = 61
+      raise "Should have raised error."
+    rescue ArgumentError
+      #ignore
+    end
+    
+    begin
+      datet.min = 70
+      raise "Should have raised error."
+    rescue ArgumentError
+      #ignore.
+    end
+    
+    begin
+      datet.hour = 90
+      raise "Should have raised error."
+    rescue ArgumentError
+      #ignore.
+    end
+    
+    begin
+      datet.day = 45
+      raise "Should have raised error."
+    rescue ArgumentError
+      #ignore.
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: datet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-15 00:00:00 +02:00
+date: 2012-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3008034930327995715
+      hash: -2767607844783670018
       segments: 
       - 0
       version: "0"