mdemare-like_time 0.1.4 → 0.1.5

data/README

@@ -0,0 +1,44 @@
+Uses a natural format to specify a date/time format, by using a reference date/time.
+This time is Sunday, December 31 1999, 23:59 UTC, or Sun 12-31-99 11:59 PM.
+Capitalization of months/weekdays will match that in template.
+The following subset of strftime is supported:
+- Year long (1999)
+- Year short (99)
+- Month long (december)
+- Month short (dec)
+- Month numeric (12)
+- Yearday (366)
+- Date (31)
+- Weekday long (Sunday)
+- Weekday short (Sun)
+- Weekday very short (Su)
+- Hour, 24-hour clock  (23)
+- Hour, 12-hour clock  (11)
+- AM/PM (pm)
+- Minutes (59)
+- Seconds (00)
+- Timezone (UTC)
+
+Unsupported (but you may use strftime % codes)
+- milliseconds
+- weekday (numeric)
+- week number
+
+
+Currently, only English and Dutch are supported. The default language can 
+be set using Time.set_default_template_language. 
+Examples for English:
+Time.set_default_template_language(:en)
+Time.now.like("Sunday DECEMBER 31, 11:59 PM")
+Time.now.like("Sun 31 dec")
+Time.now.like("12-31-99")
+Time.now.like("Next sunday at 11 o'clock")
+Time.now.like("Sun 12-31-99 11:59 PM UTC")
+
+Examples for Dutch:
+Time.set_default_template_language(:nl)
+Time.now.like("Zondag 31 DECEMBER 23:59")
+Time.now.like("Zo 31 dec")
+Time.now.like("31-12-99")
+Time.now.like("Zondag om 23 uur 59")
+Time.now.like("December, 1999")

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/like_time.rb

@@ -7,66 +7,39 @@ class Time
     @lang
   end
   
-  LANG_DATA = { 
+  CONVERSION = { "99" => "%y", "1999" => "%Y", "12" => "%m", "366" => "%j", "31" => "%d", 
+                 "23" => "%H", "11" => "%I", "pm" => "%p", "59" => "%M", "00" => "%S", "utc" => "%Z"
+  }
+  LANG_DATA = {
     :en => { 
-         :conversion => {"31" => "%d", "23" => "%H", "59" => "%M", "12" => "%m", "pm" => "%p", 
-                         "99" => "%y", "1999" => "%Y", 
-                         "su" => :sday, "sun" => :day, "sunday" => :lday, "dec" => :month, "december" => :lmonth },
+         :conversion => {"su" => :sday, "sun" => :day, "sunday" => :lday, "dec" => :month, "december" => :lmonth },
          :sday => %w(Su Mo Tu We Th Fr Sa),
          :day => %w(Sun Mon Tue Wed Thu Fri Sat),
          :lday => %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday),
          :month => %w(X jan feb mar apr may jun jul aug sep oct nov dec),
          :lmonth => %w(X january february march april may june july august september october november december)},
     :nl => { 
-           :conversion => {"31" => "%d", "23" => "%H", "59" => "%M", "12" => "%m", "pm" => "%p", 
-                           "99" => "%y", "1999" => "%Y", 
-                           "zo" => :day, "zondag" => :lday, "dec" => :month, "december" => :lmonth },
+           :conversion => {"zo" => :day, "zondag" => :lday, "dec" => :month, "december" => :lmonth },
            :day => %w(Zo Ma Di Wo Do Vr Za),
            :lday => %w(Zondag Maandag Dinsdag Woensdag Donderdag Vrijdag Zaterdag),
            :month => %w(X jan feb mrt apr mei jun jul aug sep okt nov dec),
            :lmonth => %w(X januari februari maart april mei juni juli augustus september oktober november december)}}
   
   # +s+ Uses a natural format to specify a date/time format, by using a reference date/time.
-  # This time is Sunday, December 31, 23:59.
-  # Capitalization of months/weekdays will match that in template.
-  # The following subset of strftime is supported:
-  # - Year long (1999)
-  # - Year short (99)
-  # - Month long (december)
-  # - Month short (dec)
-  # - Month numeric (12)
-  # - Date (31)
-  # - Weekday long (Sunday)
-  # - Weekday short (Sun)
-  # - Weekday very short (Su)
-  # - 24-Hours  (23)
-  # - AM/PM (pm)
-  # - Minutes (59)
-  
+  # This time is Sunday, December 31 1999, 23:59 UTC, or Sun 12-31-99 11:59 PM.
+  # See README for details.
   # +lang+ A two-letter string or symbol. (e.g. "en")
-  # Currently, only English and Dutch are supported. The default language can 
-  # be set using the Time.default_template_language= accessor. 
-  # Examples for Dutch:
-  # Time.now.like("Zondag 31 DECEMBER 23:59")
-  # Time.now.like("Zo 31 dec")
-  # Time.now.like("31-12-99")
-  # Time.now.like("Zondag om 23 uur 59")
-  # Time.now.like("December, 1999")
   def like(s, lang = nil)
-    l = lang || Time.default_template_language
-    raise "Please supply language as parameter, or set global language with Time.set_default_template_language(lang)" unless l
+    l = lang || Time.default_template_language || :en
     lang_data = LANG_DATA[l.to_sym]
     raise "Language #{lang} not supported." unless lang_data
     match_capitalization = lambda {|t,z| z == z.downcase ? t.downcase : z == z.upcase ? t.upcase : t.capitalize }
     s.split(/([A-Z]+)|(\d+)/i).map do |x|
-      if y = lang_data[:conversion][x.downcase]
-        if String === y
-          y
-        elsif y == :day or y == :lday
-          match_capitalization[lang_data[y][wday], x]
-        else
-          match_capitalization[lang_data[y][month], x]
-        end
+      if y = CONVERSION[x.downcase]
+        y
+      elsif y = lang_data[:conversion][x.downcase]
+        is_day = y == :day || y == :lday
+        match_capitalization[lang_data[y][is_day ? wday : month], x]
       else
         x
       end

data/like_time.gemspec

@@ -2,15 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{like_time}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michiel de Mare"]
   s.date = %q{2009-06-08}
   s.description = %q{A human alternative to Time#strftime.}
   s.email = %q{michieldemare@gmail.com}
+  s.extra_rdoc_files = [
+    "README"
+  ]
   s.files = [
-    "Rakefile",
+    "README",
+     "Rakefile",
      "VERSION",
      "lib/like_time.rb",
      "like_time.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mdemare-like_time
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Michiel de Mare
@@ -19,9 +19,10 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 files: 
+- README
 - Rakefile
 - VERSION
 - lib/like_time.rb