zmanim 0.2.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ca99f24408a8ee9ef58732e6d92aa20150ec680b
-  data.tar.gz: eb8a70763999f4f75e72baa42f31fca8e702e1a1
+SHA256:
+  metadata.gz: 106a751ffa4c28d37a4d69afc2d8aa91d8f07b668dc126f6008fec90c3a0b308
+  data.tar.gz: 8886864f89feb9382a62644de99201c4b0958ff2d8652728fad14ed1c6420df9
 SHA512:
-  metadata.gz: '038a38a4022840534376573885d933b14d36693b995b0676cd2489ca9ce413ab7fced22635ba82a6cffda49e551d5a350963261f4536c5e916e8321a30f064f9'
-  data.tar.gz: db91a82beb8aab922ef8c055545397b04e6c07bb53e70430939843206cb7baef1c318c4f7ec71dd448ceb2ea6d430137f8ed5974cae68604b0312753118dab61
+  metadata.gz: 971b9186fae5a3eccba8730038b9df6f2e5566d57fac6626dbbcba60ae87ec472eb73a2d72536f9dfbeee473cdd857c68f3c296a25dfad8feb65874f790a04ad
+  data.tar.gz: c73d548258fc576a7afaff89025a9c0b7105551e679284d0a291f03bbc91945b5f701bac5236eb6c882fba857ef185944fa879f813d069d11666c654c5f9142f

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/CHANGELOG.md

@@ -4,6 +4,57 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.5.0] - 2022-03-24
+### Added
+- `JewishCalendar#taanis_bechorim?` detects Taanis Bechorim for a given date
+- `JewishCalendar#pesach` returns the date for start of Pesach for any year, or the next upcoming event
+- `JewishCalendar#pesach_sheni` returns the date for Pesach Sheni for any year, or the next upcoming event
+- `JewishCalendar#lag_baomer` returns the date for Lag Baomer for any year, or the next upcoming event
+- `JewishCalendar#shavuos` returns the date for start of Shavuos for any year, or the next upcoming event
+- `JewishCalendar#seventeen_of_tammuz` returns the date for Seventeen of Tammuz for any year, or the next upcoming event
+- `JewishCalendar#tisha_beav` returns the date for Tisha Beav for any year, or the next upcoming event
+- `JewishCalendar#tu_beav` returns the date for Tu Beav for any year, or the next upcoming event
+- `JewishCalendar#rosh_hashana` returns the date for start of Rosh Hashana for any year, or the next upcoming event
+- `JewishCalendar#tzom_gedalyah` returns the date for Tzom Gedalyah for any year, or the next upcoming event
+- `JewishCalendar#yom_kippur` returns the date for Yom Kippur for any year, or the next upcoming event
+- `JewishCalendar#succos` returns the date for start of Succos for any year, or the next upcoming event
+- `JewishCalendar#chanukah` returns the date for start of Chanukah for any year, or the next upcoming event
+- `JewishCalendar#tenth_of_teves` returns the date for Tenth of Teves for any year, or the next upcoming event
+- `JewishCalendar#tu_beshvat` returns the date for Tu Beshvat for any year, or the next upcoming event
+- `JewishCalendar#purim` returns the date for Purim for any year, or the next upcoming event
+- `JewishCalendar#rosh_chodesh` returns the date for Rosh Chodesh for any month, or the next upcoming event
+- `JewishCalendar#shabbos_mevorchim` returns the date for Shabbos Mevorchim for any month, or the next upcoming event
+- `JewishCalendar#vesein_tal_umatar_start` returns the date for start of reciting Vesein Tal Umatar for any year, or the next upcoming event
+- `JewishCalendar#vesein_tal_umatar_starts?` detects if reciting of Vesein Tal Umatar started today
+### Changed
+- Upgraded dependency versions to address known security vulnerabilities:
+  - `rake` to 13.0.6
+  - `bundler` to 2.3.10 
+### Fixed
+- `JewishCalendar#vesein_tal_umatar?` and `JewishCalendar#vesein_tal_umatar_starts_tonight?` now auto-adjust for any calendar year, previously only valid for 20th/21st century
+
+## [0.4.0] - 2020-10-13
+### Added
+- `JewishCalendar#end_of_week` returns Shabbos for this week
+- Parshas Hashavua modifier to return blank Limud if the standard Parsha is not read this Shabbos
+- Daf Hashavua calculator
+### Changed
+- Refactor kviah calculation logic to JewishDate
+- Remove formatter dependency for Parsha calculator
+### Fixed
+- Added Lag B'Omer as significant day / yom tov
+- Fixed Lag B'Omer spelling for english formatted omer
+
+## [0.3.0] - 2018-09-17
+### Added
+- Elevations used in shaos zmanios calculations if use_elevation property is set
+- Hanetz and Shkia methods will use the appropriate calculation based on use_elevation setting
+- Support Alos and Tzais offset using temporal minutes
+- Various Assur Bemelacha related methods for calendar dates using JewishCalendar, 
+  as well as point-in-time using ZmanimCalendar.
+- Methods to determine Shabbos Mevorchim, first night of Vesein Tal Umatar,
+  and delayed candle lighting
+
 ## [0.2.2] - 2018-08-31
 ### Fixed
 - Typo in formatted Masechtos

data/Gemfile.lock

@@ -0,0 +1,41 @@
+PATH
+  remote: .
+  specs:
+    zmanim (0.5.0)
+      tzinfo
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    byebug (9.1.0)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.3)
+  byebug (~> 9.1)
+  rake (~> 13.0)
+  rspec (~> 3.7)
+  zmanim!
+
+BUNDLED WITH
+   2.3.10

data/lib/zmanim/hebrew_calendar/hebrew_date_formatter.rb

@@ -46,7 +46,7 @@ module Zmanim::HebrewCalendar
         transliterated: Zmanim::HebrewCalendar::JewishCalendar::SIGNIFICANT_DAYS.each_with_object({}){|d, h|
           h[d] = titleize(d)
         }.merge(tzom_gedalyah: 'Fast of Gedalyah', tenth_of_teves: 'Tenth of Teves', tu_beshvat: "Tu B'Shvat",
-                taanis_esther: 'Fast of Esther', seventeen_of_tammuz: 'Seventeenth of Tammuz',
+                taanis_esther: 'Fast of Esther', lag_baomer: "Lag B'Omer", seventeen_of_tammuz: 'Seventeenth of Tammuz',
                 tisha_beav: "Tisha B'Av", tu_beav: "Tu B'Av", yom_hashoah: 'Yom HaShoah', yom_haatzmaut: "Yom Ha'atzmaut"),
         hebrew: {
             erev_rosh_hashana:   'ערב ראש השנה',
@@ -72,6 +72,7 @@ module Zmanim::HebrewCalendar
             pesach:              'פסח',
             chol_hamoed_pesach:  'חול המועד פסח',
             pesach_sheni:        'פסח שני',
+            lag_baomer:          'ל״ג בעומר',
             erev_shavuos:        'ערב שבועות',
             shavuos:             'שבועות',
             seventeen_of_tammuz: 'שבעה עשר בתמוז',
@@ -179,18 +180,15 @@ module Zmanim::HebrewCalendar
       if hebrew_format
         format_hebrew_number(number) + ' ' + hebrew_omer_prefix + 'עומר'
       else
-        number == 33 ? 'Lag BaOmer' : "Omer #{number}"
+        number == 33 ? "Lag B'Omer" : "Omer #{number}"
       end
     end
 
     def format_kviah(year)
       date = year.is_a?(Numeric) ? Zmanim::HebrewCalendar::JewishDate.new(year, 7, 1) : year
-      kviah = date.cheshvan_kislev_kviah
-      rosh_hashana_day = date.day_of_week
-      kviah_glyph = {chaseirim: 'ח', kesidran: 'כ', shelaimim: 'ש'}[kviah]
-      date.jewish_month = 1
-      pesach_day = date.day_of_week
-      "#{format_hebrew_number(rosh_hashana_day)}#{kviah_glyph}#{format_hebrew_number(pesach_day)}".delete(GERESH)
+      kviah_values = date.kviah
+      kviah_glyph = {chaseirim: 'ח', kesidran: 'כ', shelaimim: 'ש'}[kviah_values[:kviah]]
+      "#{format_hebrew_number(kviah_values[:rosh_hashana])}#{kviah_glyph}#{format_hebrew_number(kviah_values[:pesach])}".delete(GERESH)
     end
 
     def format_tefilah_additions(calendar, customs={walled_city: false, nusach: :ashkenaz})

data/lib/zmanim/hebrew_calendar/jewish_calendar.rb

@@ -8,7 +8,7 @@ module Zmanim::HebrewCalendar
                           erev_succos succos chol_hamoed_succos hoshana_rabbah shemini_atzeres simchas_torah
                           chanukah tenth_of_teves tu_beshvat
                           taanis_esther purim shushan_purim purim_katan shushan_purim_katan
-                          erev_pesach pesach chol_hamoed_pesach pesach_sheni erev_shavuos shavuos
+                          erev_pesach pesach chol_hamoed_pesach pesach_sheni lag_baomer erev_shavuos shavuos
                           seventeen_of_tammuz tisha_beav tu_beav
                           yom_hashoah yom_hazikaron yom_haatzmaut yom_yerushalayim)
 
@@ -30,6 +30,22 @@ module Zmanim::HebrewCalendar
       send("#{jewish_month_name}_significant_day")
     end
 
+    def assur_bemelacha?
+      day_of_week == 7 || yom_tov_assur_bemelacha?
+    end
+
+    def tomorrow_assur_bemelacha?
+      day_of_week == 6 || erev_yom_tov? || erev_yom_tov_sheni?
+    end
+
+    def candle_lighting?
+      tomorrow_assur_bemelacha?
+    end
+
+    def delayed_candle_lighting?
+      day_of_week != 6 && candle_lighting? && assur_bemelacha?
+    end
+
     def yom_tov?
       sd = significant_day
       sd && !sd.to_s.start_with?('erev_') && (!taanis? || sd == :yom_kippur)
@@ -39,21 +55,40 @@ module Zmanim::HebrewCalendar
       %i(pesach shavuos rosh_hashana yom_kippur succos shemini_atzeres simchas_torah).include?(significant_day)
     end
 
-    def chol_hamoed?
-      sd = significant_day
-      sd && (sd.to_s.start_with?('chol_hamoed_') || sd == :hoshana_rabbah)
-    end
-
     def erev_yom_tov?
       return false unless sd = significant_day
       sd.to_s.start_with?('erev_') || sd == :hoshana_rabbah ||
           (sd == :chol_hamoed_pesach && jewish_day == 20)
     end
 
+    def yom_tov_sheni?
+      (jewish_month == 7 && jewish_day == 2) ||
+          (!in_israel && ((jewish_month == 7 && [16, 23].include?(jewish_day)) ||
+                          (jewish_month == 1 && [16, 22].include?(jewish_day)) ||
+                          (jewish_month == 3 && jewish_day == 7)))
+    end
+
+    def erev_yom_tov_sheni?
+      (jewish_month == 7 && jewish_day == 1) ||
+          (!in_israel && ((jewish_month == 7 && [15, 22].include?(jewish_day)) ||
+                          (jewish_month == 1 && [15, 21].include?(jewish_day)) ||
+                          (jewish_month == 3 && jewish_day == 6)))
+    end
+
+    def chol_hamoed?
+      sd = significant_day
+      sd && (sd.to_s.start_with?('chol_hamoed_') || sd == :hoshana_rabbah)
+    end
+
     def taanis?
       %i(seventeen_of_tammuz tisha_beav tzom_gedalyah yom_kippur tenth_of_teves taanis_esther).include?(significant_day)
     end
 
+    def taanis_bechorim?
+      (day_of_week != 7 && jewish_day == 14 && jewish_month == 1) ||   # normally 14th of nissan,
+          (day_of_week == 5 && jewish_day == 12 && jewish_month == 1)  # when that falls on shabbos, moved to previous Thursday
+    end
+
     def rosh_chodesh?
       jewish_day == 30 || (jewish_day == 1 && jewish_month != 7)
     end
@@ -123,6 +158,10 @@ module Zmanim::HebrewCalendar
       molad_as_datetime + 15
     end
 
+    def end_of_week
+      self + (7 - day_of_week)
+    end
+
     def daf_yomi_bavli
       Zmanim::Limudim::Calculators::DafYomiBavli.new.limud(self)
     end
@@ -131,8 +170,14 @@ module Zmanim::HebrewCalendar
       Zmanim::Limudim::Calculators::DafYomiYerushalmi.new.limud(self)
     end
 
-    def parshas_hashavua
-      Zmanim::Limudim::Calculators::Parsha.new(in_israel: in_israel).limud(self)
+    def daf_hashavua_bavli
+      Zmanim::Limudim::Calculators::DafHashavuaBavli.new.limud(self)
+    end
+
+    def parshas_hashavua(current_week_only: false)
+      limud = Zmanim::Limudim::Calculators::Parsha.new(in_israel: in_israel).limud(self)
+      limud.clear! if current_week_only && limud.interval.end_date > end_of_week
+      limud
     end
 
     def tehillim_portion
@@ -191,6 +236,144 @@ module Zmanim::HebrewCalendar
       end
     end
 
+    def pesach(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 1, 15)
+      end
+    end
+
+    def pesach_sheni(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 2, 14)
+      end
+    end
+
+    def lag_baomer(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 2, 18)
+      end
+    end
+
+    def shavuos(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 3, 6)
+      end
+    end
+
+    def seventeen_of_tammuz(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        date = JewishCalendar.new(y, 4, 17)
+        date.forward! if date.day_of_week == 7
+        date
+      end
+    end
+
+    def tisha_beav(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        date = JewishCalendar.new(y, 5, 9)
+        date.forward! if date.day_of_week == 7
+        date
+      end
+    end
+
+    def tu_beav(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 5, 15)
+      end
+    end
+
+    def rosh_hashana(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 7, 1)
+      end
+    end
+
+    def tzom_gedalyah(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        date = JewishCalendar.new(y, 7, 3)
+        date.forward! if date.day_of_week == 7
+        date
+      end
+    end
+
+    def yom_kippur(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 7, 10)
+      end
+    end
+
+    def succos(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 7, 15)
+      end
+    end
+
+    def chanukah(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 9, 25)
+      end
+    end
+
+    def tenth_of_teves(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 10, 10)
+      end
+    end
+
+    def tu_beshvat(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, 11, 15)
+      end
+    end
+
+    def purim(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        JewishCalendar.new(y, months_in_jewish_year(y), 14)
+      end
+    end
+
+    def rosh_chodesh(upcoming: nil, month: nil, year: nil)
+      find_monthly_event(upcoming, month, year) do |m, y|
+        m = 8 if m == 7
+        prev = m - 1
+        prev = months_in_jewish_year(y) if prev < 1
+        if days_in_jewish_month(prev,y) == 30
+          JewishCalendar.new(y, prev, 30)
+        else
+          JewishCalendar.new(y, m, 1)
+        end
+      end
+    end
+
+    def shabbos_mevorchim(upcoming: nil, month: nil, year: nil)
+      find_monthly_event(upcoming, month, year) do |m, y|
+        m = 8 if m == 7
+        prev = m - 1
+        prev = months_in_jewish_year(y) if prev < 1
+        mevorchim_start = JewishCalendar.new(y,prev,23)
+        mevorchim_start + (7 - mevorchim_start.day_of_week)
+      end
+    end
+
+    def vesein_tal_umatar_start(upcoming: nil, year: nil)
+      find_annual_event(upcoming, year) do |y|
+        start_date =
+          if in_israel
+            JewishCalendar.new(y, 8, 7)
+          else
+            JewishCalendar.new(y, 7, 1) + (47 - tekufas_tishrei_elapsed_days(1, year: y))
+          end
+        start_date.forward! if start_date.day_of_week == 7
+        start_date
+      end
+    end
+
+    def shabbos_mevorchim?
+      day_of_week == 7 &&
+          jewish_month != 6 &&
+          (23..29).include?(jewish_day)
+    end
+
     def mashiv_haruach_starts?
       jewish_month == 7 && jewish_day == 22
     end
@@ -209,18 +392,33 @@ module Zmanim::HebrewCalendar
       !mashiv_haruach? || mashiv_haruach_starts? || mashiv_haruach_ends?
     end
 
-    # This presumes the evenings of December 4/5 are always the initial start date outside of Israel
-    # Because the jewish date does not auto-increment in the evening, we use December 5/6 as the start date
+    # Because the jewish date does not auto-increment in the evening,
+    # we use the daytime transition (e.g. December 5/6 for 20th/21st century) as the start date
     # and rely on the user to increment the jewish date after nightfall.
-    # Note that according to many, the date for Vesein Tal Umatar is tied to the Julian calendar and has historically
-    # moved over time as the deviance from the Gregorian calendar increases.  The date of December 4/5 is to be used
-    # for the 20th and 21st century.
     def vesein_tal_umatar?
       return false if day_of_week == 7 || yom_tov_assur_bemelacha?
-      start_date = JewishDate.new(jewish_year, 8, 7)
-      start_date.set_gregorian_date(start_date.gregorian_year, 12, gregorian_leap_year?(start_date.gregorian_year+1) ? 6 : 5) unless in_israel
-      end_date = JewishDate.new(jewish_year, 1, 15)
-      self.between?(start_date, end_date)
+      return true if jewish_month == 1 && jewish_day < 15
+      return false if jewish_month < 8
+      if in_israel
+        jewish_month > 8 || (jewish_month == 8 && jewish_day >= 7)
+      else
+        tekufas_tishrei_elapsed_days >= 47
+      end
+    end
+
+    def vesein_tal_umatar_starts?
+      if in_israel
+        # 7 Cheshvan, or 8 Cheshvan if 7 is Shabbos
+        return false unless jewish_month == 8
+        (day_of_week != 7 && jewish_day == 7) || (day_of_week == 1 && jewish_day == 8)
+      else
+        elapsed_days = tekufas_tishrei_elapsed_days
+        (day_of_week != 7 && elapsed_days == 47) || (day_of_week == 1 && elapsed_days == 48)
+      end
+    end
+
+    def vesein_tal_umatar_starts_tonight?
+      succ.vesein_tal_umatar_starts?
     end
 
     def vesein_beracha?
@@ -261,6 +459,8 @@ module Zmanim::HebrewCalendar
     def iyar_significant_day
       if jewish_day == 14
         :pesach_sheni
+      elsif jewish_day == 18
+        :lag_baomer
       elsif use_modern_holidays
         # Note that this logic follows the current rules, which were last revised in 5764.
         # The calculations for years prior may not reflect the actual dates observed at that time.
@@ -390,5 +590,54 @@ module Zmanim::HebrewCalendar
         :shushan_purim
       end
     end
+
+    def tekufas_tishrei_elapsed_days(day_number=day_number_of_jewish_year, year: jewish_year)
+      days = jewish_calendar_elapsed_days(year) + (day_number-1) + 0.5
+      solar = (year - 1) * 365.25
+      (days - solar).floor.to_i
+    end
+
+    # Finds the date for an annual event whose rules are provided to the method as a block
+    # Supports boolean `upcoming` or a given integer jewish `year`.
+    # If both are nil, defaults to current jewish year.
+    # `upcoming` finds the current or next occurrence of this event
+    def find_annual_event(upcoming, year)
+      if upcoming && year
+        raise "'upcoming' and 'year' options cannot be used together"
+      end
+
+      upcoming = false if upcoming.nil?    # 'upcoming' only when explicitly passed
+      year = jewish_year if year.nil?
+
+      current = yield(year)
+      upcoming && current < self ? yield(year+1) : current
+    end
+
+    # Finds the date for a monthly event whose rules are provided to the method as a block
+    # Supports boolean `upcoming` or a given integer jewish `year` and `month`.
+    # If all are nil, defaults to current jewish month and year.
+    # `upcoming` finds the current or next occurrence of this event
+    # If only month is provided, defaults to current jewish year.
+    # If only year is provided, defaults to current jewish month.
+    def find_monthly_event(upcoming, month, year)
+      if upcoming && (year || month)
+        raise "'upcoming' option cannot be used together with 'year' or 'month'"
+      end
+
+      upcoming = false if upcoming.nil?    # 'upcoming' only when explicitly passed
+      year ||= jewish_year
+      month ||= jewish_month
+
+      current = yield(month, year)
+      if upcoming && current < self
+        month += 1
+        month = 1 if month > months_in_jewish_year(year)
+        year += 1 if month == 7
+        yield(month, year)
+      else
+        current
+      end
+    end
+
   end
 end

data/lib/zmanim/hebrew_calendar/jewish_date.rb

@@ -157,6 +157,40 @@ module Zmanim::HebrewCalendar
       end
     end
 
+    def succ
+      self + 1
+    end
+
+    def step(limit, step=1, &block)
+      if step < 0
+        downto(limit, -step, &block)
+      else
+        upto(limit, step, &block)
+      end
+    end
+
+    def downto(limit, step=1)
+      raise ArgumentError, 'step argument must be greater than 0' if step <= 0
+      return to_enum(__method__, limit, step) unless block_given?
+      c = self
+      while c >= limit
+        yield c
+        c -= step
+      end
+      self
+    end
+
+    def upto(limit, step=1)
+      raise ArgumentError, 'step argument must be greater than 0' if step <= 0
+      return to_enum(__method__, limit, step) unless block_given?
+      c = self
+      while c <= limit
+        yield c
+        c += step
+      end
+      self
+    end
+
     def gregorian_year=(year)
       set_gregorian_date(year, gregorian_month, gregorian_day)
     end
@@ -275,6 +309,17 @@ module Zmanim::HebrewCalendar
       CHESHVAN_KISLEV_KEVIAH[(days_in_jewish_year(year) % 10) - 3]
     end
 
+    def kviah(year=jewish_year)
+      date = year.is_a?(Numeric) ? Zmanim::HebrewCalendar::JewishDate.new(year, 7, 1) : year
+      kviah = date.cheshvan_kislev_kviah
+      rosh_hashana_day = date.day_of_week
+      date.jewish_month = 1
+      pesach_day = date.day_of_week
+      {rosh_hashana: rosh_hashana_day,
+       kviah: kviah,
+       pesach: pesach_day}
+    end
+
     # Returns a new JewishDate as the molad for given month
     def molad(month=jewish_month, year=jewish_year)
       self.class.from_molad(chalakim_since_molad_tohu(year, month))

data/lib/zmanim/limudim/calculators/daf_hashavua_bavli.rb

@@ -0,0 +1,23 @@
+require 'zmanim/limudim/calculators/daf_yomi_bavli'
+
+module Zmanim::Limudim::Calculators
+  class DafHashavuaBavli < DafYomiBavli
+    def initial_cycle_date
+      jewish_date(Date.parse('2005-03-02'))
+    end
+
+    def cycle_end_calculation
+      ->(start_date, iteration){ start_date + ((2711*7) - start_date.day_of_week) }  # 2711 pages except first week * 7 days
+    end
+
+    def interval_end_calculation
+      ->(cycle, start_date){ start_date + (7 - start_date.day_of_week) }
+    end
+
+    def cycle_units_calculation
+      ->(cycle){ default_units }
+    end
+  end
+end
+
+

data/lib/zmanim/limudim/calculators/mishna_yomis.rb

@@ -40,7 +40,7 @@ module Zmanim::Limudim::Calculators
             meilah: [4,9,8,6,5,6], tamid: [4,5,9,3,6,4,3], midos: [9,6,8,7,4], kinnim: [4,5,6],
             keilim: [9,8,8,4,11,4,6,11,8,8,9,8,8,8,6,8,17,9,10,7,3,10,5,17,9,9,12,10,8,4], ohalos: [8,7,7,3,7,7,6,6,16,7,9,8,6,7,10,5,5,10],
             negaim: [6,5,8,11,5,8,5,10,3,10,12,7,12,13], parah: [4,5,11,4,9,5,12,11,9,6,9,11], taharos: [9,8,8,13,9,10,9,9,9,8],
-            mikvaos: [8,10,4,5,6,11,7,5,7,8], niddah: [7,7,7,7,9,14,5,4,11,8], machshirim: [6,11,8,10,11,8], zavim: [6,4,3,7,12],
+            mikvaos: [8,10,4,5,6,11,7,5,7,8], niddah: [7,7,7,7,9,14,5,4,11,8], machshirin: [6,11,8,10,11,8], zavim: [6,4,3,7,12],
             tevul_yom: [5,8,6,7], yadayim: [5,4,5,8], uktzin: [6,10,12]
           }.map{|k, v| [k, Hash[v.map.with_index{|m, p| [p+1, m]}]]}]
     end

data/lib/zmanim/limudim/calculators/parsha.rb

@@ -47,40 +47,40 @@ module Zmanim::Limudim::Calculators
 
     def cycle_units_calculation
       ->(cycle) do
-        kviah = Zmanim::HebrewCalendar::HebrewDateFormatter.new.format_kviah(cycle.start_date.jewish_year)
+        kviah_values = cycle.start_date.kviah.values
         modifications = in_israel ?
                          {
-                             'בחה' => [%i(matos masei), %i(nitzavim vayeilech)],
-                             'בשז' => [],
-                             'גכז' => [],
-                             'החא' => [],
-                             'השג' => [%i(nitzavim vayeilech)],
-                             'זחג' => [%i(matos masei), %i(nitzavim vayeilech)],
-                             'זשה' => [%i(matos masei), %i(nitzavim vayeilech)],
-                             'בחג' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
-                             'בשה' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
-                             'גכה' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
-                             'הכז' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(matos masei)],
-                             'השא' => [%i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
-                             'זחא' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
-                             'זשג' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
-                         }[kviah] :
+                             [2,:chaseirim,5] => [%i(matos masei), %i(nitzavim vayeilech)],
+                             [2,:shelaimim,7] => [],
+                             [3,:kesidran,7] => [],
+                             [5,:chaseirim,1] => [],
+                             [5,:shelaimim,3] => [%i(nitzavim vayeilech)],
+                             [7,:chaseirim,3] => [%i(matos masei), %i(nitzavim vayeilech)],
+                             [7,:shelaimim,5] => [%i(matos masei), %i(nitzavim vayeilech)],
+                             [2,:chaseirim,3] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
+                             [2,:shelaimim,5] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
+                             [3,:kesidran,5] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
+                             [5,:kesidran,7] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(matos masei)],
+                             [5,:shelaimim,1] => [%i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
+                             [7,:chaseirim,1] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
+                             [7,:shelaimim,3] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
+                         }[kviah_values] :
                          {
-                             'בחה' => [%i(chukas balak), %i(matos masei), %i(nitzavim vayeilech)],
-                             'בשז' => [%i(matos masei)],
-                             'גכז' => [%i(matos masei)],
-                             'החא' => [],
-                             'השג' => [%i(nitzavim vayeilech)],
-                             'זחג' => [%i(matos masei), %i(nitzavim vayeilech)],
-                             'זשה' => [%i(chukas balak), %i(matos masei), %i(nitzavim vayeilech)],
-                             'בחג' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
-                             'בשה' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(chukas balak), %i(matos masei), %i(nitzavim vayeilech)],
-                             'גכה' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(chukas balak), %i(matos masei), %i(nitzavim vayeilech)],
-                             'הכז' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
-                             'השא' => [%i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
-                             'זחא' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
-                             'זשג' => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
-                         }[kviah]
+                             [2,:chaseirim,5] => [%i(chukas balak), %i(matos masei), %i(nitzavim vayeilech)],
+                             [2,:shelaimim,7] => [%i(matos masei)],
+                             [3,:kesidran,7] => [%i(matos masei)],
+                             [5,:chaseirim,1] => [],
+                             [5,:shelaimim,3] => [%i(nitzavim vayeilech)],
+                             [7,:chaseirim,3] => [%i(matos masei), %i(nitzavim vayeilech)],
+                             [7,:shelaimim,5] => [%i(chukas balak), %i(matos masei), %i(nitzavim vayeilech)],
+                             [2,:chaseirim,3] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
+                             [2,:shelaimim,5] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(chukas balak), %i(matos masei), %i(nitzavim vayeilech)],
+                             [3,:kesidran,5] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(chukas balak), %i(matos masei), %i(nitzavim vayeilech)],
+                             [5,:kesidran,7] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
+                             [5,:shelaimim,1] => [%i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
+                             [7,:chaseirim,1] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei)],
+                             [7,:shelaimim,3] => [%i(vayakheil pikudei), %i(tazria metzora), %i(acharei kedoshim), %i(behar bechukosai), %i(matos masei), %i(nitzavim vayeilech)],
+                         }[kviah_values]
         modifications.inject(default_units) do |transitioned_units, parsha_pair|
           index = transitioned_units.index(parsha_pair.first)
           transitioned_units[0...index] + [parsha_pair] + transitioned_units[(index + 2)..-1]

data/lib/zmanim/limudim/cycle.rb

@@ -32,9 +32,5 @@ module Zmanim::Limudim
       new_end_date = cycle_end_calculation.(new_start_date, new_iteration)
       Cycle.new(new_start_date, new_end_date, new_iteration)
     end
-
-    def first_interval(interval_end_calculation)
-      Interval.first_for_cycle(self, interval_end_calculation)
-    end
   end
 end

data/lib/zmanim/limudim/limud.rb

@@ -7,6 +7,10 @@ module Zmanim::Limudim
       @unit = unit
     end
 
+    def clear!
+      @unit = nil
+    end
+
     def cycle
       interval.cycle
     end

data/lib/zmanim/limudim/limud_calculator.rb

@@ -7,7 +7,7 @@ module Zmanim::Limudim
       cycle = find_cycle(jewish_date)
       return nil unless cycle && cycle.end_date >= date
       units = cycle_units_calculation.(cycle)
-      interval = cycle.first_interval(interval_end_calculation)
+      interval = Interval.first_for_cycle(cycle, interval_end_calculation)
       while !jewish_date.between?(interval.start_date, interval.end_date) do
         interval = if skip_interval?(interval)
                      interval.skip(interval_end_calculation)

data/lib/zmanim/limudim/limudim_formatter.rb

@@ -124,7 +124,7 @@ module Zmanim::Limudim
         taharos: 'טהרות',
         mikvaos: 'מקואות',
         niddah: 'נדה',
-        machshirim: 'מכשירין',
+        machshirin: 'מכשירין',
         zavim: 'זבים',
         tevul_yom: 'טבול יום',
         yadayim: 'ידים',
@@ -138,6 +138,7 @@ module Zmanim::Limudim
     end
 
     def format_parsha(limud)
+      return '' unless limud && limud.unit
       prefix = hebrew_format ? 'פרשת ' : 'Parshas '
       prefix + limud.unit.render do |parsha|
         hebrew_format ? PARSHIYOS[parsha] : titleize(parsha)

data/lib/zmanim/version.rb

@@ -1,3 +1,3 @@
 module Zmanim
-  VERSION = "0.2.2"
+  VERSION = "0.5.0"
 end

data/lib/zmanim/zmanim_calendar.rb

@@ -1,8 +1,10 @@
 require_relative 'astronomical_calendar'
+require_relative 'hebrew_calendar/jewish_calendar'
 
 module Zmanim
   class ZmanimCalendar < AstronomicalCalendar
     attr_accessor :candle_lighting_offset
+    attr_writer :use_elevation
 
     ZENITH_16_POINT_1 = GEOMETRIC_ZENITH + 16.1
     ZENITH_8_POINT_5 = GEOMETRIC_ZENITH + 8.5
@@ -10,11 +12,31 @@ module Zmanim
     def initialize(opts={})
       super
       @candle_lighting_offset = opts[:candle_lighting_offset] || 18
+      @use_elevation = false
     end
 
+    def use_elevation?
+      !!@use_elevation
+    end
+
+    def elevation_adjusted_sunrise
+      use_elevation? ? sunrise : sea_level_sunrise
+    end
+    alias_method :hanetz, :elevation_adjusted_sunrise
+
+    def elevation_adjusted_sunset
+      use_elevation? ? sunset : sea_level_sunset
+    end
+    alias_method :shkia, :elevation_adjusted_sunset
+
     def tzais(opts={degrees: 8.5})
-      degrees, offset = extract_degrees_offset(opts)
-      offset_by_minutes(sunset_offset_by_degrees(GEOMETRIC_ZENITH + degrees), offset)
+      degrees, offset, zmanis_offset = extract_degrees_offset(opts)
+      sunset_for_degrees = degrees == 0 ? elevation_adjusted_sunset : sunset_offset_by_degrees(GEOMETRIC_ZENITH + degrees)
+      if zmanis_offset != 0
+        offset_by_minutes_zmanis(sunset_for_degrees, zmanis_offset)
+      else
+        offset_by_minutes(sunset_for_degrees, offset)
+      end
     end
 
     def tzais_72
@@ -22,12 +44,17 @@ module Zmanim
     end
 
     def alos(opts={degrees: 16.1})
-      degrees, offset = extract_degrees_offset(opts)
-      offset_by_minutes(sunrise_offset_by_degrees(GEOMETRIC_ZENITH + degrees), offset)
+      degrees, offset, zmanis_offset = extract_degrees_offset(opts)
+      sunrise_for_degrees = degrees == 0 ? elevation_adjusted_sunrise : sunrise_offset_by_degrees(GEOMETRIC_ZENITH + degrees)
+      if zmanis_offset != 0
+        offset_by_minutes_zmanis(sunrise_for_degrees, -zmanis_offset)
+      else
+        offset_by_minutes(sunrise_for_degrees, -offset)
+      end
     end
 
     def alos_72
-      alos(offset: -72)
+      alos(offset: 72)
     end
 
     alias_method :chatzos, :sun_transit
@@ -37,7 +64,7 @@ module Zmanim
     end
 
     def sof_zman_shma_gra
-      sof_zman_shma(sea_level_sunrise, sea_level_sunset)
+      sof_zman_shma(elevation_adjusted_sunrise, elevation_adjusted_sunset)
     end
 
     def sof_zman_shma_mga
@@ -53,22 +80,22 @@ module Zmanim
     end
 
     def sof_zman_tfila_gra
-      sof_zman_tfila(sea_level_sunrise, sea_level_sunset)
+      sof_zman_tfila(elevation_adjusted_sunrise, elevation_adjusted_sunset)
     end
 
     def sof_zman_tfila_mga
       sof_zman_tfila(alos_72, tzais_72)
     end
 
-    def mincha_gedola(day_start=sea_level_sunrise, day_end=sea_level_sunset)
+    def mincha_gedola(day_start=elevation_adjusted_sunrise, day_end=elevation_adjusted_sunset)
       shaos_into_day(day_start, day_end, 6.5)
     end
 
-    def mincha_ketana(day_start=sea_level_sunrise, day_end=sea_level_sunset)
+    def mincha_ketana(day_start=elevation_adjusted_sunrise, day_end=elevation_adjusted_sunset)
       shaos_into_day(day_start, day_end, 9.5)
     end
 
-    def plag_hamincha(day_start=sea_level_sunrise, day_end=sea_level_sunset)
+    def plag_hamincha(day_start=elevation_adjusted_sunrise, day_end=elevation_adjusted_sunset)
       shaos_into_day(day_start, day_end, 10.75)
     end
 
@@ -77,7 +104,7 @@ module Zmanim
     end
 
     def shaah_zmanis_gra
-      shaah_zmanis(sea_level_sunrise, sea_level_sunset)
+      shaah_zmanis(elevation_adjusted_sunrise, elevation_adjusted_sunset)
     end
 
     def shaah_zmanis_mga
@@ -86,7 +113,15 @@ module Zmanim
 
     def shaah_zmanis_by_degrees_and_offset(degrees, offset)
       opts = {degrees: degrees, offset: offset}
-      shaah_zmanis(alos(opts.merge(offset: -offset)), tzais(opts))
+      shaah_zmanis(alos(opts), tzais(opts))
+    end
+
+    def assur_bemelacha?(current_time, tzais: tzais(), in_israel: false)
+      tzais_time = tzais.is_a?(Hash) ? self.tzais(tzais) : tzais
+      jewish_calendar = HebrewCalendar::JewishCalendar.new(current_time.to_date)
+      jewish_calendar.in_israel = in_israel
+      (current_time.to_datetime <= tzais_time && jewish_calendar.assur_bemelacha?) ||
+          (current_time.to_datetime >= elevation_adjusted_sunset && jewish_calendar.tomorrow_assur_bemelacha?)
     end
 
     private
@@ -97,12 +132,18 @@ module Zmanim
     end
 
     def extract_degrees_offset(opts)
-      [opts[:degrees] || 0.0, opts[:offset] || 0]
+      [opts[:degrees] || 0.0, opts[:offset] || 0, opts[:zmanis_offset] || 0]
     end
 
     def offset_by_minutes(time, minutes)
       return unless time
       time + (minutes / (60 * 24).to_f)
     end
+
+    def offset_by_minutes_zmanis(time, minutes)
+      return unless time
+      shaah_zmanis_skew = shaah_zmanis_gra / HOUR_MILLIS
+      time + (minutes * shaah_zmanis_skew / (60 * 24).to_f)
+    end
   end
 end

data/zmanim.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "tzinfo"
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.3"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.7"
   spec.add_development_dependency "byebug", "~> 9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zmanim
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Pinny Markowitz
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -105,6 +106,7 @@ files:
 - lib/zmanim/limudim/anchor/day_of_month_anchor.rb
 - lib/zmanim/limudim/anchor/day_of_week_anchor.rb
 - lib/zmanim/limudim/anchor/day_of_year_anchor.rb
+- lib/zmanim/limudim/calculators/daf_hashavua_bavli.rb
 - lib/zmanim/limudim/calculators/daf_yomi_bavli.rb
 - lib/zmanim/limudim/calculators/daf_yomi_yerushalmi.rb
 - lib/zmanim/limudim/calculators/mishna_yomis.rb
@@ -132,7 +134,7 @@ homepage: https://github.com/pinnymz/ruby-zmanim
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A Zmanim library for Ruby
 test_files: []