mdemare-like_time 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/like_time.rb

@@ -1,5 +1,5 @@
 class Time
-  def Time.default_template_language(lang)
+  def Time.set_default_template_language(lang)
     @lang = lang
   end
   
@@ -26,7 +26,7 @@ class Time
            :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)}}
   
-  # +template+ Uses a natural format to specify a date/time format, by using a reference date/time.
+  # +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:
@@ -52,22 +52,25 @@ class Time
   # Time.now.like("31-12-99")
   # Time.now.like("Zondag om 23 uur 59")
   # Time.now.like("December, 1999")
-  def like(template, lang = nil)
-    lang_data = LANG_DATA[(lang || Time.default_template_language).to_sym]
+  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)"
+    lang_data = LANG_DATA[l.to_sym]
     raise "Language #{lang} not supported." unless lang_data
-    s = template.dup
     match_capitalization = lambda {|t,z| z == z.downcase ? t.downcase : z == z.upcase ? t.upcase : t.capitalize }
-    s.scan(/\d+|\w+/).each do |x|
+    s.split(/([A-Z]+)|(\d+)/i).map do |x|
       if y = lang_data[:conversion][x.downcase]
         if String === y
-          s.gsub! /\b#{x}\b/, y
+          y
         elsif y == :day or y == :lday
-          s.gsub! /\b#{x}\b/, match_capitalization[lang_data[y][wday], x]
+          match_capitalization[lang_data[y][wday], x]
         else
-          s.gsub! /\b#{x}\b/, match_capitalization[lang_data[y][month], x]
+          match_capitalization[lang_data[y][month], x]
         end
+      else
+        x
       end
-    end
+    end.join
     strftime s
   end
 end

data/like_time.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{like_time}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michiel de Mare"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mdemare-like_time
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michiel de Mare