zmanim 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7a1368c46f18f412f39609c0d076d14e9786a5
-  data.tar.gz: f74bde128ee6b5131e1f55ede44feff17ac853f3
+  metadata.gz: 3f1cc976587acbbfd1df9ee5cd4fa5fda1a87e79
+  data.tar.gz: 3769e3712e2161dc0298a4c4d2be922854b97d31
 SHA512:
-  metadata.gz: cc70992c4c514e0ba3b77126dace5f4f216c9714b84bd4b5dbf0e80e14a1a994544e708f70c2e650e9aac5d125c3fd391bac4524318d8607fefc6ea874f55c5d
-  data.tar.gz: a85bc156410ea7493f1156e5f100b6a83e5cdb2fe99f90835c2f3c56b80d41c8727c791820ecc088743d05c31817bcc6fe21ff292014fd1f0a5c93590a9a5bb0
+  metadata.gz: 7e5e8c962d601071f4f9fed2fe5d83129ef1fc06738e47a25805869874fc1bd2bc538531551d3cac703f246bca3ad4fa42b1d9fb47a64eeeb4365d028a4fed42
+  data.tar.gz: a39894be370c65758d39925861bcf19c2b108efe9c640001a80d771411692af9ec40b49f9e59006cf31be5aedbfe018d9c73aa9f409bb9e7edc95bf0555ba84c

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+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.2.0] - 2018-04-22
+### Added
+- Pirkei Avos limudim calculation
+- Support for explicit skip_unit (used by DafYomiYerushalmi)
+- CHANGELOG (this file :) )
+### Changed
+- Refactored skip_interval to generic limud detection
+### Fixed
+- Cycle detection falsely identifies dates between cycle windows as belonging to a prior cycle
+- Load sequence can't find Zmanim module when loaded externally
+
+## [0.1.0] - 2018-01-09 (Original release)
+### Added
+- Port of KosherJava/zmanim library, primary functionality
+- Limudim calculation framework
+- Weekly Parsha, Tehillim (Month cycle), Mishna Yomis limudim calculation

data/lib/zmanim.rb

@@ -1,6 +1,5 @@
 require 'tzinfo'
-Dir[File.dirname(__FILE__) + "/**/*.rb"].each {|file| require file }
 
-module Zmanim
-  # Your code goes here...
-end
+module Zmanim; end
+
+Dir[File.dirname(__FILE__) + "/**/*.rb"].each {|file| require file }

data/lib/zmanim/hebrew_calendar/jewish_calendar.rb

@@ -143,6 +143,10 @@ module Zmanim::HebrewCalendar
       Zmanim::Limudim::Calculators::MishnaYomis.new.limud(self)
     end
 
+    def pirkei_avos
+      Zmanim::Limudim::Calculators::PirkeiAvos.new(in_israel: in_israel).limud(self)
+    end
+
     def tefilah_additions(walled_city: false, nusach: :ashkenaz)
       additions = []
       if mashiv_haruach_starts?

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

@@ -33,12 +33,8 @@ module Zmanim::Limudim::Calculators
       end
     end
 
-    def unit_for_interval(units, interval)
-      if matches_skip_day?(interval.start_date)
-        Zmanim::Limudim::Unit.new('no_daf_today')
-      else
-        super
-      end
+    def skip_unit
+      Zmanim::Limudim::Unit.new('no_daf_today')
     end
 
     def skip_interval?(interval)

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

@@ -0,0 +1,54 @@
+require 'zmanim/limudim/limud_calculator'
+
+module Zmanim::Limudim::Calculators
+  class PirkeiAvos
+    include Zmanim::Limudim::LimudCalculator
+
+    attr_reader :in_israel
+
+    def initialize(in_israel:false)
+      @in_israel = in_israel
+    end
+
+    def tiered_units?
+      false
+    end
+
+    def perpetual_cycle_anchor
+      Zmanim::Limudim::Anchor::DayOfYearAnchor.new(1, in_israel ? 22 : 23) # Day after Pesach
+    end
+
+    def default_units
+      @default_units ||= (1..6).to_a * 4    # 4 sub-cycles of 6 perakim, with the last sub-cycle being compressed as needed
+    end
+
+    def cycle_end_calculation
+      ->(start_date, _iteration) do
+        rosh_hashana = Zmanim::HebrewCalendar::JewishDate.new(start_date.jewish_year + 1, 7, 1)
+        rosh_hashana - rosh_hashana.day_of_week  # last Shabbos before Rosh Hashanah
+      end
+    end
+
+    def interval_end_calculation
+      ->(cycle, start_date) do
+        start_date + (7 - start_date.day_of_week)
+      end
+    end
+
+    def skip_interval?(interval)
+      !in_israel && [interval.end_date.jewish_month, interval.end_date.jewish_day] == [3,7]
+    end
+
+    def cycle_units_calculation
+      ->(cycle) do
+        cycle_weeks = ((cycle.end_date - cycle.start_date + 1) / 7.0).ceil
+        # If the cycle starts on a Friday, outside of israel the 2nd day of Shavuos will fall on Shabbos
+        # and we lose one week in the pirkei avos cycle
+        cycle_weeks -=1 if !in_israel && cycle.start_date.day_of_week == 6
+        unit_count = default_units.length
+        compress_weeks = (unit_count - cycle_weeks) * 2
+        default_units.first(unit_count - compress_weeks) + default_units.last(compress_weeks).each_slice(2).to_a
+      end
+    end
+  end
+end

data/lib/zmanim/limudim/limud_calculator.rb

@@ -5,14 +5,15 @@ module Zmanim::Limudim
     def limud(date)
       jewish_date = jewish_date(date)
       cycle = find_cycle(jewish_date)
-      return nil unless cycle
+      return nil unless cycle && cycle.end_date >= date
       units = cycle_units_calculation.(cycle)
       interval = cycle.first_interval(interval_end_calculation)
       while !jewish_date.between?(interval.start_date, interval.end_date) do
-        interval = interval.next(interval_end_calculation)
-        while !jewish_date.between?(interval.start_date, interval.end_date) && skip_interval?(interval)
-          interval = interval.skip(interval_end_calculation)
-        end
+        interval = if skip_interval?(interval)
+                     interval.skip(interval_end_calculation)
+                   else
+                     interval.next(interval_end_calculation)
+                   end
       end
       unit = unit_for_interval(units, interval)
       Zmanim::Limudim::Limud.new(interval, unit)
@@ -79,10 +80,15 @@ module Zmanim::Limudim
     end
 
     def unit_for_interval(units, interval)
+      return skip_unit if skip_interval?(interval)
       return tiered_units_for_interval(units, interval) if tiered_units?
       Unit.new(*units[interval.iteration-1])
     end
 
+    def skip_unit
+      nil
+    end
+
     def skip_interval?(interval)
       false
     end

data/lib/zmanim/limudim/limudim_formatter.rb

@@ -159,6 +159,12 @@ module Zmanim::Limudim
       prefix + limud.unit.render {|e| format_number(e) }
     end
 
+    def format_avos(limud)
+      return '' unless unit = (limud && limud.unit)
+      prefix = hebrew_format ? 'פרקי אבות ' : 'Pirkei Avos '
+      prefix + unit.render {|e| format_number(e) }
+    end
+
     private
 
     def format_number(number)

data/lib/zmanim/version.rb

@@ -1,3 +1,3 @@
 module Zmanim
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zmanim
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Pinny Markowitz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -108,6 +109,7 @@ files:
 - lib/zmanim/limudim/calculators/daf_yomi_yerushalmi.rb
 - lib/zmanim/limudim/calculators/mishna_yomis.rb
 - lib/zmanim/limudim/calculators/parsha.rb
+- lib/zmanim/limudim/calculators/pirkei_avos.rb
 - lib/zmanim/limudim/calculators/tehillim_monthly.rb
 - lib/zmanim/limudim/cycle.rb
 - lib/zmanim/limudim/interval.rb