zmanim 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34f16334bc5be809d6cfb0cfd526c90256d5eb34
-  data.tar.gz: 6e94981da77ece13e27c9bca543b272da20a0d54
+SHA256:
+  metadata.gz: 60f1ce1f598d2bb45067fadbb609dca84e62e94da2144d6815c04a14083eeeb9
+  data.tar.gz: e83e26224f23d21216258f3e31ad65bafc18af91f250c09ab9e0a5941061aa34
 SHA512:
-  metadata.gz: 49f97be4628c3b48d1fecbce00a8d14b47e89d0f8950dfd84412c6e3ba172ed398f8ed30b8a8bd3ec28862750fc70d63dae8e571ec563a00fe517cf3d617288f
-  data.tar.gz: e4013fada5d08005b6e4206844d43df41dfba2b062e7d1a2e70819b48fc0552d9cec419e84b0ac3c8c8fe634f065f06f25be70ae1a78c5cd470f4b186435a502
+  metadata.gz: '0868fb13463bc643a818c5faa9aad148659ea8597eceadbafbc4a544d8cc88f7b8ec069361939f860eb6c76c4c07b70f7e0100ab3b4e4ff2e19a73fb2dec9908'
+  data.tar.gz: 946ccd345d2fcb4612ff4b2b2782de1c78a822e97fd70b12b4c48569c51d98907aeb05dd9b97894fa0cc4a9397167e5af75e53492e625c9b2f425282ae9d8e08

data/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.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

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)
 
@@ -153,6 +153,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
@@ -161,8 +165,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
@@ -303,6 +313,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.

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.3.0"
+  VERSION = "0.4.0"
 end

data/lib/zmanim/zmanim_calendar.rb

@@ -142,7 +142,7 @@ module Zmanim
 
     def offset_by_minutes_zmanis(time, minutes)
       return unless time
-      shaah_zmanis_skew = shaah_zmanis(elevation_adjusted_sunrise, elevation_adjusted_sunset) / HOUR_MILLIS
+      shaah_zmanis_skew = shaah_zmanis_gra / HOUR_MILLIS
       time + (minutes * shaah_zmanis_skew / (60 * 24).to_f)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zmanim
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Pinny Markowitz
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -105,6 +105,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 +133,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 +148,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: []