date_tools 0.0.2 → 0.1.0

data/lib/date_tools/date_time_compare.rb

@@ -34,6 +34,9 @@ class Time
   
   #Build a string with number of days, hours ... for the given seconds.
   #Only positive seconds allowed.
+  #
+  #Example:
+  #  Time.sec2time( 16000 ) => "0d 4h 26m 40s"
   def self.sec2time( sec )
     raise "No negative time" if sec < 0
     days, sec = sec.divmod(86400)  # 60*60*24

data/unittest/test_date_creator.rb

@@ -1,3 +1,4 @@
+gem 'test-unit'
 require 'test/unit'
 require '../lib/date_tools/date_creator'
 

data/unittest/test_date_locale.rb

@@ -1,225 +1,132 @@
+#encoding: utf-8
+gem 'test-unit'
 require 'test/unit'
-require '../lib/date_tools/date_locale'
+$:.unshift('../lib') if $0 == __FILE__
+require 'date_tools/date_locale'
 
-#Here you can play with locales.
-#Please run the tests with and without locale.
-#~ require 'locale'
-#~ Locale.current = 'en'
-#~ Locale.current = 'fr'
+require 'yaml'
 
 class Test_Date_locale < Test::Unit::TestCase
-  def test_locale_encoding
-    return unless defined? Locale
-      #~ assert_equal( 'de', Locale.current.language )    #changing during tests
-      assert_equal( 'CP1252', Locale.current.charset )    
-  end
-  def test_DATE_TEXTS
-    
-    assert_kind_of(Hash, Date_locale::DATE_TEXTS)
+  
+  #~ puts Date_locale::DATE_TEXTS.to_yaml  
+  #~ puts Date.new(2012,1,1).strftime("%A")
+  
+  DateTools::Mixin::DATE_TEXTS.each{|lang, langdata |
+    langdata = langdata['date']
     
-    Date_locale::DATE_TEXTS.each{|lang, langdata |
-      assert_kind_of(Symbol, lang)
+    define_method :"test_#{lang}" do
+      assert_kind_of(String, lang)
       assert_kind_of(Hash, langdata)
       assert_equal(4, langdata.keys.size)
       #test not possibe, different orders in Hash key.
-      #~ assert_equal([:abbr_daynames, :monthnames, :abbr_monthnames, :daynames], langdata.keys)
+      #~ assert_equal([:monthnames, :abbr_daynames, :monthnames, :abbr_monthnames, :daynames], langdata.keys)
       
-      assert_equal( 7, langdata[:abbr_daynames].size, "check language #{lang}")
-      assert_equal( 7, langdata[:daynames].size, "check language #{lang}")
-      assert_equal( 13, langdata[:abbr_monthnames].size, "check language #{lang}")
-      assert_equal( 13, langdata[:monthnames].size, "check language #{lang}")
-      assert_nil( langdata[:abbr_monthnames].first, "check language #{lang}")
-      assert_nil( langdata[:monthnames].first, "check language #{lang}")
+      assert_equal( 7, langdata['abbr_day_names'].size, "check language #{lang}")
+      assert_equal( 7, langdata['day_names'].size, "check language #{lang}")
+      assert_equal( 13, langdata['abbr_month_names'].size, "check language #{lang}")
+      assert_equal( 13, langdata['month_names'].size, "check language #{lang}")
+      assert_nil( langdata['abbr_month_names'].first, "check language #{lang}")
+      assert_nil( langdata['month_names'].first, "check language #{lang}")
       
-    }
-    
-  end #test_DATE_TEXTS
-end #Test_Date_locale < Test::Unit::TestCase
-  
-  
-  
-class Test_Date < Test::Unit::TestCase
-  
-  TESTSTRING = '%A %a %B (%b)'
-  def test_default_en()
-    
-    Locale.current = 'en' if defined? Locale
-    if defined? Locale
-      assert_equal( 'en', Locale.current.language )
+      1.upto(12){|mon|
+        assert_equal( langdata['abbr_month_names'][mon], Date.new(2012,mon,1).strftime("%b", lang))
+        assert_equal( langdata['month_names'][mon], Date.new(2012,mon,1).strftime("%B", lang))
+      }
+      #Test sunday
+      assert_equal( langdata['day_names'][0], Date.new(2013,1,6).strftime("%A", lang))
+      assert_equal( langdata['abbr_day_names'][0], Date.new(2013,1,6).strftime("%a", lang))
+      7.upto(12){|day|
+        assert_equal( langdata['day_names'][day-6], Date.new(2013,1,day).strftime("%A", lang))
+        assert_equal( langdata['abbr_day_names'][day-6], Date.new(2013,1,day).strftime("%a", lang))
+      }
     end
-    
-    d = Date.new(2009,10,21)
-    assert_equal( 'Wednesday {Wed} {Wednesday} {42}  3', d.strftime('%A {%a} {%A} {%W}  %w'))
-    assert_equal( 'Wednesday (Wed)', d.strftime('%A (%a)'))
-    assert_equal( 'October (Oct)',   d.strftime('%B (%b)'))
-  end
-
-  #Check the defined lanuages.
-  def test_defined()
-    assert_not_nil( Date_locale.locale?(:de))
-    assert_not_nil( Date_locale.locale?(:de_at))
-    assert_not_nil( Date_locale.locale?(:en))
-    assert_not_nil( Date_locale.locale?(:fr))
-  end 
+  }
   
-  def test_undefined()
-    assert_nil( Date_locale.locale?(:xx))
+  def test_get_language_key
+    assert_equal( 'en', DateTools::Mixin.get_language_key('en'))
+    assert_equal( 'en', DateTools::Mixin.get_language_key('EN'))
+    assert_equal( 'en', DateTools::Mixin.get_language_key(:en))
+    assert_equal( 'en_us', DateTools::Mixin.get_language_key('en-us'))
     
-    d = Date.new(2009,10,21)
-    assert_raise( RuntimeError ){ d.strftime('%A {%a} {%A} {%W}  %w', :xx) }
-  end
-
-  def test_en()
-    d = Date.new(2009,10,21)
-    
-    assert_equal( 'Wednesday (Wed)', d.strftime('%A (%a)', :en))
-    assert_equal( 'October (Oct)',   d.strftime('%B (%b)', :en))
-    assert_equal( 'Wednesday {Wed} {Wednesday} {42}  3', d.strftime('%A {%a} {%A} {%W}  %w', :en))
-    
-    Locale.current = 'en' if defined? Locale
-    if defined? Locale  and Locale.current.language == 'en'
-      assert_equal( 'en', Locale.current.language )    
-      assert_equal( d.strftime('%A (%a)'), d.strftime('%A (%a)', :en))
-      assert_equal( d.strftime('%B (%b)'),   d.strftime('%B (%b)', :en))    
-      assert_equal( d.strftime('%A {%a} {%A} {%W}  %w'), d.strftime('%A {%a} {%A} {%W}  %w', :en))
-    end
+    assert_equal( 'de', DateTools::Mixin.get_language_key('de'))
+    assert_equal( 'de', DateTools::Mixin.get_language_key('de_de'))
+    assert_equal( 'de', DateTools::Mixin.get_language_key(:de))
     
+    assert_equal( 'de_at', DateTools::Mixin.get_language_key('de-at'))
   end
 
-  def test_de()
-    d = Date.new(2009,10,21)
-    
-    assert_equal( 'Mittwoch (Mi)', d.strftime('%A (%a)', :de))
-    assert_equal( 'Oktober (Okt)', d.strftime('%B (%b)', :de))
-
-    Locale.current = 'de' if defined? Locale
-    if defined? Locale  and Locale.current.language == 'de'
-      assert_equal( 'de', Locale.current.language )    
-      assert_equal( d.strftime('%A (%a)'), d.strftime('%A (%a)', :de))
-      assert_equal( d.strftime('%B (%b)'),   d.strftime('%B (%b)', :de))    
-      assert_equal( d.strftime('%A {%a} {%A} {%W}  %w'), d.strftime('%A {%a} {%A} {%W}  %w', :de))
-    end
 
-  end
+end #Test_Date_locale < Test::Unit::TestCase
 
-  def test_de_umlaut()
-    d = Date.new(2009,3,21)
-    #Set automatic.
-    #~ Date_locale.set_target_encoding( 'iso-8859-1')
-    
-    assert_equal( 'Samstag (Sa)', d.strftime('%A (%a)', :de))
-    if defined? Locale
-      assert_equal( 'M�rz (Mrz)', d.strftime('%B (%b)', :de))
-    else
-      assert_equal( 'März (Mrz)', d.strftime('%B (%b)', :de))
+class Test_en < Test::Unit::TestCase
+    def setup
+      @locale = 'en'  
     end
-
-    Locale.current = 'de' if defined? Locale
-    if defined? Locale  and Locale.current.language == 'de'
-      assert_equal( 'de', Locale.current.language )    
-      assert_equal( d.strftime('%A (%a)'), d.strftime('%A (%a)', :de))
-      assert_equal( d.strftime('%B (%b)'),   d.strftime('%B (%b)', :de))    
-      assert_equal( d.strftime('%A {%a} {%A} {%W}  %w'), d.strftime('%A {%a} {%A} {%W}  %w', :de))
+    def test_jan()
+      assert_equal('January - Sunday', Date.new(2012,1,1).strftime('%B - %A', @locale))
     end
-
-  end
-  
-  def test_de_locale()
-    return unless defined? Locale
-    
-    #Get a German locale
-    #?How to define it??
-    Locale.current = 'de'
-    loc_de = Locale.current
-    Locale.current = 'en' #set back english
-    loc_en   = Locale.current
-    
-    d = Date.new(2009,10,21)
-    assert_equal( 'Mittwoch (Mi)', d.strftime('%A (%a)', loc_de ))
-    assert_equal( 'Wednesday (Wed)', d.strftime('%A (%a)', loc_en ))
-
-
-  end
-
-end #Test_Date
-
-class Test_DateTime < Test::Unit::TestCase
-  
-  TESTSTRING = '%A %a %B (%b)'
-  def test_default_en()
-    Locale.current = 'en' if defined? Locale
-    if defined? Locale
-      assert_equal( 'en', Locale.current.language )
+    def test_march()
+      assert_equal('March - Thursday', Date.new(2012,3,1).strftime('%B - %A', @locale))
     end
-    
-    1.upto(12){|m|
-      1.upto(7){|day| #first week (=all day names)
-      d   = Date.new(2009,m,day)
-      dt  = DateTime.new(2009,m, day)    
-      assert_equal( dt.strftime(TESTSTRING),   d.strftime(TESTSTRING))
-    }}
-  end
+end
 
-  def test_en()    
-    1.upto(12){|m|
-      1.upto(7){|day| #first week (=all day names)
-      d   = Date.new(2009,m,day)
-      dt  = DateTime.new(2009,m, day)    
-      assert_equal( dt.strftime(TESTSTRING, :en),   d.strftime(TESTSTRING, :en))
-    }}
-  end
+class Test_en_US < Test::Unit::TestCase
+    def setup
+      @locale = 'en-us'  
+    end
+    def test_jan()
+      assert_equal('January - Sunday', Date.new(2012,1,1).strftime('%B - %A', @locale))
+    end
+    def test_march()
+      assert_equal('March - Thursday', Date.new(2012,3,1).strftime('%B - %A', @locale))
+    end
+end
 
-  def test_de()    
-    1.upto(12){|m|
-      1.upto(7){|day| #first week (=all day names)
-      d   = Date.new(2009,m,day)
-      dt  = DateTime.new(2009,m, day)    
-      assert_equal( dt.strftime(TESTSTRING, :de),   d.strftime(TESTSTRING, :de))
-    }}
-  end
-end #Test_DateTime
+class Test_de < Test::Unit::TestCase
+    def setup
+      @locale = 'de'  
+    end
+    def test_jan()
+      assert_equal('Januar - Sonntag', Date.new(2012,1,1).strftime('%B - %A', @locale))
+    end
+    def test_march()
+      assert_equal('März - Donnerstag', Date.new(2012,3,1).strftime('%B - %A', @locale))
+    end
+end
 
-class Test_Time < Test::Unit::TestCase
-  
-  def test_default()
-    t = Time.local(2009,10,21)
-    
-    Locale.current = 'en' if defined? Locale
-    if defined? Locale  and Locale.current.language == 'en'
-      assert_equal( 'en', Locale.current.language )    
-      assert_equal( 'Wednesday {Wed} {Wednesday} {42}  3', t.strftime('%A {%a} {%A} {%W}  %w'))
-      assert_equal( 'Wednesday (Wed)', t.strftime('%A (%a)'))
-      assert_equal( 'October (Oct)',   t.strftime('%B (%b)'))
+class Test_de_de < Test::Unit::TestCase
+    def setup
+      @locale = 'de-de'  
     end
-  end
+    def test_jan()
+      assert_equal('Januar - Sonntag', Date.new(2012,1,1).strftime('%B - %A', @locale))
+    end
+    def test_march()
+      assert_equal('März - Donnerstag', Date.new(2012,3,1).strftime('%B - %A', @locale))
+    end
+end
 
-  def test_en()
-    t = Time.local(2009,10,21)
-    assert_equal( 'Wednesday (Wed)', t.strftime('%A (%a)', :en))
-    assert_equal( 'October (Oct)',   t.strftime('%B (%b)', :en))
-    assert_equal( 'Wednesday {Wed} {Wednesday} {42}  3', t.strftime('%A {%a} {%A} {%W}  %w', :en))
-    
-    Locale.current = 'en' if defined? Locale
-    if defined? Locale  and Locale.current.language == 'en'
-      assert_equal( 'en', Locale.current.language )
-      assert_equal( t.strftime('%A (%a)'), t.strftime('%A (%a)', :en))
-      assert_equal( t.strftime('%B (%b)'), t.strftime('%B (%b)', :en))    
-      assert_equal( t.strftime('%A {%a} {%A} {%W}  %w'), t.strftime('%A {%a} {%A} {%W}  %w', :en))
+class Test_de_at < Test::Unit::TestCase
+    def setup
+      @locale = 'de-at'  
     end
-  end
+    def test_jan()
+      assert_equal('Jänner - Sonntag', Date.new(2012,1,1).strftime('%B - %A', @locale))
+    end
+    def test_feb()
+      #No Feber, see http://german.stackexchange.com/questions/5916/wie-ublich-ist-feber-in-osterreich/5917#5917
+      assert_equal('Februar - Freitag', Date.new(2013,2,1).strftime('%B - %A', @locale))
+    end
+    def test_march()
+      assert_equal('März - Donnerstag', Date.new(2012,3,1).strftime('%B - %A', @locale))
+    end
+end
 
-  def test_de()
-    t = Time.local(2009,10,21)    
-    assert_equal( 'Mittwoch (Mi)', t.strftime('%A (%a)', :de))
-    assert_equal( 'Oktober (Okt)', t.strftime('%B (%b)', :de))
-    
-    Locale.current = 'de' if defined? Locale
-    if defined? Locale  and Locale.current.language == 'de'
-      assert_equal( 'de', Locale.current.language )    
-      assert_equal( t.strftime('%A (%a)'), t.strftime('%A (%a)', :de))
-      assert_equal( t.strftime('%B (%b)'),   t.strftime('%B (%b)', :de))    
-      assert_equal( t.strftime('%A {%a} {%A} {%W}  %w'), t.strftime('%A {%a} {%A} {%W}  %w', :de))
+class Test_lt < Test::Unit::TestCase
+    def setup
+      @locale = 'lt'  
     end
-    
-  end
-end #Test_Time
+    def test_jan()
+      assert_equal('sausis - sekmadienis', Date.new(2012,1,1).strftime('%B - %A', @locale))
+    end
+end

data/unittest/test_date_locale_loaded.rb

@@ -0,0 +1,113 @@
+#encoding: utf-8
+gem 'test-unit'
+require 'test/unit'
+
+#Version 2.0.5 had problems with ruby 1.9
+gem 'locale', '~> 2.0.8' 
+require 'locale'
+
+$:.unshift('../lib') if $0 == __FILE__
+require 'date_tools/date_locale'
+
+
+#~ puts Locale::VERSION #=> 2.0.5
+#~ Locale.current = 'en'  #danach funktionierts
+#~ p Locale.current
+#~ puts RUBY_VERSION
+
+#~ Locale.current = 'en'
+#~ Locale.current = 'fr'
+
+if $0 == __FILE__
+  $:.unshift('../lib') 
+  $:.unshift('.')
+end
+
+#~ require 'test_date_locale_old'
+
+class Test_en < Test::Unit::TestCase
+    def setup
+      Locale.current = 'en'  
+    end
+    def test_locale()
+      assert_equal('en', Locale.current.to_s)
+      assert_equal('en', Locale.current.language.to_s)
+      assert_equal('en', DateTools::Mixin.get_language_key)
+    end
+    def test_jan()
+      assert_equal('January - Sunday', Date.new(2012,1,1).strftime('%B - %A'))
+    end
+    def test_march()
+      assert_equal('March - Thursday', Date.new(2012,3,1).strftime('%B - %A'))
+    end
+end
+
+class Test_en_US < Test::Unit::TestCase
+    def setup
+      Locale.current = 'en-us'  
+    end
+    def test_locale()
+      assert_equal('en_US', Locale.current.to_s)
+      assert_equal('en', Locale.current.language.to_s)
+      assert_equal('en_us', DateTools::Mixin.get_language_key)
+    end
+    def test_jan()
+      assert_equal('January - Sunday', Date.new(2012,1,1).strftime('%B - %A'))
+    end
+    def test_march()
+      assert_equal('March - Thursday', Date.new(2012,3,1).strftime('%B - %A'))
+    end
+end
+
+class Test_de < Test::Unit::TestCase
+    def setup
+      Locale.current = 'de'  
+    end
+    def test_locale()
+      assert_equal('de', Locale.current.to_s)
+      assert_equal('de', Locale.current.language.to_s)
+    end
+    def test_jan()
+      assert_equal('Januar - Sonntag', Date.new(2012,1,1).strftime('%B - %A'))
+    end
+    def test_march()
+      assert_equal('März - Donnerstag', Date.new(2012,3,1).strftime('%B - %A'))
+    end
+end
+
+class Test_de_de < Test::Unit::TestCase
+    def setup
+      Locale.current = 'de-de'  
+    end
+    def test_locale()
+      assert_equal('de_DE', Locale.current.to_s)
+      assert_equal('de', Locale.current.language.to_s)
+      assert_equal('de', DateTools::Mixin.get_language_key)
+    end
+    def test_jan()
+      assert_equal('Januar - Sonntag', Date.new(2012,1,1).strftime('%B - %A'))
+    end
+    def test_march()
+      assert_equal('März - Donnerstag', Date.new(2012,3,1).strftime('%B - %A'))
+    end
+end
+
+class Test_de_at < Test::Unit::TestCase
+    def setup
+      Locale.current = 'de-at'  
+    end
+    def test_locale()
+      assert_equal('de_AT', Locale.current.to_s)
+      assert_equal('de', Locale.current.language.to_s)
+      assert_equal('de_at', DateTools::Mixin.get_language_key)
+    end
+    def test_jan()
+      assert_equal('Jänner - Sonntag', Date.new(2012,1,1).strftime('%B - %A'))
+    end
+    def test_feb()
+      assert_equal('Februar - Mittwoch', Date.new(2012,2,1).strftime('%B - %A'))
+    end
+    def test_march()
+      assert_equal('März - Donnerstag', Date.new(2012,3,1).strftime('%B - %A'))
+    end
+end