fluid-time 0.1.4 → 0.2.0

data/README.rdoc

@@ -1,64 +1,62 @@
-= fluid-time
+== FluidTime
 
 Stop formatting time like a C-anderthal.  Craft human readable time formats like building a sentence.
 
-```ruby
-FluidTime.new.month.hour.tc.minute.tc.second
-FluidTime.new(Date.today).weekday.month.year
-```
+    FluidTime.new.month.hour.colon.minute.colon.second
+    FluidTime.new(Date.today).weekday.month.year
+    FluidTime.new('04/05/2012 09:45:23').weekday.month.year
 
 Do things like strip zeros, ordinalize and change case with ease (ordinalize only works if you've included rails for now)
-```ruby
-FluidTime.new.time.pm.zone.to_s
-# 09:51:29 PM PDT
 
-FluidTime.new.time.xz.xs.pm.down.zone.to_s
-# 9:51:51pm PDT
-```
+
+    FluidTime.new.time.pm.zone.to_s
+    # 09:51:29 PM PDT
+
+    FluidTime.new.time.xz.xs.pm.down.zone.to_s
+    # 9:51:51pm PDT
+
 
 REMEMBER to end your chains with .to_s or use in a string "Today is #{FluidTime.new.weekday.upper}"
 
+    FluidTime.demo
 
-```ruby
-FluidTime.demo
-# FluidTime.new.   to_time.to_s                      Tue Apr 10 21:46:11 -0700 2012
-# FluidTime.new.   to_date.to_s                                          2012-04-10
-# FluidTime.new.   A.tday.weekday.to_s                      Tuesday Tuesday Tuesday
-# FluidTime.new.   weekday.up.to_s                                          TUESDAY
-# FluidTime.new.   b.mmm.smonth.to_s                                    Apr Apr Apr
-# FluidTime.new.   B.month.to_s                                         April April
-# FluidTime.new.   c.to_s                                  Tue Apr 10 21:46:11 2012
-# FluidTime.new.   full.to_s                               Tue Apr 10 21:46:11 2012
-# FluidTime.new.   d.day.num.dd.to_s                                    10 10 10 10
-# FluidTime.new.   e.mday.to_s                                                10 10
-# FluidTime.new.   mmm.d.th.year.to_s                                   Apr 10 2012
-# FluidTime.new.   year.mmm.d.th.to_s                                   2012 Apr 10
-# FluidTime.new.   H.h24.hour24.to_s                                       21 21 21
-# FluidTime.new.   I.h12.hour.hour12.to_s                               09 09 09 09
-# FluidTime.new.   l.to_s                                                         9
-# FluidTime.new.   j.yday.day_of_year.to_s                              101 101 101
-# FluidTime.new.   m.mm.mon.month_of_year.to_s                          04 04 04 04
-# FluidTime.new.   M.min.minute.to_s                                       46 46 46
-# FluidTime.new.   p.am.pm.to_s                                            PM PM PM
-# FluidTime.new.   time.xs.p.down.to_s                                   09:46:11pm
-# FluidTime.new.   S.sec.second.to_s                                       11 11 11
-# FluidTime.new.   U.th.txt('week').to_s                                    15 week
-# FluidTime.new.   W.th.tc.ts._('min').to_s                                 15, min
-# FluidTime.new.   w.to_s                                                         2
-# FluidTime.new.   x.autodate.to_s                                04/10/12 04/10/12
-# FluidTime.new.   X.autotime.to_s                                21:46:11 21:46:11
-# FluidTime.new.   date.to_s                                             04/10/2012
-# FluidTime.new.   time.to_s                                               09:46:11
-# FluidTime.new.   y.yy.sy.to_s                                            12 12 12
-# FluidTime.new.   Y.year.to_s                                            2012 2012
-# FluidTime.new.   Z.zone.timezone.to_s                                 PDT PDT PDT
-# FluidTime.new.   txt('01').xz.to_s                                              1
-# FluidTime.new.   txt('1:00').xz.xs.pm.lower.zone.to_s                     1pm PDT
-# FluidTime.new.   _('braces').lb.lp.lc.rc.rp.rb.to_s                  braces[({})]
-# FluidTime.new.   _('symbols').lb.tp.ts.tc.ts.tn.ts.td.rb.to_s    symbols[. , : -]
-# FluidTime.new.   _('symbols').lb.sp.ss.sc.ss.sn.ss.sd.rb.to_s    symbols[. , : -]
-# FluidTime.new.   db.to_s                                      2012-04-10 21:09:11
-```
+    # FluidTime.new.   to_time.to_s                      Tue Apr 10 21:46:11 -0700 2012
+    # FluidTime.new.   to_date.to_s                                          2012-04-10
+    # FluidTime.new.   A.tday.weekday.to_s                      Tuesday Tuesday Tuesday
+    # FluidTime.new.   weekday.up.to_s                                          TUESDAY
+    # FluidTime.new.   b.mmm.smonth.to_s                                    Apr Apr Apr
+    # FluidTime.new.   B.month.to_s                                         April April
+    # FluidTime.new.   c.to_s                                  Tue Apr 10 21:46:11 2012
+    # FluidTime.new.   full.to_s                               Tue Apr 10 21:46:11 2012
+    # FluidTime.new.   d.day.num.dd.to_s                                    10 10 10 10
+    # FluidTime.new.   e.mday.to_s                                                10 10
+    # FluidTime.new.   mmm.d.th.year.to_s                                   Apr 10 2012
+    # FluidTime.new.   year.mmm.d.th.to_s                                   2012 Apr 10
+    # FluidTime.new.   H.h24.hour24.to_s                                       21 21 21
+    # FluidTime.new.   I.h12.hour.hour12.to_s                               09 09 09 09
+    # FluidTime.new.   l.to_s                                                         9
+    # FluidTime.new.   j.yday.day_of_year.to_s                              101 101 101
+    # FluidTime.new.   m.mm.mon.month_of_year.to_s                          04 04 04 04
+    # FluidTime.new.   M.min.minute.to_s                                       46 46 46
+    # FluidTime.new.   p.am.pm.to_s                                            PM PM PM
+    # FluidTime.new.   time.xs.p.down.to_s                                   09:46:11pm
+    # FluidTime.new.   S.sec.second.to_s                                       11 11 11
+    # FluidTime.new.   U.th.txt('week').to_s                                    15 week
+    # FluidTime.new.   W.th.tc.ts._('min').to_s                                 15, min
+    # FluidTime.new.   w.to_s                                                         2
+    # FluidTime.new.   x.autodate.to_s                                04/10/12 04/10/12
+    # FluidTime.new.   X.autotime.to_s                                21:46:11 21:46:11
+    # FluidTime.new.   date.to_s                                             04/10/2012
+    # FluidTime.new.   time.to_s                                               09:46:11
+    # FluidTime.new.   y.yy.sy.to_s                                            12 12 12
+    # FluidTime.new.   Y.year.to_s                                            2012 2012
+    # FluidTime.new.   Z.zone.timezone.to_s                                 PDT PDT PDT
+    # FluidTime.new.   txt('01').xz.to_s                                              1
+    # FluidTime.new.   txt('1:00').xz.xs.pm.lower.zone.to_s                     1pm PDT
+    # FluidTime.new.   _('braces').lb.lp.lc.rc.rp.rb.to_s                  braces[({})]
+    # FluidTime.new.   _('symbols').lb.tp.ts.tc.ts.tn.ts.td.rb.to_s    symbols[. , : -]
+    # FluidTime.new.   _('symbols').lb.sp.ss.sc.ss.sn.ss.sd.rb.to_s    symbols[. , : -]
+    # FluidTime.new.   db.to_s                                      2012-04-10 21:09:11
 
 == Contributing to fluid-time
  

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/fluid-time.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluid-time}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Lawson"]
-  s.date = %q{2012-04-10}
+  s.date = %q{2012-04-11}
   s.description = %q{Stop formatting time like a C-anderthal.  Craft human readable time formats like building a sentence.
 
 

data/lib/fluid-time.rb

@@ -79,12 +79,17 @@ class FluidTime
   end
 
   def cat(str, sep = ' ')
-    @last_was_space = ' ' == str
+    @last_was_space = ' ' == str.to_s
     @build += str.to_s + sep
     self
   end
   alias :txt :cat
   alias :_ :cat
+  
+  def set(str, sep = ' ')
+    @build = str.to_s + sep
+    self
+  end
 
 
   ##### Formats
@@ -206,41 +211,36 @@ class FluidTime
   ##### Modifiers
 
   def th
-    @build = @build.strip.split.tap do |parts|
-      parts << parts.pop.tap { |last| last.replace(ordinalize(last)) }
-    end.join(' ') + ' '
-    self
+    set(@build.strip.split.tap do |parts|
+      parts << parts.pop.tap { |last| last.replace(numeric?(last) ? ordinalize(last) : last) }
+    end.join(' '))
   end
 
   def ytt
-    @build = @build.gsub('-', '/').split.tap do |parts|
+    set(@build.gsub('-', '/').split.tap do |parts|
       parts.each_with_index do |part, index|
         date = Date.parse(part) rescue nil
         parts[index] = 'Today' if date.is_a?(Date) && date.to_s == Date.today.to_s
         parts[index] = 'Tomorrow' if date.is_a?(Date) && date.to_s == Date.tomorrow.to_s
         parts[index] = 'Yesterday' if date.is_a?(Date) && date.to_s == Date.yesterday.to_s
       end
-    end.join(' ') + ' '
-    self
+    end.join(' '))
   end
 
   def down
-    @build = @build.split.tap { |parts| parts << parts.pop.downcase }.join(' ') + ' '
-    self
+    set(@build.split.tap {|parts| parts << parts.pop.downcase}.join(' '))
   end
   alias :lower :down
 
   def up
-    @build = @build.split.tap { |parts| parts << parts.pop.upcase }.join(' ') + ' '
-    self
+    set(@build.split.tap {|parts| parts << parts.pop.upcase}.join(' '))
   end
   alias :upper :up
 
   def strip_zero
-    @build = @build.strip.split.tap do |parts|
+    set(@build.strip.split.tap do |parts|
       parts << parts.pop.tap { |last| last.replace(last.gsub(/^0/,'').gsub(':00','')) }
-    end.join(' ') + ' '
-    self
+    end.join(' '))
   end
   alias :xz :strip_zero
 
@@ -273,11 +273,11 @@ class FluidTime
   ##### Presets
 
   def db
-    self.Y.td.m.td.d.H.tn.I.tn.S
+    self.Y.dash.m.dash.d.H.colon.I.colon.S
   end
 
   def usdate
-    self.mm.tl.d.tl.Y
+    self.mm.slash.d.slash.Y
   end
 
   def Ymd
@@ -285,15 +285,15 @@ class FluidTime
   end
 
   def Y_m_d
-    self.Y.td.mm.td.d
+    self.Y.dash.mm.dash.d
   end
 
   def time
-    self.hour.tn.minute.tn.second
+    self.hour.colon.minute.colon.second
   end
 
   def date
-    self.mon.sl.day.sl.year
+    self.mon.slash.day.slash.year
   end
 
   #####
@@ -305,9 +305,15 @@ class FluidTime
     true if Float(string) rescue false
   end
 
-  def ordinalize(input)
-    numeric?(input) && input.to_i.methods.include?(:ordinalize) ? input.to_i.ordinalize : input
-  end
+  def ordinalize(number)
+    return "#{number}th" if (11..13).include?(number.to_i % 100)
 
+    case number.to_i % 10
+      when 1; "#{number}st"
+      when 2; "#{number}nd"
+      when 3; "#{number}rd"
+      else    "#{number}th"
+    end
+  end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluid-time
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Steve Lawson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-10 00:00:00 -07:00
+date: 2012-04-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency