chronomize 0.0.1 → 0.0.2

data/chronomize.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "chronomize"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Katrina Owen"]
   s.email       = ["katrina.owen@gmail.com"]
   s.homepage    = ""

data/lib/chronomize.rb

@@ -31,7 +31,8 @@ class Chronomize
   end
 
   def label_for(date, direction = nil)
-    pieces = [] << format(date) << chronicality(date)
+    label = chronicality(date)
+    pieces = label ? [label] : [format(date)]
     pieces.push forward if direction == :forward
     pieces.unshift backward if direction == :backward
     pieces.compact.join(" ")
@@ -43,11 +44,11 @@ class Chronomize
 
   def chronicality(date)
     if Date.yesterday?(date)
-      "(#{yesterday})" if yesterday
+      yesterday
     elsif Date.today?(date)
-      "(#{today})" if today
+      today
     elsif Date.tomorrow?(date)
-      "(#{tomorrow})" if tomorrow
+      tomorrow
     end
   end
 

data/spec/chronomize_spec.rb

@@ -11,20 +11,21 @@ describe Chronomize do
   let(:feb9) { Date.new(2012, 2, 9) }
 
   before(:each) { Timecop.freeze(feb7) }
+  after(:each) { Timecop.return }
 
   context "today" do
     subject { Chronomize.new(feb7) }
 
-    its(:previous) { should eq('February 6, 2012 (yesterday)') }
-    its(:current) { should eq('February 7, 2012 (today)') }
-    its(:next) { should eq('February 8, 2012 (tomorrow)') }
+    its(:previous) { should eq('yesterday') }
+    its(:current) { should eq('today') }
+    its(:next) { should eq('tomorrow') }
   end
 
   context "tomorrow" do
     subject { Chronomize.new(feb8) }
 
-    its(:previous) { should eq('February 7, 2012 (today)') }
-    its(:current) { should eq('February 8, 2012 (tomorrow)') }
+    its(:previous) { should eq('today') }
+    its(:current) { should eq('tomorrow') }
     its(:next) { should eq('February 9, 2012') }
   end
 
@@ -32,8 +33,8 @@ describe Chronomize do
     subject { Chronomize.new(feb6) }
 
     its(:previous) { should eq('February 5, 2012') }
-    its(:current) { should eq('February 6, 2012 (yesterday)') }
-    its(:next) { should eq('February 7, 2012 (today)') }
+    its(:current) { should eq('yesterday') }
+    its(:next) { should eq('today') }
   end
 
   context "last week" do
@@ -46,16 +47,16 @@ describe Chronomize do
   context "with symbols" do
     subject { Chronomize.new(feb6, :previous => '<~', :next => '~>') }
     its(:previous) { should eq('<~ February 5, 2012') }
-    its(:current) { should eq('February 6, 2012 (yesterday)') }
-    its(:next) { should eq('February 7, 2012 (today) ~>') }
+    its(:current) { should eq('yesterday') }
+    its(:next) { should eq('today ~>') }
   end
 
   context "with alternate day names" do
     subject { Chronomize.new(feb7, :today => "aujourd'hui", :yesterday => 'hier', :tomorrow => 'demain') }
 
-    its(:previous) { should eq('February 6, 2012 (hier)') }
-    its(:current) { should eq('February 7, 2012 (aujourd\'hui)') }
-    its(:next) { should eq('February 8, 2012 (demain)') }
+    its(:previous) { should eq('hier') }
+    its(:current) { should eq('aujourd\'hui') }
+    its(:next) { should eq('demain') }
   end
 
   context "without day names" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronomize
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70312046276940 !ruby/object:Gem::Requirement
+  requirement: &70305360568220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312046276940
+  version_requirements: *70305360568220
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70312046276420 !ruby/object:Gem::Requirement
+  requirement: &70305360567780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312046276420
+  version_requirements: *70305360567780
 description: Creates labels for a window of dates, with knowledge about it's relationship
   to the current date.
 email:
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: chronomize
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple dateful navigation.