fluid-time 0.2.1 → 0.2.2

data/README.md

@@ -4,6 +4,10 @@ Stop formatting time like a C-anderthal.  Craft human readable time formats like
 
     FluidTime.new('2012/04/10 21:22').month.day.th.comma.space.xs.year.txt('@').time.xz.xs.pm.lower.zone.to_s
     # "April 10th, 2012 @ 9:22pm PDT"
+    
+    FluidTime.new(Time.now).to_s
+    FluidTime.new(Date.today).to_s
+    FluidTime.new("21:22:00").to_s
 
 Strip zeros, ordinalize, and change case with ease:
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/fluid-time.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluid-time}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Lawson"]
-  s.date = %q{2012-04-11}
+  s.date = %q{2012-09-05}
   s.description = %q{Stop formatting time like a C-anderthal.  Craft human readable time formats like building a sentence.
  > FluidTime.new('2012/04/10 21:22').month.day.th.comma.space.xs.year.txt('@').time.xz.xs.pm.lower.zone.to_s
 => "April 10th, 2012 @ 9:22pm PDT"

data/lib/fluid-time.rb

@@ -31,7 +31,9 @@ class FluidTime
       j.yday.day_of_year
       m.mm.mon.month_of_year
       M.min.minute
-      p.am.pm
+      hour.p
+      hour.pm.txt('or').hour.am
+      hour.PM.txt('or').hour.AM
       S.sec.second
       U
       W
@@ -46,11 +48,11 @@ class FluidTime
       db
       usdate
       W.th.comma.space._('week')
-      date.hour.colon.min.ytt.pm
+      date.hour.colon.min.today.pm
       year.mmm.d.th
       time.xs.p.down
-      txt('01').xz
-      txt('1:00').xz.xs.pm.lower.zone
+      txt('01').xz.PM.zone
+      txt('1:00').xz.pm.zone
       _('braces').lb.lp.lc.rc.rp.rb
       _('symbols').lb.tp.ts.tc.ts.tn.ts.td.rb
       _('symbols').lb.sp.ss.sc.ss.sn.ss.sd.rb
@@ -164,9 +166,14 @@ class FluidTime
 
 
   def p; cat @time.strftime('%p') end      # %p - Meridian indicator (``AM''  or  ``PM'')
-  alias :om :p
-  alias :am :p
-  alias :pm :p
+  alias :AM :p
+  alias :PM :p
+
+  def pm; self.p.down end                  # lowercase am/pm
+  alias :am :pm
+
+  def xpm; self.xz.xs.pm end               # lowercase am/pm without space or leading zero on preceding number
+  alias :xam :xpm
 
 
   def S; cat @time.strftime('%S') end      # %S - Second of the minute (00..60)
@@ -230,6 +237,9 @@ class FluidTime
       end
     end.join(' '))
   end
+  alias :today :ytt
+  alias :tomorrow :ytt
+  alias :yesterday :ytt
 
   def down
     set(@build.split.tap {|parts| parts << parts.pop.downcase}.join(' '))
@@ -247,6 +257,8 @@ class FluidTime
     end.join(' '))
   end
   alias :xz :strip_zero
+  alias :x0 :strip_zero
+  alias :nozero :strip_zero
 
   def strip
     @build.strip! unless @last_was_space

data/spec/fluid-time_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "FluidTime" do
+
   it "runs the demo" do
     FluidTime.demo.should be_nil
   end
@@ -14,4 +15,23 @@ describe "FluidTime" do
     FluidTime.new.txt('01').xz.to_s.should eql('1')
   end
 
+  it "replaces today's date with Today" do
+    FluidTime.new.date.today.to_s.should match /Today/
+  end
+
+  context 'initialization' do
+    it "accepts just a time" do
+      FluidTime.new('3pm HA!!!').hour.xpm.to_s.should == '3pm'
+    end
+
+    it "accepts date as a string" do
+      FluidTime.new('2012/01/05').date.to_s.should == '01/05/2012'
+      FluidTime.new('2012-01-05').date.to_s.should == '01/05/2012'
+      FluidTime.new('01/05/2012').date.to_s.should == '01/05/2012'
+      FluidTime.new('jan 5th 2012').date.to_s.should == '01/05/2012'
+    end
+
+  end
+
+
 end

metadata

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