datet 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/datet.gemspec

@@ -0,0 +1,63 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{datet}
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Kasper Johansen"]
+  s.date = %q{2012-07-13}
+  s.description = %q{A framework for handeling date- and time-related stuff in Ruby.}
+  s.email = %q{k@spernj.org}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "datet.gemspec",
+    "lib/datet.rb",
+    "spec/datet_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/kaspernj/datet}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{A framework for handeling date- and time-related stuff in Ruby.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/datet.rb

@@ -31,6 +31,20 @@ class Datet
     "december" => 12
   }
   
+  @@days_lcase = {
+    "monday" => 1,
+    "tuesday" => 2,
+    "wednesday" => 3,
+    "thursday" => 4,
+    "friday" => 5,
+    "saturday" => 6,
+    "sunday" => 0
+  }
+  @@days_lcase.clone.each do |key, val|
+    @@days_lcase[key[0, 3]] = val
+  end
+  
+  
   #Initializes the object. Default is the current time. A time-object can be given.
   def initialize(time = Time.now, *args)
     if time.is_a?(Time)
@@ -665,26 +679,6 @@ class Datet
     return str
   end
   
-  #Parses the date from a database-format.
-  #===Examples
-  # datet = Datet.from_dbstr("2011-08-01 22:51:11")
-  # datet.time #=> 2011-08-01 22:51:11 +0200
-  def self.from_dbstr(date_string)
-    if date_string.is_a?(Time)
-      return Datet.new(date_string)
-    elsif date_string.is_a?(Date)
-      return Datet.new(date_string.to_time)
-    end
-    
-    return false if Datet.is_nullstamp?(date_string)
-    return Datet.new(Time.local(*Date.parse(date_string.to_s)))
-  end
-  
-  #Alias for 'from_dbstr'.
-  def self.parse(str)
-    return Datet.from_dbstr(str)
-  end
-  
   #Returns true of the given stamp is a 'nullstamp'.
   #===Examples
   # Datet.is_nullstamp?("0000-00-00") #=> true
@@ -792,9 +786,13 @@ class Datet
       return Datet.new(timestr.to_time)
     elsif timestr.is_a?(Datet)
       return timestr
+    elsif Datet.is_nullstamp?(timestr)
+      return false
     end
     
-    if match = timestr.to_s.match(/^(\d+)\/(\d+) (\d+)/)
+    timestr_t = timestr.to_s.downcase.strip
+    
+    if match = timestr_t.match(/^(\d+)\/(\d+) (\d+)/)
       #MySQL date format
       timestr = timestr.gsub(match[0], "")
       date = match[1]
@@ -808,13 +806,13 @@ class Datet
         minute = match[2]
       end
       
-      return Datet.new(Time.local(year, month, date, hour, minute))
-    elsif match = timestr.to_s.match(/^(\d{1,2})\/(\d{1,2})\/(\d{4})$/)
-      return Datet.new(Time.local(match[3], match[2], match[1]))
-    elsif match = timestr.to_s.match(/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(\d{5,6})$/)
+      return Datet.new(year, month, date, hour, minute)
+    elsif match = timestr_t.match(/^(\d{1,2})\/(\d{1,2})\/(\d{4})$/)
+      return Datet.new(match[3], match[2], match[1])
+    elsif match = timestr_t.match(/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(\d{5,6})$/)
       #Datet.code format
-      return Datet.new(Time.local(match[1], match[2], match[3], match[4], match[5], match[6], match[7]))
-    elsif match = timestr.to_s.match(/^\s*(\d{4})-(\d{1,2})-(\d{1,2})(|\s+(\d{2}):(\d{2}):(\d{2})(|\.\d+)\s*)(|\s+(UTC))(|\s+(\+|\-)(\d{2})(\d{2}))$/)
+      return Datet.new(match[1], match[2], match[3], match[4], match[5], match[6], match[7])
+    elsif match = timestr_t.match(/^\s*(\d{4})-(\d{1,2})-(\d{1,2})(|\s+(\d{2}):(\d{2}):(\d{2})(|\.\d+)\s*)(|\s+(utc))(|\s+(\+|\-)(\d{2})(\d{2}))$/)
       #Database date format (with possibility of .0 in the end - microseconds? -knj.
       
       if match[11] and match[13] and match[14]
@@ -831,14 +829,19 @@ class Datet
         utc_str = nil
       end
       
-      time = Time.local(match[1].to_i, match[2].to_i, match[3].to_i, match[5].to_i, match[6].to_i, match[7].to_i, utc_str)
-      return Datet.new(time)
-    elsif match = timestr.to_s.match(/^\s*(\d{2,4})-(\d{1,2})-(\d{1,2})(|\s+(\d{1,2}):(\d{1,2}):(\d{1,2})(:(\d{1,2})|)\s*)$/)
-      time = Time.local(match[1].to_i, match[2].to_i, match[3].to_i, match[5].to_i, match[6].to_i, match[7].to_i)
-      return Datet.new(time)
+      if utc_str
+        time = Time.local(match[1].to_i, match[2].to_i, match[3].to_i, match[5].to_i, match[6].to_i, match[7].to_i, utc_str)
+        return Datet.new(time)
+      else
+        return Datet.new(match[1].to_i, match[2].to_i, match[3].to_i, match[5].to_i, match[6].to_i, match[7].to_i)
+      end
+    elsif match = timestr_t.match(/^\s*(\d{2,4})-(\d{1,2})-(\d{1,2})(|\s+(\d{1,2}):(\d{1,2}):(\d{1,2})(:(\d{1,2})|)\s*)$/)
+      return Datet.new(match[1].to_i, match[2].to_i, match[3].to_i, match[5].to_i, match[6].to_i, match[7].to_i)
+    elsif match = timestr_t.match(/^([A-z]+),\s*(\d+)\s+([A-z]+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s*([A-z]+)$/)
+      return Datet.new(match[4].to_i, Datet.month_str_to_no(match[3]), match[2].to_i, match[5].to_i, match[6].to_i, match[7].to_i)
     end
     
-    raise Knj::Errors::InvalidData.new("Wrong format: '#{timestr}', class: '#{timestr.class.name}'")
+    raise ArgumentError, "Wrong format: '#{timestr}', class: '#{timestr.class.name}'"
   end
   
   #Returns a hash with the month-no as key and month-name as value. It uses the method "_" to translate the months names. So GetText or another method has to be defined.
@@ -894,6 +897,19 @@ class Datet
     return ret
   end
   
+  #Converts a given day-name to the right day number.
+  #===Examples
+  # Datet.day_str_to_no('wed') #=> 3
+  def self.day_str_to_no(day_str)
+    day_str = day_str.to_s.strip[0, 3]
+    
+    if no = @@days_lcase[day_str]
+      return no
+    end
+    
+    raise ArgumentError, "Invalid day-string: '#{day_str}'."
+  end
+  
   #Returns the month-number for a given string (starting with 1 for january).
   #===Examples
   # Datet.month_str_to_no("JaNuArY") #=> 1
@@ -917,10 +933,6 @@ class Datet
     return _(self.time.strftime("%B"))
   end
   
-  def to_s
-    return self.time.to_s
-  end
-  
   #This returns a code-string that can be used to recreate the Datet-object.
   #===Examples
   # code = datet.code #=> "1985061710000000000"
@@ -931,13 +943,18 @@ class Datet
   
   #Returns the unix timestamp for this object.
   #===Examples
-  # datet.unixt #=> 487843200
   # datet.to_i #=> 487843200
-  def unixt
+  def to_i
     return self.time.to_i
   end
   
-  alias :to_i :unixt
+  def to_f
+    return self.time_to_f
+  end
+  
+  def to_s
+    return self.time.to_s
+  end
   
   #Returns the HTTP-date that can be used in headers and such.
   #===Examples

data/spec/datet_spec.rb

@@ -35,6 +35,7 @@ describe "Datet" do
   
   #From "knjrbfw_spec.rb".
   it "should be able to parse various date formats." do
+    date = Datet.in("Wed, 13 Jul 2011 16:08:51 GMT")
     date = Datet.in("2011-07-09 00:00:00 UTC")
     date = Datet.in("1985-06-17 01:00:00")
     date = Datet.in("1985-06-17")
@@ -100,4 +101,28 @@ describe "Datet" do
     datet = Datet.new(1985, 6, 17, 28, 68, 68, 68)
     raise "Expected dbstr to be '1985-06-18 05:09:09' but it wasnt: '#{datet.dbstr}'." if datet.dbstr != "1985-06-18 05:09:09"
   end
+  
+  it "should be able to convert day-strings into numbers" do
+    tests = {
+      "mon" => 1,
+      "tue" => 2,
+      "wed" => 3,
+      "thu" => 4,
+      "fri" => 5,
+      "sat" => 6,
+      "sun" => 0,
+      "monda" => 1,
+      "tuesday" => 2,
+      "wednes" => 3,
+      "thursd" => 4,
+      "frida" => 5,
+      "satur" => 6,
+      "sunday" => 0
+    }
+    
+    tests.each do |test_str, right_res|
+      res = Datet.day_str_to_no(test_str)
+      raise "Expected result: '#{right_res}' but got: '#{res}'." if res != right_res
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: datet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 +02:00
+date: 2012-07-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- datet.gemspec
 - lib/datet.rb
 - spec/datet_spec.rb
 - spec/spec_helper.rb
@@ -103,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2695017267078872396
+      hash: 1674875228102623763
       segments: 
       - 0
       version: "0"