zmanim 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60f1ce1f598d2bb45067fadbb609dca84e62e94da2144d6815c04a14083eeeb9
-  data.tar.gz: e83e26224f23d21216258f3e31ad65bafc18af91f250c09ab9e0a5941061aa34
+  metadata.gz: 106a751ffa4c28d37a4d69afc2d8aa91d8f07b668dc126f6008fec90c3a0b308
+  data.tar.gz: 8886864f89feb9382a62644de99201c4b0958ff2d8652728fad14ed1c6420df9
 SHA512:
-  metadata.gz: '0868fb13463bc643a818c5faa9aad148659ea8597eceadbafbc4a544d8cc88f7b8ec069361939f860eb6c76c4c07b70f7e0100ab3b4e4ff2e19a73fb2dec9908'
-  data.tar.gz: 946ccd345d2fcb4612ff4b2b2782de1c78a822e97fd70b12b4c48569c51d98907aeb05dd9b97894fa0cc4a9397167e5af75e53492e625c9b2f425282ae9d8e08
+  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,35 @@ 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

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/jewish_calendar.rb

@@ -84,6 +84,11 @@ module Zmanim::HebrewCalendar
       %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
@@ -231,6 +236,138 @@ 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 &&
@@ -255,24 +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 = gregorian_vesein_tal_umatar_start
-      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?
-      return false if day_of_week == 6
-      start_date = gregorian_vesein_tal_umatar_start
-      (day_of_week == 7 && self == start_date) ||
-          self == (start_date - 1)
+      succ.vesein_tal_umatar_starts?
     end
 
     def vesein_beracha?
@@ -445,12 +591,53 @@ module Zmanim::HebrewCalendar
       end
     end
 
-    def gregorian_vesein_tal_umatar_start
-      start_date = JewishDate.new(jewish_year, 8, 7)
-      unless in_israel
-        start_date.set_gregorian_date(start_date.gregorian_year, 12, gregorian_leap_year?(start_date.gregorian_year + 1) ? 6 : 5)
+    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
-      start_date
+
+      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/version.rb

@@ -1,3 +1,3 @@
 module Zmanim
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Pinny Markowitz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-14 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