fat_core 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3607f0be1274b7aaf76f304d49f3520e77d660a9
-  data.tar.gz: ad4c5ae566a070959c19c5bd6dab95c43ed0f234
+  metadata.gz: 8ca41250c3f9b03257b33633c7bdadea6f0e1d8b
+  data.tar.gz: 4af0065da337d9a77211fe4ee27802842b08f0b6
 SHA512:
-  metadata.gz: f59a2e0bfa35cf755a4578a5daf84e614c9f11470c1fe3f94d6cfc1edf79cb4ab5a054813bc961f74edb82a0e76daee8d92e01bd0a1c5ff041b5cf5d216a916d
-  data.tar.gz: d3fecd8a83aec2101df3f1bac6d6427773c71e73a6158b6ab456330ca5598cc44710bef01ae863d3bc787ebed4a73f41ebc9402c15d4b42e0486a71a702e2e6a
+  metadata.gz: a031a05bae6490638d336b9552fcbac2e7537ef4593016e9ac0bdbf158e35c9226e749799310c2569574dc68bb71cffb4c037ee0d36e6f8a8fccde60ee0c5492
+  data.tar.gz: a63755c81cf3bae6175810301584f2f18e2afe34bb0df1667a3c3a01eb4ffd641146f15d4994f807203a6bcce31457cb6ea1bfede45a165d0652e53fd368b247

data/lib/fat_core/period.rb

@@ -47,6 +47,15 @@ class Period
     end
   end
 
+  # Return a period based on two date specs (see Date.parse_spec), a '''from'
+  # and a 'to' spec.  If the to-spec is not given or is nil, the from-spec is
+  # used for both the from- and to-spec.  If no from-spec is given, return
+  # today as the period.
+  def self.parse_spec(from = 'today', to = nil)
+    to ||= from
+    Period.new(Date.parse_spec(from, :from), Date.parse_spec(to, :to))
+  end
+
   # Possibly useful class method to take an array of periods and join all the
   # contiguous ones, then return an array of the disjoint periods not
   # contiguous to one another.  An array of periods with no gaps should return

data/lib/fat_core/version.rb

@@ -1,3 +1,3 @@
 module FatCore
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/lib/date_spec.rb

@@ -4,9 +4,8 @@ describe Date do
   before :each do
     # Pretend it is this date. Not at beg or end of year, quarter,
     # month, or week.  It is a Wednesday
-    Date.stub(:current).and_return(Date.parse('2012-07-18'))
-    Date.stub(:today).and_return(Date.parse('2012-07-18'))
-    @test_today = Date.parse('2012-07-18')
+    allow(Date).to receive_messages(:today => Date.parse('2012-07-18'))
+    allow(Date).to receive_messages(:current => Date.parse('2012-07-18'))
   end
 
   describe "class methods" do
@@ -20,137 +19,137 @@ describe Date do
       end
 
       it "should parse plain iso dates correctly" do
-        Date.parse_spec('2011-07-15').should eq Date.parse('2011-07-15')
-        Date.parse_spec('2011-08-05').should eq Date.parse('2011-08-05')
+        expect(Date.parse_spec('2011-07-15')).to eq Date.parse('2011-07-15')
+        expect(Date.parse_spec('2011-08-05')).to eq Date.parse('2011-08-05')
       end
 
       it "should parse week numbers such as 'W23' or '23W' correctly" do
-        Date.parse_spec('W1').should eq Date.parse('2012-01-02')
-        Date.parse_spec('W23').should eq Date.parse('2012-06-04')
-        Date.parse_spec('W23', :to).should eq Date.parse('2012-06-10')
-        Date.parse_spec('23W').should eq Date.parse('2012-06-04')
-        Date.parse_spec('23W', :to).should eq Date.parse('2012-06-10')
+        expect(Date.parse_spec('W1')).to eq Date.parse('2012-01-02')
+        expect(Date.parse_spec('W23')).to eq Date.parse('2012-06-04')
+        expect(Date.parse_spec('W23', :to)).to eq Date.parse('2012-06-10')
+        expect(Date.parse_spec('23W')).to eq Date.parse('2012-06-04')
+        expect(Date.parse_spec('23W', :to)).to eq Date.parse('2012-06-10')
         expect {
           Date.parse_spec('W83', :to)
         }.to raise_error
       end
 
       it "should parse year-week numbers such as 'YYYY-W23' or 'YYYY-23W' correctly" do
-        Date.parse_spec('2003-W1').should eq Date.parse('2002-12-30')
-        Date.parse_spec('2003-W1', :to).should eq Date.parse('2003-01-05')
-        Date.parse_spec('2003-W23').should eq Date.parse('2003-06-02')
-        Date.parse_spec('2003-W23', :to).should eq Date.parse('2003-06-08')
-        Date.parse_spec('2003-23W').should eq Date.parse('2003-06-02')
-        Date.parse_spec('2003-23W', :to).should eq Date.parse('2003-06-08')
+        expect(Date.parse_spec('2003-W1')).to eq Date.parse('2002-12-30')
+        expect(Date.parse_spec('2003-W1', :to)).to eq Date.parse('2003-01-05')
+        expect(Date.parse_spec('2003-W23')).to eq Date.parse('2003-06-02')
+        expect(Date.parse_spec('2003-W23', :to)).to eq Date.parse('2003-06-08')
+        expect(Date.parse_spec('2003-23W')).to eq Date.parse('2003-06-02')
+        expect(Date.parse_spec('2003-23W', :to)).to eq Date.parse('2003-06-08')
         expect {
           Date.parse_spec('2003-W83', :to)
         }.to raise_error
       end
 
       it "should parse year-quarter specs such as YYYY-NQ or YYYY-QN" do
-        Date.parse_spec('2011-4Q', :from).should eq Date.parse('2011-10-01')
-        Date.parse_spec('2011-4Q', :to).should eq Date.parse('2011-12-31')
-        Date.parse_spec('2011-Q4', :from).should eq Date.parse('2011-10-01')
-        Date.parse_spec('2011-Q4', :to).should eq Date.parse('2011-12-31')
+        expect(Date.parse_spec('2011-4Q', :from)).to eq Date.parse('2011-10-01')
+        expect(Date.parse_spec('2011-4Q', :to)).to eq Date.parse('2011-12-31')
+        expect(Date.parse_spec('2011-Q4', :from)).to eq Date.parse('2011-10-01')
+        expect(Date.parse_spec('2011-Q4', :to)).to eq Date.parse('2011-12-31')
         expect { Date.parse_spec('2011-5Q') }.to raise_error
       end
 
       it "should parse quarter-only specs such as NQ or QN" do
-        Date.parse_spec('4Q', :from).should eq Date.parse('2012-10-01')
-        Date.parse_spec('4Q', :to).should eq Date.parse('2012-12-31')
-        Date.parse_spec('Q4', :from).should eq Date.parse('2012-10-01')
-        Date.parse_spec('Q4', :to).should eq Date.parse('2012-12-31')
+        expect(Date.parse_spec('4Q', :from)).to eq Date.parse('2012-10-01')
+        expect(Date.parse_spec('4Q', :to)).to eq Date.parse('2012-12-31')
+        expect(Date.parse_spec('Q4', :from)).to eq Date.parse('2012-10-01')
+        expect(Date.parse_spec('Q4', :to)).to eq Date.parse('2012-12-31')
         expect { Date.parse_spec('5Q') }.to raise_error
       end
 
       it "should parse year-month specs such as YYYY-MM" do
-        Date.parse_spec('2010-5', :from).should eq Date.parse('2010-05-01')
-        Date.parse_spec('2010-5', :to).should eq Date.parse('2010-05-31')
+        expect(Date.parse_spec('2010-5', :from)).to eq Date.parse('2010-05-01')
+        expect(Date.parse_spec('2010-5', :to)).to eq Date.parse('2010-05-31')
         expect { Date.parse_spec('2010-13') }.to raise_error
       end
 
       it "should parse month-only specs such as MM" do
-        Date.parse_spec('10', :from).should eq Date.parse('2012-10-01')
-        Date.parse_spec('10', :to).should eq Date.parse('2012-10-31')
+        expect(Date.parse_spec('10', :from)).to eq Date.parse('2012-10-01')
+        expect(Date.parse_spec('10', :to)).to eq Date.parse('2012-10-31')
         expect { Date.parse_spec('99') }.to raise_error
         expect { Date.parse_spec('011') }.to raise_error
       end
 
       it "should parse year-only specs such as YYYY" do
-        Date.parse_spec('2010', :from).should eq Date.parse('2010-01-01')
-        Date.parse_spec('2010', :to).should eq Date.parse('2010-12-31')
+        expect(Date.parse_spec('2010', :from)).to eq Date.parse('2010-01-01')
+        expect(Date.parse_spec('2010', :to)).to eq Date.parse('2010-12-31')
         expect { Date.parse_spec('99999') }.to raise_error
       end
 
       it "should parse relative day names: today, yesterday" do
-        Date.parse_spec('today').should eq Date.current
-        Date.parse_spec('this_day').should eq Date.current
-        Date.parse_spec('yesterday').should eq Date.current - 1.day
-        Date.parse_spec('last_day').should eq Date.current - 1.day
+        expect(Date.parse_spec('today')).to eq Date.current
+        expect(Date.parse_spec('this_day')).to eq Date.current
+        expect(Date.parse_spec('yesterday')).to eq Date.current - 1.day
+        expect(Date.parse_spec('last_day')).to eq Date.current - 1.day
       end
 
       it "should parse relative weeks: this_week, last_week" do
-        Date.parse_spec('this_week').should eq Date.parse('2012-07-16')
-        Date.parse_spec('this_week', :to).should eq Date.parse('2012-07-22')
-        Date.parse_spec('last_week').should eq Date.parse('2012-07-09')
-        Date.parse_spec('last_week', :to).should eq Date.parse('2012-07-15')
+        expect(Date.parse_spec('this_week')).to eq Date.parse('2012-07-16')
+        expect(Date.parse_spec('this_week', :to)).to eq Date.parse('2012-07-22')
+        expect(Date.parse_spec('last_week')).to eq Date.parse('2012-07-09')
+        expect(Date.parse_spec('last_week', :to)).to eq Date.parse('2012-07-15')
       end
 
       it "should parse relative biweeks: this_biweek, last_biweek" do
-        Date.parse_spec('this_biweek').should eq Date.parse('2012-07-16')
-        Date.parse_spec('this_biweek', :to).should eq Date.parse('2012-07-29')
-        Date.parse_spec('last_biweek').should eq Date.parse('2012-07-02')
-        Date.parse_spec('last_biweek', :to).should eq Date.parse('2012-07-15')
+        expect(Date.parse_spec('this_biweek')).to eq Date.parse('2012-07-16')
+        expect(Date.parse_spec('this_biweek', :to)).to eq Date.parse('2012-07-29')
+        expect(Date.parse_spec('last_biweek')).to eq Date.parse('2012-07-02')
+        expect(Date.parse_spec('last_biweek', :to)).to eq Date.parse('2012-07-15')
       end
 
       it "should parse relative months: this_semimonth, last_semimonth" do
-        Date.parse_spec('this_semimonth').should eq Date.parse('2012-07-16')
-        Date.parse_spec('this_semimonth', :to).should eq Date.parse('2012-07-31')
-        Date.parse_spec('last_semimonth').should eq Date.parse('2012-07-01')
-        Date.parse_spec('last_semimonth', :to).should eq Date.parse('2012-07-15')
+        expect(Date.parse_spec('this_semimonth')).to eq Date.parse('2012-07-16')
+        expect(Date.parse_spec('this_semimonth', :to)).to eq Date.parse('2012-07-31')
+        expect(Date.parse_spec('last_semimonth')).to eq Date.parse('2012-07-01')
+        expect(Date.parse_spec('last_semimonth', :to)).to eq Date.parse('2012-07-15')
       end
 
       it "should parse relative months: this_month, last_month" do
-        Date.parse_spec('this_month').should eq Date.parse('2012-07-01')
-        Date.parse_spec('this_month', :to).should eq Date.parse('2012-07-31')
-        Date.parse_spec('last_month').should eq Date.parse('2012-06-01')
-        Date.parse_spec('last_month', :to).should eq Date.parse('2012-06-30')
+        expect(Date.parse_spec('this_month')).to eq Date.parse('2012-07-01')
+        expect(Date.parse_spec('this_month', :to)).to eq Date.parse('2012-07-31')
+        expect(Date.parse_spec('last_month')).to eq Date.parse('2012-06-01')
+        expect(Date.parse_spec('last_month', :to)).to eq Date.parse('2012-06-30')
       end
 
       it "should parse relative bimonths: this_bimonth, last_bimonth" do
-        Date.parse_spec('this_bimonth').should eq Date.parse('2012-07-01')
-        Date.parse_spec('this_bimonth', :to).should eq Date.parse('2012-08-31')
-        Date.parse_spec('last_bimonth').should eq Date.parse('2012-05-01')
-        Date.parse_spec('last_bimonth', :to).should eq Date.parse('2012-06-30')
+        expect(Date.parse_spec('this_bimonth')).to eq Date.parse('2012-07-01')
+        expect(Date.parse_spec('this_bimonth', :to)).to eq Date.parse('2012-08-31')
+        expect(Date.parse_spec('last_bimonth')).to eq Date.parse('2012-05-01')
+        expect(Date.parse_spec('last_bimonth', :to)).to eq Date.parse('2012-06-30')
       end
 
       it "should parse relative quarters: this_quarter, last_quarter" do
-        Date.parse_spec('this_quarter').should eq Date.parse('2012-07-01')
-        Date.parse_spec('this_quarter', :to).should eq Date.parse('2012-09-30')
-        Date.parse_spec('last_quarter').should eq Date.parse('2012-04-01')
-        Date.parse_spec('last_quarter', :to).should eq Date.parse('2012-06-30')
+        expect(Date.parse_spec('this_quarter')).to eq Date.parse('2012-07-01')
+        expect(Date.parse_spec('this_quarter', :to)).to eq Date.parse('2012-09-30')
+        expect(Date.parse_spec('last_quarter')).to eq Date.parse('2012-04-01')
+        expect(Date.parse_spec('last_quarter', :to)).to eq Date.parse('2012-06-30')
       end
 
       it "should parse relative years: this_year, last_year" do
-        Date.parse_spec('this_year').should eq Date.parse('2012-01-01')
-        Date.parse_spec('this_year', :to).should eq Date.parse('2012-12-31')
-        Date.parse_spec('last_year').should eq Date.parse('2011-01-01')
-        Date.parse_spec('last_year', :to).should eq Date.parse('2011-12-31')
+        expect(Date.parse_spec('this_year')).to eq Date.parse('2012-01-01')
+        expect(Date.parse_spec('this_year', :to)).to eq Date.parse('2012-12-31')
+        expect(Date.parse_spec('last_year')).to eq Date.parse('2011-01-01')
+        expect(Date.parse_spec('last_year', :to)).to eq Date.parse('2011-12-31')
       end
 
       it "should parse forever and never" do
-        Date.parse_spec('forever').should eq Date::BOT
-        Date.parse_spec('forever', :to).should eq Date::EOT
-        Date.parse_spec('never').should be_nil
+        expect(Date.parse_spec('forever')).to eq Date::BOT
+        expect(Date.parse_spec('forever', :to)).to eq Date::EOT
+        expect(Date.parse_spec('never')).to be_nil
       end
     end
 
     it "should be able to parse an American-style date" do
-      Date.parse_american('2/12/2011').iso.should eq('2011-02-12')
-      Date.parse_american('2 / 12/ 2011').iso.should eq('2011-02-12')
-      Date.parse_american('2 / 1 / 2011').iso.should eq('2011-02-01')
-      Date.parse_american('  2 / 1 / 2011  ').iso.should eq('2011-02-01')
-      Date.parse_american('  2 / 1 / 15  ').iso.should eq('2015-02-01')
+      expect(Date.parse_american('2/12/2011').iso).to eq('2011-02-12')
+      expect(Date.parse_american('2 / 12/ 2011').iso).to eq('2011-02-12')
+      expect(Date.parse_american('2 / 1 / 2011').iso).to eq('2011-02-01')
+      expect(Date.parse_american('  2 / 1 / 2011  ').iso).to eq('2011-02-01')
+      expect(Date.parse_american('  2 / 1 / 15  ').iso).to eq('2015-02-01')
     end
   end
 
@@ -167,154 +166,146 @@ describe Date do
     end
 
     it "should know its pred and succ (for Range)" do
-      Date.today.pred.should eq (Date.today - 1)
-      Date.today.succ.should eq (Date.today + 1)
+      expect(Date.today.pred).to eq (Date.today - 1)
+      expect(Date.today.succ).to eq (Date.today + 1)
     end
 
     it "should be able to print itself as an American-style date" do
-      Date.parse('2011-02-12').american.should eq('2/12/2011')
+      expect(Date.parse('2011-02-12').american).to eq('2/12/2011')
     end
 
     it "should be able to print itself in iso form" do
-      Date.today.iso.should == '2012-07-18'
+      expect(Date.today.iso).to eq '2012-07-18'
     end
 
     it "should be able to print itself in org form" do
-      Date.today.org.should eq('[2012-07-18 Wed]')
-      (Date.today + 1.day).org.should eq('[2012-07-19 Thu]')
+      expect(Date.today.org).to eq('[2012-07-18 Wed]')
+      expect((Date.today + 1.day).org).to eq('[2012-07-19 Thu]')
     end
 
     it "should be able to print itself in eng form" do
-      Date.today.eng.should eq('July 18, 2012')
-      (Date.today + 1.day).eng.should eq('July 19, 2012')
+      expect(Date.today.eng).to eq('July 18, 2012')
+      expect((Date.today + 1.day).eng).to eq('July 19, 2012')
     end
 
     it "should be able to state its quarter" do
-      Date.today.quarter.should eq(3)
-      Date.parse('2012-02-29').quarter.should eq(1)
-      Date.parse('2012-01-01').quarter.should eq(1)
-      Date.parse('2012-03-31').quarter.should eq(1)
-      Date.parse('2012-04-01').quarter.should eq(2)
-      Date.parse('2012-05-15').quarter.should eq(2)
-      Date.parse('2012-06-30').quarter.should eq(2)
-      Date.parse('2012-07-01').quarter.should eq(3)
-      Date.parse('2012-08-15').quarter.should eq(3)
-      Date.parse('2012-09-30').quarter.should eq(3)
-      Date.parse('2012-10-01').quarter.should eq(4)
-      Date.parse('2012-11-15').quarter.should eq(4)
-      Date.parse('2012-12-31').quarter.should eq(4)
+      expect(Date.today.quarter).to eq(3)
+      expect(Date.parse('2012-02-29').quarter).to eq(1)
+      expect(Date.parse('2012-01-01').quarter).to eq(1)
+      expect(Date.parse('2012-03-31').quarter).to eq(1)
+      expect(Date.parse('2012-04-01').quarter).to eq(2)
+      expect(Date.parse('2012-05-15').quarter).to eq(2)
+      expect(Date.parse('2012-06-30').quarter).to eq(2)
+      expect(Date.parse('2012-07-01').quarter).to eq(3)
+      expect(Date.parse('2012-08-15').quarter).to eq(3)
+      expect(Date.parse('2012-09-30').quarter).to eq(3)
+      expect(Date.parse('2012-10-01').quarter).to eq(4)
+      expect(Date.parse('2012-11-15').quarter).to eq(4)
+      expect(Date.parse('2012-12-31').quarter).to eq(4)
     end
 
     it "should know about years" do
-      Date.parse('2013-01-01').should be_beginning_of_year
-      Date.parse('2013-12-31').should be_end_of_year
-      Date.parse('2013-04-01').should_not be_beginning_of_year
-      Date.parse('2013-12-30').should_not be_end_of_year
+      expect(Date.parse('2013-01-01')).to be_beginning_of_year
+      expect(Date.parse('2013-12-31')).to be_end_of_year
+      expect(Date.parse('2013-04-01')).to_not be_beginning_of_year
+      expect(Date.parse('2013-12-30')).to_not be_end_of_year
     end
 
     it "should know about quarters" do
-      Date.parse('2013-01-01').should be_beginning_of_quarter
-      Date.parse('2013-12-31').should be_end_of_quarter
-      Date.parse('2013-04-01').should be_beginning_of_quarter
-      Date.parse('2013-06-30').should be_end_of_quarter
-      Date.parse('2013-05-01').should_not be_beginning_of_quarter
-      Date.parse('2013-07-31').should_not be_end_of_quarter
+      expect(Date.parse('2013-01-01')).to be_beginning_of_quarter
+      expect(Date.parse('2013-12-31')).to be_end_of_quarter
+      expect(Date.parse('2013-04-01')).to be_beginning_of_quarter
+      expect(Date.parse('2013-06-30')).to be_end_of_quarter
+      expect(Date.parse('2013-05-01')).to_not be_beginning_of_quarter
+      expect(Date.parse('2013-07-31')).to_not be_end_of_quarter
     end
 
     it "should know about bimonths" do
-      Date.parse('2013-11-04').beginning_of_bimonth.should eq Date.parse('2013-11-01')
-      Date.parse('2013-11-04').end_of_bimonth.should eq Date.parse('2013-12-31')
-      Date.parse('2013-03-01').should be_beginning_of_bimonth
-      Date.parse('2013-04-30').should be_end_of_bimonth
-      Date.parse('2013-01-01').should be_beginning_of_bimonth
-      Date.parse('2013-12-31').should be_end_of_bimonth
-      Date.parse('2013-05-01').should be_beginning_of_bimonth
-      Date.parse('2013-06-30').should be_end_of_bimonth
-      Date.parse('2013-06-01').should_not be_beginning_of_bimonth
-      Date.parse('2013-07-31').should_not be_end_of_bimonth
+      expect(Date.parse('2013-11-04').beginning_of_bimonth).to eq Date.parse('2013-11-01')
+      expect(Date.parse('2013-11-04').end_of_bimonth).to eq Date.parse('2013-12-31')
+      expect(Date.parse('2013-03-01')).to be_beginning_of_bimonth
+      expect(Date.parse('2013-04-30')).to be_end_of_bimonth
+      expect(Date.parse('2013-01-01')).to be_beginning_of_bimonth
+      expect(Date.parse('2013-12-31')).to be_end_of_bimonth
+      expect(Date.parse('2013-05-01')).to be_beginning_of_bimonth
+      expect(Date.parse('2013-06-30')).to be_end_of_bimonth
+      expect(Date.parse('2013-06-01')).to_not be_beginning_of_bimonth
+      expect(Date.parse('2013-07-31')).to_not be_end_of_bimonth
     end
 
     it "should know about months" do
-      Date.parse('2013-01-01').should be_beginning_of_month
-      Date.parse('2013-12-31').should be_end_of_month
-      Date.parse('2013-05-01').should be_beginning_of_month
-      Date.parse('2013-07-31').should be_end_of_month
-      Date.parse('2013-05-02').should_not be_beginning_of_month
-      Date.parse('2013-07-30').should_not be_end_of_month
+      expect(Date.parse('2013-01-01')).to be_beginning_of_month
+      expect(Date.parse('2013-12-31')).to be_end_of_month
+      expect(Date.parse('2013-05-01')).to be_beginning_of_month
+      expect(Date.parse('2013-07-31')).to be_end_of_month
+      expect(Date.parse('2013-05-02')).to_not be_beginning_of_month
+      expect(Date.parse('2013-07-30')).to_not be_end_of_month
     end
 
     it "should know about semimonths" do
-      Date.parse('2013-11-24').beginning_of_semimonth.should eq Date.parse('2013-11-16')
-      Date.parse('2013-11-04').beginning_of_semimonth.should eq Date.parse('2013-11-01')
-      Date.parse('2013-11-04').end_of_semimonth.should eq Date.parse('2013-11-15')
-      Date.parse('2013-11-24').end_of_semimonth.should eq Date.parse('2013-11-30')
-      Date.parse('2013-03-01').should be_beginning_of_semimonth
-      Date.parse('2013-03-16').should be_beginning_of_semimonth
-      Date.parse('2013-04-15').should be_end_of_semimonth
-      Date.parse('2013-04-30').should be_end_of_semimonth
+      expect(Date.parse('2013-11-24').beginning_of_semimonth).to eq Date.parse('2013-11-16')
+      expect(Date.parse('2013-11-04').beginning_of_semimonth).to eq Date.parse('2013-11-01')
+      expect(Date.parse('2013-11-04').end_of_semimonth).to eq Date.parse('2013-11-15')
+      expect(Date.parse('2013-11-24').end_of_semimonth).to eq Date.parse('2013-11-30')
+      expect(Date.parse('2013-03-01')).to be_beginning_of_semimonth
+      expect(Date.parse('2013-03-16')).to be_beginning_of_semimonth
+      expect(Date.parse('2013-04-15')).to be_end_of_semimonth
+      expect(Date.parse('2013-04-30')).to be_end_of_semimonth
     end
 
     it "should know about biweeks" do
-      Date.parse('2013-11-07').beginning_of_biweek.should eq Date.parse('2013-11-04')
-      Date.parse('2013-11-07').end_of_biweek.should eq Date.parse('2013-11-17')
-      Date.parse('2013-03-11').should be_beginning_of_biweek
-      Date.parse('2013-03-24').should be_end_of_biweek
+      expect(Date.parse('2013-11-07').beginning_of_biweek).to eq Date.parse('2013-11-04')
+      expect(Date.parse('2013-11-07').end_of_biweek).to eq Date.parse('2013-11-17')
+      expect(Date.parse('2013-03-11')).to be_beginning_of_biweek
+      expect(Date.parse('2013-03-24')).to be_end_of_biweek
     end
 
     it "should know about weeks" do
-      Date.parse('2013-11-04').should be_beginning_of_week
-      Date.parse('2013-11-10').should be_end_of_week
-      Date.parse('2013-12-02').should be_beginning_of_week
-      Date.parse('2013-12-08').should be_end_of_week
-      Date.parse('2013-10-13').should_not be_beginning_of_week
-      Date.parse('2013-10-19').should_not be_end_of_week
+      expect(Date.parse('2013-11-04')).to be_beginning_of_week
+      expect(Date.parse('2013-11-10')).to be_end_of_week
+      expect(Date.parse('2013-12-02')).to be_beginning_of_week
+      expect(Date.parse('2013-12-08')).to be_end_of_week
+      expect(Date.parse('2013-10-13')).to_not be_beginning_of_week
+      expect(Date.parse('2013-10-19')).to_not be_end_of_week
     end
 
     it "should know the beginning of chunks" do
-      Date.parse('2013-11-04').beginning_of_chunk(:year).should eq Date.parse('2013-01-01')
-      Date.parse('2013-11-04').beginning_of_chunk(:quarter).should eq Date.parse('2013-10-01')
-      Date.parse('2013-12-04').beginning_of_chunk(:bimonth).should eq Date.parse('2013-11-01')
-      Date.parse('2013-11-04').beginning_of_chunk(:month).should eq Date.parse('2013-11-01')
-      Date.parse('2013-11-04').beginning_of_chunk(:semimonth).should eq Date.parse('2013-11-01')
-      Date.parse('2013-11-24').beginning_of_chunk(:semimonth).should eq Date.parse('2013-11-16')
-      Date.parse('2013-11-08').beginning_of_chunk(:biweek).should eq Date.parse('2013-11-04')
-      Date.parse('2013-11-08').beginning_of_chunk(:week).should eq Date.parse('2013-11-04')
+      expect(Date.parse('2013-11-04').beginning_of_chunk(:year)).to eq Date.parse('2013-01-01')
+      expect(Date.parse('2013-11-04').beginning_of_chunk(:quarter)).to eq Date.parse('2013-10-01')
+      expect(Date.parse('2013-12-04').beginning_of_chunk(:bimonth)).to eq Date.parse('2013-11-01')
+      expect(Date.parse('2013-11-04').beginning_of_chunk(:month)).to eq Date.parse('2013-11-01')
+      expect(Date.parse('2013-11-04').beginning_of_chunk(:semimonth)).to eq Date.parse('2013-11-01')
+      expect(Date.parse('2013-11-24').beginning_of_chunk(:semimonth)).to eq Date.parse('2013-11-16')
+      expect(Date.parse('2013-11-08').beginning_of_chunk(:biweek)).to eq Date.parse('2013-11-04')
+      expect(Date.parse('2013-11-08').beginning_of_chunk(:week)).to eq Date.parse('2013-11-04')
       expect {
         Date.parse('2013-11-04').beginning_of_chunk(:wek)
       }.to raise_error
     end
 
     it "should know the end of chunks" do
-      Date.parse('2013-07-04').end_of_chunk(:year).should eq Date.parse('2013-12-31')
-      Date.parse('2013-07-04').end_of_chunk(:quarter).should eq Date.parse('2013-09-30')
-      Date.parse('2013-12-04').end_of_chunk(:bimonth).should eq Date.parse('2013-12-31')
-      Date.parse('2013-07-04').end_of_chunk(:month).should eq Date.parse('2013-07-31')
-      Date.parse('2013-11-04').end_of_chunk(:semimonth).should eq Date.parse('2013-11-15')
-      Date.parse('2013-11-24').end_of_chunk(:semimonth).should eq Date.parse('2013-11-30')
-      Date.parse('2013-11-08').end_of_chunk(:biweek).should eq Date.parse('2013-11-17')
-      Date.parse('2013-07-04').end_of_chunk(:week).should eq Date.parse('2013-07-07')
+      expect(Date.parse('2013-07-04').end_of_chunk(:year)).to eq Date.parse('2013-12-31')
+      expect(Date.parse('2013-07-04').end_of_chunk(:quarter)).to eq Date.parse('2013-09-30')
+      expect(Date.parse('2013-12-04').end_of_chunk(:bimonth)).to eq Date.parse('2013-12-31')
+      expect(Date.parse('2013-07-04').end_of_chunk(:month)).to eq Date.parse('2013-07-31')
+      expect(Date.parse('2013-11-04').end_of_chunk(:semimonth)).to eq Date.parse('2013-11-15')
+      expect(Date.parse('2013-11-24').end_of_chunk(:semimonth)).to eq Date.parse('2013-11-30')
+      expect(Date.parse('2013-11-08').end_of_chunk(:biweek)).to eq Date.parse('2013-11-17')
+      expect(Date.parse('2013-07-04').end_of_chunk(:week)).to eq Date.parse('2013-07-07')
       expect {
         Date.parse('2013-11-04').end_of_chunk(:wek)
       }.to raise_error
     end
 
     it "should know how to expand to chunk periods" do
-      Date.parse('2013-07-04').expand_to_period(:year).
-        should eq Period.new(Date.parse('2013-01-01'), Date.parse('2013-12-31'))
-      Date.parse('2013-07-04').expand_to_period(:quarter).
-        should eq Period.new(Date.parse('2013-07-01'), Date.parse('2013-09-30'))
-      Date.parse('2013-07-04').expand_to_period(:bimonth).
-        should eq Period.new(Date.parse('2013-07-01'), Date.parse('2013-08-31'))
-      Date.parse('2013-07-04').expand_to_period(:month).
-        should eq Period.new(Date.parse('2013-07-01'), Date.parse('2013-07-31'))
-      Date.parse('2013-07-04').expand_to_period(:semimonth).
-        should eq Period.new(Date.parse('2013-07-01'), Date.parse('2013-07-15'))
-      Date.parse('2013-07-04').expand_to_period(:biweek).
-        should eq Period.new(Date.parse('2013-07-01'), Date.parse('2013-07-14'))
-      Date.parse('2013-07-04').expand_to_period(:week).
-        should eq Period.new(Date.parse('2013-07-01'), Date.parse('2013-07-07'))
-      Date.parse('2013-07-04').expand_to_period(:day).
-        should eq Period.new(Date.parse('2013-07-04'), Date.parse('2013-07-04'))
+      expect(Date.parse('2013-07-04').expand_to_period(:year)).to eq Period.new('2013-01-01', '2013-12-31')
+      expect(Date.parse('2013-07-04').expand_to_period(:quarter)).to eq Period.new('2013-07-01', '2013-09-30')
+      expect(Date.parse('2013-07-04').expand_to_period(:bimonth)).to eq Period.new('2013-07-01', '2013-08-31')
+      expect(Date.parse('2013-07-04').expand_to_period(:month)).to eq Period.new('2013-07-01', '2013-07-31')
+      expect(Date.parse('2013-07-04').expand_to_period(:semimonth)).to eq Period.new('2013-07-01', '2013-07-15')
+      expect(Date.parse('2013-07-04').expand_to_period(:biweek)).to eq Period.new('2013-07-01', '2013-07-14')
+      expect(Date.parse('2013-07-04').expand_to_period(:week)).to eq Period.new('2013-07-01', '2013-07-07')
+      expect(Date.parse('2013-07-04').expand_to_period(:day)).to eq Period.new('2013-07-04', '2013-07-04')
     end
   end
 end