bahai_date 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1bf017cb487023f0e7ab6115e4c1839a66f3307
-  data.tar.gz: 3adcfdbd2a55f8eeeb1b23b4c942a152d5bfe837
+  metadata.gz: 7e66f7ba2f2bf6e012d017503403d74ba8b81b9f
+  data.tar.gz: 17455cd3d5ab3ee6cda1e8eca220b63727a9b744
 SHA512:
-  metadata.gz: 9f6960b106cca757a3552c5e6317e7c2dcbce15b75e4834a06deb4af323b0bf6d0eca3a9f40ecc2d4138b01694f1bb243740e774ccf99c220d3170cb94cfa366
-  data.tar.gz: c7f8a5e7e7d0abdc3f4623bbcd7fe91b1bebd48b2bc115a3615e7d70364af1dafd93fef834eb98e4a9cf38f7f521d7d344684b6e2a32df4fddc7499a054429af
+  metadata.gz: 8296ccb87541543b41f0d43cf38d597b13d83a9d3df2e2bd8f7d7d8c60632018391e166b731e3a8403b2b1484cde593d4d87eb3bf1f7b782bc90547c24e6bf09
+  data.tar.gz: 763879ca381dd8ad9424419326cb620def1fed5cd3b1b4f11a3fa7c74c39a45778cdac082a8f58ab00d95c6b0658a2b755c64ab3da7ca71a4e5b66909078a014

data/README.md

@@ -16,6 +16,15 @@ The calendar begins on the vernal equinox, normally on the 20th or 21st of March
 More information about this calendar is on the [Wikipedia entry](http://en.wikipedia.org/wiki/Bah%C3%A1'%C3%AD_calendar).
 
 
+Calculations
+------------
+The source of the algorithms used to determine the vernal equinox and lunar
+phases is the book [*Astronomical Algorithms*](http://www.willbell.com/math/mc1.htm) by Jean Meeus, which has become an authority on this subject in computer science circles (for example, [NASA uses it](http://eclipse.gsfc.nasa.gov/phase/phasecat.html)). Some of the algorithms in the book have been implemented in the *astro-algo* ruby
+gem (https://rubygems.org/gems/astro-algo), which we use here.
+
+Also, the ruby gem *sunrise* (https://rubygems.org/gems/RubySunrise) is widely used to determine the time for sunrise/sunset at a given location, and we use it here.
+
+
 Functionality
 -------------
 A BahaiDate instance can be created either from a Gregorian date or supplying the year, month and day in the Baha'i calendar.
@@ -41,13 +50,13 @@ Example Usage
 -------------
 Creating an instance:
 ```ruby
-require "bahai_date"
+require 'bahai_date'
 
-today = BahaiDate.new(date: Date.today)
+today = BahaiDate::BahaiDate.new(date: Date.today)
 
 #or
 
-nawruz = BahaiDate.new(year: 171, month: 1, day: 1)
+nawruz = BahaiDate::BahaiDate.new(year: 171, month: 1, day: 1)
 ```
 
 Attributes:
@@ -65,7 +74,7 @@ gregorian_date: 2014-10-04
 
 Calendar:
 ```ruby
-calendar = YearCalendar.new(171)
+calendar = BahaiDate::YearCalendar.new(171)
 puts "Year: " + calendar.bahai_era.to_s
 puts "Month 1:" + calendar.months[1].title
 puts "  Day 1 in Month 1:" + calendar.months[1].days[1].title

data/lib/bahai_date.rb

@@ -1,11 +1,11 @@
-require "date"
-require "bahai_date/version"
-require "bahai_date/bahai_date"
-require "bahai_date/year"
-require "bahai_date/month"
-require "bahai_date/day"
-require "bahai_date/weekday"
-require "bahai_date/year_data"
-require "bahai_date/occasion"
-require "bahai_date/occasion_factory"
-require "bahai_date/year_calendar"
+require 'date'
+require 'bahai_date/version'
+require 'bahai_date/logic'
+require 'bahai_date/bahai_date'
+require 'bahai_date/year'
+require 'bahai_date/month'
+require 'bahai_date/day'
+require 'bahai_date/weekday'
+require 'bahai_date/occasion'
+require 'bahai_date/occasion_factory'
+require 'bahai_date/year_calendar'

data/lib/bahai_date/bahai_date.rb

@@ -1,9 +1,8 @@
 module BahaiDate
   class BahaiDate
-
     AYYAM_I_HA = -1
 
-    attr_reader :weekday, :day, :month, :year, :gregorian_date, :occasions
+    attr_reader :weekday, :day, :month, :year, :gregorian_date
 
     def initialize(params)
       if params[:date]
@@ -22,7 +21,10 @@ module BahaiDate
         fail ArgumentError, 'Invalid arguments. Use a hash with :date or with :year, :month, and :day.'
       end
       @weekday = Weekday.new(weekday_from_gregorian)
-      @occasions = OccasionFactory.new(@year.bahai_era, @month.number, @day.number).occasions
+    end
+
+    def occasions
+      OccasionFactory.new(@year.bahai_era, @month.number, @day.number).occasions
     end
 
     def to_s
@@ -44,24 +46,24 @@ module BahaiDate
     end
 
     def ayyam_i_ha_days(year = @year.bahai_era)
-      YearData.leap?(year) ? 5 : 4
+      Logic.leap?(year) ? 5 : 4
     end
 
     def to_gregorian
       year_gregorian = @year.bahai_era + 1844 - 1
-      nawruz = YearData.nawruz_for(year_gregorian)
+      nawruz = Logic.nawruz_for(year_gregorian)
       nawruz + days_from_nawruz
     end
 
     def from_gregorian
-      nawruz = YearData.nawruz_for(@gregorian_date.year)
+      nawruz = Logic.nawruz_for(@gregorian_date.year)
 
       year = @gregorian_date.year - 1844
       if @gregorian_date >= nawruz
         year += 1
         days = (@gregorian_date - nawruz).to_i
       else
-        days = (@gregorian_date - YearData.nawruz_for(@gregorian_date.year - 1)).to_i
+        days = (@gregorian_date - Logic.nawruz_for(@gregorian_date.year - 1)).to_i
       end
 
       # determine day and month, taking into account ayyam-i-ha

data/lib/bahai_date/logic.rb

@@ -0,0 +1,114 @@
+require 'bundler/setup'
+require 'tzinfo'
+require 'solareventcalculator'
+require 'astro-algo'
+
+module BahaiDate
+  class Logic
+    ####
+    # Note: This class uses dates in the Gregorian calendar internally, as they
+    # are used by the libraries which determine leap years, the spring equinox
+    # and lunar phases.
+    ####
+
+    # *** Latitude and longitude for Tehran, Iran ***
+    # Source: http://mynasadata.larc.nasa.gov/latitudelongitude-finder/
+    #         Latitude: 35° 41' 45.9996", Longitude: 51° 25' 23.0016"
+    # Converted to decimal using:
+    #         http://transition.fcc.gov/mb/audio/bickel/DDDMMSS-decimal.html
+    TEHRAN_LAT = BigDecimal.new('35.696111')
+    TEHRAN_LONG = BigDecimal.new('51.423056')
+
+    # *** Azimuth (for determining sunset times) ***
+    # Source: http://www.timeanddate.com/astronomy/about-sun-calculator.html
+    #         "Technically, sunrise and sunset are calculated based on the true geocentric position of the Sun at 90°50' from the zenith position (directly above the observer)."
+    # Converted to decimal using:
+    #         http://www.satsig.net/degrees-minutes-seconds-calculator.htm
+    AZIMUTH = 90.833333
+
+    def initialize
+      @tz = TZInfo::Timezone.get('Asia/Tehran')
+    end
+
+    def self.nawruz_for(year)
+      new.nawruz_date year
+    end
+
+    def self.leap?(year_bahai_era)
+      new.leap? year_bahai_era
+    end
+
+    def self.twin_holy_days_date(year_bahai_era)
+      new.twin_holy_days_for year_bahai_era
+    end
+
+    def nawruz_date(year)
+      if year < 2015
+        Date.new(year, 3, 21)
+      else
+        spring_equinox_in_tehran(year)
+      end
+    end
+
+    def nawruz_time(year)
+      sunset_time_for(nawruz_date(year))
+    end
+
+    def sunset_time_for(date)
+      calc = SolarEventCalculator.new(date, TEHRAN_LAT, TEHRAN_LONG)
+      sunset_time = calc.compute_utc_solar_event(AZIMUTH, false)
+      localize(sunset_time.utc)
+    end
+
+    def spring_equinox_in_tehran(year)
+      increment_if_after_sunset localize(Astro.date_of_vernal_equinox(year).to_utc)
+    end
+
+    def twin_holy_days_for(year_bahai_era)
+      gregorian_year = bahai_era_to_gregorian_year(year_bahai_era)
+      increment_if_after_sunset(eighth_new_moon_for(gregorian_year)) + 1
+    end
+
+    def eighth_new_moon_for(year)
+      nawruz = nawruz_time(year)
+      lunation = Astro.first_lunation_of_year(year)
+      lunation += 1 while new_moon(lunation) <= nawruz
+      new_moon(lunation + 7)
+    end
+
+    def new_moon(lunation)
+      localize(Astro.date_of_moon(lunation, Astro::PhaseNew).to_utc)
+    end
+
+    def leap?(year_bahai_era)
+      gregorian_year = bahai_era_to_gregorian_year(year_bahai_era)
+      if gregorian_year < 2015
+        Date.leap? gregorian_year + 1
+      else
+        leap_bahai_era? gregorian_year
+      end
+    end
+
+    def leap_bahai_era?(year)
+      (nawruz_date(year + 1) - nawruz_date(year)) == 366
+    end
+
+    def bahai_era_to_gregorian_year(year)
+      1843 + year
+    end
+
+    private
+
+    def localize(time)
+      (@tz.utc_to_local(time)).to_time
+    end
+
+    def increment_if_after_sunset(time)
+      date = time.to_date
+      if time > sunset_time_for(date)
+        date += 1
+      end
+      date
+    end
+  end
+end

data/lib/bahai_date/month.rb

@@ -45,7 +45,7 @@ module BahaiDate
 
     def validate(number_arg)
       number = number_arg.to_i
-      return if ((1..19).include?(number) || number == -1)
+      return if (1..19).include?(number) || number == -1
       fail ArgumentError, "'#{number}' is not a valid month. Please use 1 to 19 or -1 for Ayyam-i-Ha."
     end
   end

data/lib/bahai_date/occasion_factory.rb

@@ -137,144 +137,6 @@ module BahaiDate
       '6.17' => [:martyrdom_bab]
     }
 
-    DATES_LUNAR = {
-      172 => { '13.10' => [:birth_bab], '13.11' => [:birth_bahaullah] },
-      173 => { '12.18' => [:birth_bab], '12.19' => [:birth_bahaullah] },
-      174 => { '12.7'  => [:birth_bab], '12.8'  => [:birth_bahaullah] },
-      175 => { '13.6'  => [:birth_bab], '13.7'  => [:birth_bahaullah] },
-      176 => { '12.14' => [:birth_bab], '12.15' => [:birth_bahaullah] },
-      177 => { '12.4'  => [:birth_bab], '12.5'  => [:birth_bahaullah] },
-      178 => { '13.4'  => [:birth_bab], '13.5'  => [:birth_bahaullah] },
-      179 => { '12.11' => [:birth_bab], '12.12' => [:birth_bahaullah] },
-      180 => { '12.1'  => [:birth_bab], '12.2'  => [:birth_bahaullah] },
-      181 => { '12.19' => [:birth_bab], '13.1'  => [:birth_bahaullah] },
-      182 => { '12.8'  => [:birth_bab], '12.9'  => [:birth_bahaullah] },
-      183 => { '13.7'  => [:birth_bab], '13.8'  => [:birth_bahaullah] },
-      184 => { '12.15' => [:birth_bab], '12.16' => [:birth_bahaullah] },
-      185 => { '12.5'  => [:birth_bab], '12.6'  => [:birth_bahaullah] },
-      186 => { '13.5'  => [:birth_bab], '13.6'  => [:birth_bahaullah] },
-      187 => { '12.14' => [:birth_bab], '12.15' => [:birth_bahaullah] },
-      188 => { '12.2'  => [:birth_bab], '12.3'  => [:birth_bahaullah] },
-      189 => { '13.2'  => [:birth_bab], '13.3'  => [:birth_bahaullah] },
-      190 => { '12.10' => [:birth_bab], '12.11' => [:birth_bahaullah] },
-      191 => { '13.10' => [:birth_bab], '13.11' => [:birth_bahaullah] },
-      192 => { '12.17' => [:birth_bab], '12.18' => [:birth_bahaullah] },
-      193 => { '12.6'  => [:birth_bab], '12.7'  => [:birth_bahaullah] },
-      194 => { '13.6'  => [:birth_bab], '13.7'  => [:birth_bahaullah] },
-      195 => { '12.15' => [:birth_bab], '12.16' => [:birth_bahaullah] },
-      196 => { '12.4'  => [:birth_bab], '12.5'  => [:birth_bahaullah] },
-      197 => { '13.4'  => [:birth_bab], '13.5'  => [:birth_bahaullah] },
-      198 => { '12.12' => [:birth_bab], '12.13' => [:birth_bahaullah] },
-      199 => { '12.1'  => [:birth_bab], '12.2'  => [:birth_bahaullah] },
-      200 => { '12.19' => [:birth_bab], '13.1'  => [:birth_bahaullah] },
-      201 => { '12.8'  => [:birth_bab], '12.9'  => [:birth_bahaullah] },
-      202 => { '13.8'  => [:birth_bab], '13.9'  => [:birth_bahaullah] },
-      203 => { '12.16' => [:birth_bab], '12.17' => [:birth_bahaullah] },
-      204 => { '12.5'  => [:birth_bab], '12.6'  => [:birth_bahaullah] },
-      205 => { '13.5'  => [:birth_bab], '13.6'  => [:birth_bahaullah] },
-      206 => { '12.14' => [:birth_bab], '12.15' => [:birth_bahaullah] },
-      207 => { '12.3'  => [:birth_bab], '12.4'  => [:birth_bahaullah] },
-      208 => { '13.2'  => [:birth_bab], '13.3'  => [:birth_bahaullah] },
-      209 => { '12.10' => [:birth_bab], '12.11' => [:birth_bahaullah] },
-      210 => { '13.9'  => [:birth_bab], '13.10' => [:birth_bahaullah] },
-      211 => { '12.18' => [:birth_bab], '12.19' => [:birth_bahaullah] },
-      212 => { '12.6'  => [:birth_bab], '12.7'  => [:birth_bahaullah] },
-      213 => { '13.6'  => [:birth_bab], '13.7'  => [:birth_bahaullah] },
-      214 => { '12.15' => [:birth_bab], '12.16' => [:birth_bahaullah] },
-      215 => { '12.4'  => [:birth_bab], '12.5'  => [:birth_bahaullah] },
-      216 => { '13.4'  => [:birth_bab], '13.5'  => [:birth_bahaullah] },
-      217 => { '12.11' => [:birth_bab], '12.12' => [:birth_bahaullah] },
-      218 => { '11.19' => [:birth_bab], '12.1'  => [:birth_bahaullah] },
-      219 => { '12.19' => [:birth_bab], '13.1'  => [:birth_bahaullah] },
-      220 => { '12.9'  => [:birth_bab], '12.10' => [:birth_bahaullah] },
-      221 => { '13.8'  => [:birth_bab], '13.9'  => [:birth_bahaullah] },
-      222 => { '12.16' => [:birth_bab], '12.17' => [:birth_bahaullah] },
-      223 => { '12.6'  => [:birth_bab], '12.7'  => [:birth_bahaullah] },
-      224 => { '13.6'  => [:birth_bab], '13.7'  => [:birth_bahaullah] },
-      225 => { '12.13' => [:birth_bab], '12.14' => [:birth_bahaullah] },
-      226 => { '12.2'  => [:birth_bab], '12.3'  => [:birth_bahaullah] },
-      227 => { '13.2'  => [:birth_bab], '13.3'  => [:birth_bahaullah] },
-      228 => { '12.10' => [:birth_bab], '12.11' => [:birth_bahaullah] },
-      229 => { '13.9'  => [:birth_bab], '13.10' => [:birth_bahaullah] },
-      230 => { '12.18' => [:birth_bab], '12.19' => [:birth_bahaullah] },
-      231 => { '12.7'  => [:birth_bab], '12.8'  => [:birth_bahaullah] },
-      232 => { '13.7'  => [:birth_bab], '13.8'  => [:birth_bahaullah] },
-      233 => { '12.15' => [:birth_bab], '12.16' => [:birth_bahaullah] },
-      234 => { '12.4'  => [:birth_bab], '12.5'  => [:birth_bahaullah] },
-      235 => { '13.4'  => [:birth_bab], '13.5'  => [:birth_bahaullah] },
-      236 => { '12.12' => [:birth_bab], '12.13' => [:birth_bahaullah] },
-      237 => { '11.19' => [:birth_bab], '12.1'  => [:birth_bahaullah] },
-      238 => { '12.19' => [:birth_bab], '13.1'  => [:birth_bahaullah] },
-      239 => { '12.9'  => [:birth_bab], '12.10' => [:birth_bahaullah] },
-      240 => { '13.9'  => [:birth_bab], '13.10' => [:birth_bahaullah] },
-      241 => { '12.16' => [:birth_bab], '12.17' => [:birth_bahaullah] },
-      242 => { '12.6'  => [:birth_bab], '12.7'  => [:birth_bahaullah] },
-      243 => { '13.5'  => [:birth_bab], '13.6'  => [:birth_bahaullah] },
-      244 => { '12.13' => [:birth_bab], '12.14' => [:birth_bahaullah] },
-      245 => { '12.2'  => [:birth_bab], '12.3'  => [:birth_bahaullah] },
-      246 => { '13.1'  => [:birth_bab], '13.2'  => [:birth_bahaullah] },
-      247 => { '12.10' => [:birth_bab], '12.11' => [:birth_bahaullah] },
-      248 => { '13.10' => [:birth_bab], '13.11' => [:birth_bahaullah] },
-      249 => { '12.19' => [:birth_bab], '13.1'  => [:birth_bahaullah] },
-      250 => { '12.7'  => [:birth_bab], '12.8'  => [:birth_bahaullah] },
-      251 => { '13.7'  => [:birth_bab], '13.8'  => [:birth_bahaullah] },
-      252 => { '12.15' => [:birth_bab], '12.16' => [:birth_bahaullah] },
-      253 => { '12.4'  => [:birth_bab], '12.5'  => [:birth_bahaullah] },
-      254 => { '13.3'  => [:birth_bab], '13.4'  => [:birth_bahaullah] },
-      255 => { '12.11' => [:birth_bab], '12.12' => [:birth_bahaullah] },
-      256 => { '12.1'  => [:birth_bab], '12.2'  => [:birth_bahaullah] },
-      257 => { '13.1'  => [:birth_bab], '13.2'  => [:birth_bahaullah] },
-      258 => { '12.9'  => [:birth_bab], '12.10' => [:birth_bahaullah] },
-      259 => { '13.9'  => [:birth_bab], '13.10' => [:birth_bahaullah] },
-      260 => { '12.17' => [:birth_bab], '12.18' => [:birth_bahaullah] },
-      261 => { '12.6'  => [:birth_bab], '12.7'  => [:birth_bahaullah] },
-      262 => { '13.5'  => [:birth_bab], '13.6'  => [:birth_bahaullah] },
-      263 => { '12.13' => [:birth_bab], '12.14' => [:birth_bahaullah] },
-      264 => { '12.2'  => [:birth_bab], '12.3'  => [:birth_bahaullah] },
-      265 => { '13.2'  => [:birth_bab], '13.3'  => [:birth_bahaullah] },
-      266 => { '12.10' => [:birth_bab], '12.11' => [:birth_bahaullah] },
-      267 => { '13.10' => [:birth_bab], '13.11' => [:birth_bahaullah] },
-      268 => { '12.19' => [:birth_bab], '13.1'  => [:birth_bahaullah] },
-      269 => { '12.8'  => [:birth_bab], '12.9'  => [:birth_bahaullah] },
-      270 => { '13.7'  => [:birth_bab], '13.8'  => [:birth_bahaullah] },
-      271 => { '12.15' => [:birth_bab], '12.16' => [:birth_bahaullah] },
-      272 => { '12.4'  => [:birth_bab], '12.5'  => [:birth_bahaullah] },
-      273 => { '13.4'  => [:birth_bab], '13.5'  => [:birth_bahaullah] },
-      274 => { '12.11' => [:birth_bab], '12.12' => [:birth_bahaullah] },
-      275 => { '12.1'  => [:birth_bab], '12.2'  => [:birth_bahaullah] },
-      276 => { '13.1'  => [:birth_bab], '13.2'  => [:birth_bahaullah] },
-      277 => { '12.9'  => [:birth_bab], '12.10' => [:birth_bahaullah] },
-      278 => { '13.8'  => [:birth_bab], '13.9'  => [:birth_bahaullah] },
-      279 => { '12.16' => [:birth_bab], '12.17' => [:birth_bahaullah] },
-      280 => { '12.5'  => [:birth_bab], '12.6'  => [:birth_bahaullah] },
-      281 => { '13.5'  => [:birth_bab], '13.6'  => [:birth_bahaullah] },
-      282 => { '12.14' => [:birth_bab], '12.15' => [:birth_bahaullah] },
-      283 => { '12.2'  => [:birth_bab], '12.3'  => [:birth_bahaullah] },
-      284 => { '13.2'  => [:birth_bab], '13.3'  => [:birth_bahaullah] },
-      285 => { '12.11' => [:birth_bab], '12.12' => [:birth_bahaullah] },
-      286 => { '13.11' => [:birth_bab], '13.12' => [:birth_bahaullah] },
-      287 => { '12.18' => [:birth_bab], '12.19' => [:birth_bahaullah] },
-      288 => { '12.7'  => [:birth_bab], '12.8'  => [:birth_bahaullah] },
-      289 => { '13.7'  => [:birth_bab], '13.8'  => [:birth_bahaullah] },
-      290 => { '12.15' => [:birth_bab], '12.16' => [:birth_bahaullah] },
-      291 => { '12.4'  => [:birth_bab], '12.5'  => [:birth_bahaullah] },
-      292 => { '13.4'  => [:birth_bab], '13.5'  => [:birth_bahaullah] },
-      293 => { '12.12' => [:birth_bab], '12.13' => [:birth_bahaullah] },
-      294 => { '12.2'  => [:birth_bab], '12.3'  => [:birth_bahaullah] },
-      295 => { '13.1'  => [:birth_bab], '13.2'  => [:birth_bahaullah] },
-      296 => { '12.9'  => [:birth_bab], '12.10' => [:birth_bahaullah] },
-      297 => { '13.9'  => [:birth_bab], '13.10' => [:birth_bahaullah] },
-      298 => { '12.17' => [:birth_bab], '12.18' => [:birth_bahaullah] },
-      299 => { '12.5'  => [:birth_bab], '12.6'  => [:birth_bahaullah] },
-      300 => { '13.5'  => [:birth_bab], '13.6'  => [:birth_bahaullah] },
-      301 => { '12.14' => [:birth_bab], '12.15' => [:birth_bahaullah] },
-      302 => { '12.3'  => [:birth_bab], '12.4'  => [:birth_bahaullah] },
-      303 => { '13.2'  => [:birth_bab], '13.3'  => [:birth_bahaullah] },
-      304 => { '12.11' => [:birth_bab], '12.12' => [:birth_bahaullah] },
-      305 => { '13.10' => [:birth_bab], '13.11' => [:birth_bahaullah] },
-      306 => { '12.18' => [:birth_bab], '12.19' => [:birth_bahaullah] }
-    }
-
     def initialize(year, month, day)
       @year = year
       @month = month
@@ -289,9 +151,9 @@ module BahaiDate
       if year < 172
         all_dates = DATES.merge(DATES_BEFORE_172)
       else
-        all_dates = DATES.merge(DATES_AFTER_172).merge(DATES_LUNAR[year])
+        all_dates = DATES.merge(DATES_AFTER_172).merge(dates_lunar(year))
       end
-      all_dates.find{ |key, array| array.include? occasion }.first
+      all_dates.find { |_key, array| array.include? occasion }.first
     end
 
     private
@@ -316,8 +178,17 @@ module BahaiDate
         yield DATES_BEFORE_172[key]
       else
         yield DATES_AFTER_172[key]
-        yield DATES_LUNAR[@year][key]
+        yield (self.class.dates_lunar(@year))[key]
       end
     end
+
+    def self.dates_lunar(year)
+      twin = Logic.twin_holy_days_date year
+      birth_bab = BahaiDate.new(date: twin)
+      birth_bab_string = "#{birth_bab.month.number}.#{birth_bab.day.number}"
+      birth_bahaullah = BahaiDate.new(date: twin + 1)
+      birth_bahaullah_string = "#{birth_bahaullah.month.number}.#{birth_bahaullah.day.number}"
+      { birth_bab_string => [:birth_bab], birth_bahaullah_string => [:birth_bahaullah] }
+    end
   end
 end

data/lib/bahai_date/version.rb

@@ -1,3 +1,3 @@
 module BahaiDate
-  VERSION = "1.2.0"
+  VERSION = '1.3.0'
 end

data/spec/bahai_date/bahai_date_spec.rb

@@ -1,6 +1,5 @@
 module BahaiDate
   describe BahaiDate do
-
     it 'can be created from a year, month and day' do
       bahai_date = BahaiDate.new(year: 1, month: 1, day: 1)
 
@@ -20,7 +19,6 @@ module BahaiDate
     end
 
     context "when validating the Baha'i Era date" do
-
       context 'year' do
         it 'raises an error if less than 1' do
           expect do
@@ -76,7 +74,6 @@ module BahaiDate
           end
         end
       end
-
     end
 
     it 'exposes weekday, day, month, year and gregorian_date' do
@@ -90,7 +87,6 @@ module BahaiDate
     end
 
     context 'when converting to a gregorian date' do
-
       it 'handles the first day of the calendar' do
         bahai_date = BahaiDate.new(year: 1, month: 1, day: 1)
         expect(bahai_date.gregorian_date).to eq(Date.new(1844, 3, 21))
@@ -134,11 +130,9 @@ module BahaiDate
           expect(bahai_date.gregorian_date).to eq(Date.new(2013, 3, 1))
         end
       end
-
     end
 
     context 'when converting from gregorian date' do
-
       it 'handles the first day of the calendar' do
         bahai_date = BahaiDate.new(date: Date.new(1844, 3, 21))
         expect(bahai_date.year.bahai_era).to be 1
@@ -198,7 +192,6 @@ module BahaiDate
           expect(bahai_date.day.number).to be 4
         end
       end
-
     end
 
     it 'can get weekday from a gregorian date accurately' do
@@ -250,6 +243,5 @@ module BahaiDate
       bahai_date.next_day!
       expect(bahai_date.gregorian_date).to eq Date.new(1844, 3, 22)
     end
-
   end
 end

data/spec/bahai_date/day_spec.rb

@@ -1,6 +1,5 @@
 module BahaiDate
   describe Day 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
@@ -56,6 +55,5 @@ module BahaiDate
         expect(day.occasions).to be occasions
       end
     end
-
   end
 end

data/spec/bahai_date/logic_spec.rb

@@ -0,0 +1,20 @@
+module BahaiDate
+  describe Logic do
+    it 'supplies a Date object for Naw Ruz of a given year' do
+      expect(Logic.nawruz_for(1844)).to eq(Date.new(1844, 3, 21))
+    end
+
+    it 'determines whether a year is leap or not' do
+      expect(Logic.leap?(1)).to eq(false)
+      expect(Logic.leap?(4)).to eq(true)
+      expect(Logic.leap?(168)).to eq(true)
+      expect(Logic.leap?(171)).to eq(false)
+      expect(Logic.leap?(172)).to eq(false)
+      expect(Logic.leap?(173)).to eq(false)
+      expect(Logic.leap?(174)).to eq(true)
+      expect(Logic.leap?(175)).to eq(false)
+      expect(Logic.leap?(176)).to eq(false)
+      expect(Logic.leap?(177)).to eq(false)
+    end
+  end
+end

data/spec/bahai_date/month_spec.rb

@@ -21,7 +21,6 @@ module BahaiDate
     end
 
     context 'when created using -1' do
-
       it 'has a title of Ayyam-i-Ha' do
         month = Month.new(-1)
 
@@ -66,6 +65,5 @@ module BahaiDate
         expect(month.days[1]).to be day
       end
     end
-
   end
 end

data/spec/bahai_date/occasion_factory_spec.rb

@@ -1,6 +1,5 @@
 module BahaiDate
   describe OccasionFactory 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
@@ -61,6 +60,11 @@ module BahaiDate
         occasions = OccasionFactory.new(1, 13, 9).occasions
         expect(occasions.first.short_title).to eq "Birth of Baha'u'llah"
       end
+
+      it 'can find the month and day for a given occasion on a given year' do
+        month_and_day = OccasionFactory.find(:birth_bab, 163)
+        expect(month_and_day).to eq '12.5'
+      end
     end
 
     context 'for dates after 172 B.E.' do
@@ -82,11 +86,10 @@ module BahaiDate
         expect(occasions.first.short_title).to eq 'Birth of the Bab'
       end
 
-    end
-
-    it 'can find the month and day for a given occasion on a given year' do
-      month_and_day = OccasionFactory.find(:birth_bab, 173)
-      expect(month_and_day).to eq '12.18'
+      it 'can find the month and day for a given occasion on a given year' do
+        month_and_day = OccasionFactory.find(:birth_bab, 173)
+        expect(month_and_day).to eq '12.18'
+      end
     end
   end
 end

data/spec/bahai_date/occasion_spec.rb

@@ -1,13 +1,12 @@
 module BahaiDate
   describe Occasion 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             ')
+                   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
@@ -17,6 +16,5 @@ module BahaiDate
     it 'exposes a work_suspended? method' do
       expect(occasion.work_suspended?).to be false
     end
-
   end
 end

data/spec/bahai_date/weekday_spec.rb

@@ -37,6 +37,5 @@ module BahaiDate
     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,6 +1,5 @@
 module BahaiDate
   describe YearCalendar do
-
     subject(:year_calendar) { YearCalendar.new(1) }
 
     it 'can be created' do
@@ -36,6 +35,5 @@ module BahaiDate
       day = year_calendar.months[1].days[1]
       expect(day.occasions.size).to be 2
     end
-
   end
 end

data/spec/bahai_date/year_spec.rb

@@ -104,6 +104,5 @@ module BahaiDate
         expect(year.months[1]).to be month
       end
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -1 +1,3 @@
-require "bahai_date"
+require 'simplecov'
+SimpleCov.start
+require 'bahai_date'

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: bahai_date
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Lessan Vaezi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: RubySunrise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: astro-algo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -24,7 +66,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-description: 
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Provides functionality to convert between the Gregorian and Baha'i calendar,
+  as well as significant dates and occasions in the Baha'i calendar such as the new
+  year and holy days
 email: lessan@gmail.com
 executables: []
 extensions: []
@@ -35,6 +93,7 @@ files:
 - lib/bahai_date.rb
 - lib/bahai_date/bahai_date.rb
 - lib/bahai_date/day.rb
+- lib/bahai_date/logic.rb
 - lib/bahai_date/month.rb
 - lib/bahai_date/occasion.rb
 - lib/bahai_date/occasion_factory.rb
@@ -42,15 +101,14 @@ files:
 - lib/bahai_date/weekday.rb
 - lib/bahai_date/year.rb
 - lib/bahai_date/year_calendar.rb
-- lib/bahai_date/year_data.rb
 - spec/bahai_date/bahai_date_spec.rb
 - spec/bahai_date/day_spec.rb
+- spec/bahai_date/logic_spec.rb
 - spec/bahai_date/month_spec.rb
 - spec/bahai_date/occasion_factory_spec.rb
 - spec/bahai_date/occasion_spec.rb
 - spec/bahai_date/weekday_spec.rb
 - spec/bahai_date/year_calendar_spec.rb
-- spec/bahai_date/year_data_spec.rb
 - spec/bahai_date/year_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/lessan/bahai-date
@@ -76,16 +134,15 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Gem to provide date conversion between the Gregorian calendar and the Baha'i
-  (or Badi) calendar
+summary: Conversion between Gregorian and Baha'i (or Badi) calendars
 test_files:
 - spec/spec_helper.rb
 - spec/bahai_date/bahai_date_spec.rb
+- spec/bahai_date/logic_spec.rb
 - spec/bahai_date/occasion_factory_spec.rb
 - spec/bahai_date/year_calendar_spec.rb
 - spec/bahai_date/year_spec.rb
 - spec/bahai_date/occasion_spec.rb
-- spec/bahai_date/year_data_spec.rb
 - spec/bahai_date/weekday_spec.rb
 - spec/bahai_date/month_spec.rb
 - spec/bahai_date/day_spec.rb

data/lib/bahai_date/year_data.rb

@@ -1,17 +0,0 @@
-module BahaiDate
-  class YearData
-    # valid up to 2148
-    LEAP_YEARS = [4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 60, 64, 68, 72, 76, 80, 84, 88, 92, 96, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 144, 148, 152, 156, 160, 164, 168, 174, 178, 182, 187, 191, 195, 199, 203, 207, 211, 216, 220, 224, 228, 232, 236, 240, 244, 249, 253, 257, 261, 265, 269, 273, 277, 282, 286, 290, 294, 298, 302]
-    # valid up to 2149
-    NAWRUZ_DAYS = { 2015 => 21, 2016 => 20, 2017 => 20, 2018 => 21, 2019 => 21, 2020 => 20, 2021 => 20, 2022 => 21, 2023 => 21, 2024 => 20, 2025 => 20, 2026 => 21, 2027 => 21, 2028 => 20, 2029 => 20, 2030 => 20, 2031 => 21, 2032 => 20, 2033 => 20, 2034 => 20, 2035 => 21, 2036 => 20, 2037 => 20, 2038 => 20, 2039 => 21, 2040 => 20, 2041 => 20, 2042 => 20, 2043 => 21, 2044 => 20, 2045 => 20, 2046 => 20, 2047 => 21, 2048 => 20, 2049 => 20, 2050 => 20, 2051 => 21, 2052 => 20, 2053 => 20, 2054 => 20, 2055 => 21, 2056 => 20, 2057 => 20, 2058 => 20, 2059 => 20, 2060 => 20, 2061 => 20, 2062 => 20, 2063 => 20, 2064 => 20, 2065 => 20, 2066 => 20, 2067 => 20, 2068 => 20, 2069 => 20, 2070 => 20, 2071 => 20, 2072 => 20, 2073 => 20, 2074 => 20, 2075 => 20, 2076 => 20, 2077 => 20, 2078 => 20, 2079 => 20, 2080 => 20, 2081 => 20, 2082 => 20, 2083 => 20, 2084 => 20, 2085 => 20, 2086 => 20, 2087 => 20, 2088 => 20, 2089 => 20, 2090 => 20, 2091 => 20, 2092 => 19, 2093 => 20, 2094 => 20, 2095 => 20, 2096 => 19, 2097 => 20, 2098 => 20, 2099 => 20, 2100 => 20, 2101 => 21, 2102 => 21, 2103 => 21, 2104 => 20, 2105 => 21, 2106 => 21, 2107 => 21, 2108 => 20, 2109 => 21, 2110 => 21, 2111 => 21, 2112 => 20, 2113 => 21, 2114 => 21, 2115 => 21, 2116 => 20, 2117 => 21, 2118 => 21, 2119 => 21, 2120 => 20, 2121 => 21, 2122 => 21, 2123 => 21, 2124 => 20, 2125 => 20, 2126 => 21, 2127 => 21, 2128 => 20, 2129 => 20, 2130 => 21, 2131 => 21, 2132 => 20, 2133 => 20, 2134 => 21, 2135 => 21, 2136 => 20, 2137 => 20, 2138 => 21, 2139 => 21, 2140 => 20, 2141 => 20, 2142 => 21, 2143 => 21, 2144 => 20, 2145 => 20, 2146 => 21, 2147 => 21, 2148 => 20, 2149 => 20 }
-
-    def self.nawruz_for(year)
-      nawruz_day = year < 2015 ? 21 : NAWRUZ_DAYS[year]
-      Date.new(year, 3, nawruz_day)
-    end
-
-    def self.leap?(year)
-      LEAP_YEARS.include? year
-    end
-  end
-end

data/spec/bahai_date/year_data_spec.rb

@@ -1,15 +0,0 @@
-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))
-    end
-
-    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