bahai_date 1.0.0 → 1.1.0

data/spec/bahai_date/day_spec.rb

@@ -1,12 +1,7 @@
-require 'bahai_date/day'
-require 'bahai_date/weekday'
-require 'bahai_date/occasion_factory'
-
 module BahaiDate
-
   describe Day do
 
-    it "can be created given a number from 1 to 19" do
+    it 'can be created given a number from 1 to 19' do
       expect(Day.new(1)).to_not be_nil
       expect(Day.new(19)).to_not be_nil
     end
@@ -24,45 +19,43 @@ module BahaiDate
 
     subject(:day) { Day.new(1) }
 
-    it "can be converted to string" do
-      expect(day.to_s).to eq "Baha"
+    it 'can be converted to string' do
+      expect(day.to_s).to eq 'Baha'
     end
 
-    it "provides access to the day number" do
+    it 'provides access to the day number' do
       expect(day.number).to be 1
     end
 
-    it "provides access to the translated title" do
-      expect(day.translation).to eq "Splendour"
+    it 'provides access to the translated title' do
+      expect(day.translation).to eq 'Splendour'
     end
 
-    it "provides access to the title in HTML" do
-      expect(day.html).to eq "Bahá"
+    it 'provides access to the title in HTML' do
+      expect(day.html).to eq 'Bahá'
     end
 
-    context "working with the weekday" do
-      it "is initially nil" do
+    context 'working with the weekday' do
+      it 'is initially nil' do
         expect(day.weekday).to be_nil
       end
 
-      it "can be set" do
-        weekday = day.set_weekday(Weekday.new(1))
+      it 'can be set' do
+        weekday = day.weekday = Weekday.new(1)
         expect(day.weekday).to be weekday
       end
     end
 
-    context "working with the occasions" do
-      it "is initially nil" do
+    context 'working with the occasions' do
+      it 'is initially nil' do
         expect(day.occasions).to be_nil
       end
 
-      it "can be set" do
-        occasions = day.set_occasions(OccasionFactory.new(1, 1, 1).occasions)
+      it 'can be set' do
+        occasions = day.occasions = OccasionFactory.new(1, 1, 1).occasions
         expect(day.occasions).to be occasions
       end
     end
 
-
   end
-
 end

data/spec/bahai_date/month_spec.rb

@@ -1,9 +1,6 @@
-require 'bahai_date/month'
-
 module BahaiDate
-
   describe Month do
-    it "can be created given a number from 1 to 19 or -1" do
+    it 'can be created given a number from 1 to 19 or -1' do
       expect(Month.new(1)).to_not be_nil
       expect(Month.new(19)).to_not be_nil
       expect(Month.new(-1)).to_not be_nil
@@ -23,53 +20,52 @@ module BahaiDate
         ArgumentError, "'0' is not a valid month. Please use 1 to 19 or -1 for Ayyam-i-Ha.")
     end
 
-    context "when created using -1" do
+    context 'when created using -1' do
 
-      it "has a title of Ayyam-i-Ha" do
+      it 'has a title of Ayyam-i-Ha' do
         month = Month.new(-1)
 
-        expect(month.to_s).to eq "Ayyam-i-Ha"
+        expect(month.to_s).to eq 'Ayyam-i-Ha'
       end
     end
 
     subject(:month) { Month.new(1) }
 
-    it "can be converted to string" do
-      expect(month.to_s).to eq "Baha"
+    it 'can be converted to string' do
+      expect(month.to_s).to eq 'Baha'
     end
 
-    it "provides access to the month number" do
+    it 'provides access to the month number' do
       expect(month.number).to be 1
     end
 
-    it "provides access to the translated title" do
-      expect(month.translation).to eq "Splendour"
+    it 'provides access to the translated title' do
+      expect(month.translation).to eq 'Splendour'
     end
 
-    it "provides access to the title in HTML" do
-      expect(month.html).to eq "Bahá"
+    it 'provides access to the title in HTML' do
+      expect(month.html).to eq 'Bahá'
     end
 
-    context "working with a hash of days" do
-      it "is readable" do
+    context 'working with a hash of days' do
+      it 'is readable' do
         month = Month.new(1)
         expect(month.days).to eq({})
       end
 
-      it "can be added to" do
+      it 'can be added to' do
         month = Month.new(1)
-        month.set_day(1)
+        month.add_day(1)
         expect(month.days[1].number).to be 1
       end
 
       it "doesn't create a new Day object if one exists" do
         month = Month.new(1)
-        day = month.set_day(1)
-        month.set_day(1)
+        day = month.add_day(1)
+        month.add_day(1)
         expect(month.days[1]).to be day
       end
     end
 
   end
-
 end

data/spec/bahai_date/occasion_factory_spec.rb

@@ -1,63 +1,60 @@
-require 'bahai_date/occasion_factory'
-
 module BahaiDate
-
   describe OccasionFactory do
 
-    it "can be created given a year, month, and day" do
+    it 'can be created given a year, month, and day' do
       occasion_factory = OccasionFactory.new(1, 1, 1)
       expect(occasion_factory).not_to be_nil
     end
 
-    it "provides a valid occasion for feast days" do
+    it 'provides a valid occasion for feast days' do
       occasions = OccasionFactory.new(1, 2, 1).occasions
       expect(occasions.first.type).to eq :feast
     end
 
-    it "provides a valid occasion for days of fasting" do
+    it 'provides a valid occasion for days of fasting' do
       occasions = OccasionFactory.new(1, 19, 2).occasions
       expect(occasions.first.type).to eq :fasting
     end
 
-    it "provides a valid occasion for days during ayyam-i-ha" do
+    it 'provides a valid occasion for days during ayyam-i-ha' do
       occasions = OccasionFactory.new(1, -1, 1).occasions
       expect(occasions.first.type).to eq :ayyam_i_ha
     end
 
-    it "provides a valid occasion for days during the festival of ridvan" do
+    it 'provides a valid occasion for days during the festival of ridvan' do
       occasions = OccasionFactory.new(1, 2, 14).occasions
       expect(occasions.first.type).to eq :ridvan
     end
 
-    it "provides a valid occasion for holy days" do
+    it 'provides a valid occasion for holy days' do
       occasions = OccasionFactory.new(1, 1, 1).occasions
       expect(occasions.first.type).to eq :holy
     end
 
-    it "provides valid occasions when more than one occurs on the same day" do
+    it 'provides valid occasions when more than one occurs on the same day' do
       occasions = OccasionFactory.new(1, 1, 1).occasions
       expect(occasions.size).to be 2
       expect(occasions.first.type).to eq :holy
       expect(occasions.last.type).to eq :feast
     end
 
-    context "for dates before 172 B.E." do
-      it "provides the Declaration of the Bab on the correct day" do
+    context 'for dates before 172 B.E.' do
+      it 'provides the Declaration of the Bab on the correct day' do
         occasions = OccasionFactory.new(1, 4, 7).occasions
-        expect(occasions.first.short_title).to eq "Declaration of the Bab"
+        expect(occasions.first.short_title).to eq 'Declaration of the Bab'
 
         occasions = OccasionFactory.new(1, 4, 8).occasions
         expect(occasions.size).to be 0
       end
 
-      it "provides the Martyrdom of the Bab on the correct day" do
+      it 'provides the Martyrdom of the Bab on the correct day' do
         occasions = OccasionFactory.new(1, 6, 16).occasions
-        expect(occasions.first.short_title).to eq "Martyrdom of the Bab"
+        expect(occasions.first.short_title).to eq 'Martyrdom of the Bab'
       end
 
-      it "provides the Birth of the Bab on the correct day" do
+      it 'provides the Birth of the Bab on the correct day' do
         occasions = OccasionFactory.new(1, 12, 5).occasions
-        expect(occasions.first.short_title).to eq "Birth of the Bab"
+        expect(occasions.first.short_title).to eq 'Birth of the Bab'
       end
 
       it "provides the Birth of Baha'u'llah on the correct day" do
@@ -66,27 +63,26 @@ module BahaiDate
       end
     end
 
-    context "for dates after 172 B.E." do
-      it "provides the Declaration of the Bab on the correct day" do
+    context 'for dates after 172 B.E.' do
+      it 'provides the Declaration of the Bab on the correct day' do
         occasions = OccasionFactory.new(172, 4, 7).occasions
         expect(occasions.size).to be 0
 
         occasions = OccasionFactory.new(172, 4, 8).occasions
-        expect(occasions.first.short_title).to eq "Declaration of the Bab"
+        expect(occasions.first.short_title).to eq 'Declaration of the Bab'
       end
 
-      it "provides the Martyrdom of the Bab on the correct day" do
+      it 'provides the Martyrdom of the Bab on the correct day' do
         occasions = OccasionFactory.new(172, 6, 17).occasions
-        expect(occasions.first.short_title).to eq "Martyrdom of the Bab"
+        expect(occasions.first.short_title).to eq 'Martyrdom of the Bab'
       end
 
-      it "provides the Birth of the Bab on the correct day" do
+      it 'provides the Birth of the Bab on the correct day' do
         occasions = OccasionFactory.new(172, 13, 10).occasions
-        expect(occasions.first.short_title).to eq "Birth of the Bab"
+        expect(occasions.first.short_title).to eq 'Birth of the Bab'
       end
 
     end
 
   end
-
 end

data/spec/bahai_date/occasion_spec.rb

@@ -1,28 +1,22 @@
-require 'bahai_date/occasion'
-
 module BahaiDate
-
   describe Occasion do
 
-    subject(:occasion) {
-      Occasion.new({
-        :type => :ayyam_i_ha,
-        :work_suspended => false,
-        :title => "Test title",
-        :short_title => "Test short title",
-        :title_html => "Test title html",
-        :short_title_html => "Test short title html"
-      })
-    }
- 
-    it "can be created given an options hash" do
+    subject(:occasion) do
+      Occasion.new(type: :ayyam_i_ha,
+                    work_suspended: false,
+                    title: 'Test title',
+                    short_title: 'Test short title',
+                    title_html: 'Test title html',
+                    short_title_html: 'Test short title html             ')
+    end
+
+    it 'can be created given an options hash' do
       expect(occasion).not_to be_nil
     end
 
-    it "exposes a work_suspended? method" do
-      expect(occasion.work_suspended?).to be false 
+    it 'exposes a work_suspended? method' do
+      expect(occasion.work_suspended?).to be false
     end
 
   end
-
 end

data/spec/bahai_date/weekday_spec.rb

@@ -1,9 +1,6 @@
-require 'bahai_date/weekday'
-
 module BahaiDate
-
   describe Weekday do
-    it "can be created given a number from 1 to 7" do
+    it 'can be created given a number from 1 to 7' do
       expect(Weekday.new(1)).to_not be_nil
       expect(Weekday.new(7)).to_not be_nil
     end
@@ -21,26 +18,25 @@ module BahaiDate
 
     subject(:weekday) { Weekday.new(1) }
 
-    it "can be converted to string" do
-      expect(weekday.to_s).to eq "Jalal"
+    it 'can be converted to string' do
+      expect(weekday.to_s).to eq 'Jalal'
     end
 
-    it "provides access to the day number" do
+    it 'provides access to the day number' do
       expect(weekday.number).to be 1
     end
 
-    it "provides access to the translated title" do
-      expect(weekday.translation).to eq "Glory"
+    it 'provides access to the translated title' do
+      expect(weekday.translation).to eq 'Glory'
     end
 
-    it "provides access to the title in HTML" do
-      expect(weekday.html).to eq "Jalál"
+    it 'provides access to the title in HTML' do
+      expect(weekday.html).to eq 'Jalál'
     end
 
-    it "provides access to the English equivalent" do
-      expect(weekday.english_equivalent).to eq("Saturday")
+    it 'provides access to the English equivalent' do
+      expect(weekday.english_equivalent).to eq('Saturday')
     end
 
   end
-
 end

data/spec/bahai_date/year_calendar_spec.rb

@@ -1,20 +1,17 @@
-require 'bahai_date/year_calendar'
-
 module BahaiDate
-
   describe YearCalendar do
 
     subject(:year_calendar) { YearCalendar.new(1) }
 
-    it "can be created" do
+    it 'can be created' do
       expect(year_calendar).not_to be_nil
     end
 
-    it "is an instance of year" do
+    it 'is an instance of year' do
       expect(year_calendar).to be_a Year
     end
 
-    it "has months set" do
+    it 'has months set' do
       months = year_calendar.months
       expect(months.size).to be 20
       expect(months[-1]).not_to be_nil
@@ -22,24 +19,23 @@ module BahaiDate
       expect(months[19]).not_to be_nil
     end
 
-    it "has days set" do
+    it 'has days set' do
       days = year_calendar.months[1].days
       expect(days.size).to be 19
       expect(days[1]).not_to be_nil
       expect(days[19]).not_to be_nil
     end
 
-    it "has weekdays set" do
+    it 'has weekdays set' do
       day = year_calendar.months[1].days[1]
       expect(day.weekday).not_to be_nil
       expect(day.weekday.number).to be 6
     end
 
-    it "has occasions set" do
+    it 'has occasions set' do
       day = year_calendar.months[1].days[1]
       expect(day.occasions.size).to be 2
     end
 
   end
-
 end

data/spec/bahai_date/year_data_spec.rb

@@ -1,19 +1,15 @@
-require 'bahai_date/year_data'
-
 module BahaiDate
-
   describe YearData do
 
-    it "supplies a Date object for Naw Ruz of a given year" do
-      expect(YearData.nawruz_for(1844)).to eq(Date.new(1844,3,21))
+    it 'supplies a Date object for Naw Ruz of a given year' do
+      expect(YearData.nawruz_for(1844)).to eq(Date.new(1844, 3, 21))
     end
 
-    it "determines whether a year is leap or not" do
-      expect(YearData.is_leap?(1)).to eq(false)
-      expect(YearData.is_leap?(4)).to eq(true)
-      expect(YearData.is_leap?(168)).to eq(true)
+    it 'determines whether a year is leap or not' do
+      expect(YearData.leap?(1)).to eq(false)
+      expect(YearData.leap?(4)).to eq(true)
+      expect(YearData.leap?(168)).to eq(true)
     end
 
   end
-
 end

data/spec/bahai_date/year_spec.rb

@@ -1,9 +1,6 @@
-require 'bahai_date/year'
-
 module BahaiDate
-
   describe Year do
-    it "can be created given a number greater than or equal to 1" do
+    it 'can be created given a number greater than or equal to 1' do
       expect(Year.new(1)).to_not be_nil
       expect(Year.new(160)).to_not be_nil
     end
@@ -18,35 +15,35 @@ module BahaiDate
 
     subject(:year) { Year.new(1) }
 
-    it "can be converted to string showing the B.E. number" do
-      expect(year.to_s).to eq "1"
+    it 'can be converted to string showing the B.E. number' do
+      expect(year.to_s).to eq '1'
     end
 
-    it "provides access to the title" do
-      expect(year.title).to eq "Alif"
+    it 'provides access to the title' do
+      expect(year.title).to eq 'Alif'
     end
 
-    it "provides access to the year number" do
+    it 'provides access to the year number' do
       expect(year.number).to be 1
     end
 
-    it "provides access to the translated title" do
-      expect(year.translation).to eq "A"
+    it 'provides access to the translated title' do
+      expect(year.translation).to eq 'A'
     end
 
-    it "provides access to the title in HTML" do
-      expect(year.html).to eq "Alif"
+    it 'provides access to the title in HTML' do
+      expect(year.html).to eq 'Alif'
     end
 
-    it "provides access to the vahid" do
+    it 'provides access to the vahid' do
       expect(year.vahid).to be 1
     end
 
-    it "provides access to the kull-i-shay" do
+    it 'provides access to the kull-i-shay' do
       expect(year.kull_i_shay).to be 1
     end
 
-    it "calculates the number properly" do
+    it 'calculates the number properly' do
       year = Year.new(1)
       expect(year.number).to eq(1)
 
@@ -63,7 +60,7 @@ module BahaiDate
       expect(year.number).to eq(1)
     end
 
-    it "calculates the vahid properly" do
+    it 'calculates the vahid properly' do
       year = Year.new(1)
       expect(year.vahid).to eq(1)
 
@@ -77,7 +74,7 @@ module BahaiDate
       expect(year.vahid).to eq(1)
     end
 
-    it "calculates the kull-i-shay properly" do
+    it 'calculates the kull-i-shay properly' do
       year = Year.new(1)
       expect(year.kull_i_shay).to eq(1)
 
@@ -88,26 +85,25 @@ module BahaiDate
       expect(year.kull_i_shay).to eq(2)
     end
 
-    context "working with a hash of months" do
-      it "is readable" do
+    context 'working with a hash of months' do
+      it 'is readable' do
         year = Year.new(1)
         expect(year.months).to eq({})
       end
 
-      it "can be added to" do
+      it 'can be added to' do
         year = Year.new(1)
-        year.set_month(-1)
-        expect(year.months[-1].number).to be -1
+        year.add_month(-1)
+        expect(year.months[-1].number).to be(-1)
       end
 
       it "doesn't create a new Month object if one exists" do
         year = Year.new(1)
-        month = year.set_month(1)
-        year.set_month(1)
+        month = year.add_month(1)
+        year.add_month(1)
         expect(year.months[1]).to be month
       end
     end
 
   end
-
 end