easter 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b57e677060629a225b45ea9dbe713e7a76d0ffa
-  data.tar.gz: dd5d754603c521094bf8fbd481836cf3f58a38f5
+SHA256:
+  metadata.gz: c2d7062f0f94c0b5f9e4869073c2dd43a12d371e60ca43f30ea690da6266fac5
+  data.tar.gz: cfc3b97c458e0018dcdb58707ca4b81d54a756c3b262c8208bc9264a7f08f9e8
 SHA512:
-  metadata.gz: 1993ca2513aeadc000a72d47baeaccae6f738a119c903b6cdc8a0b28bbb127cce26c9d7e1c738f4f34358c0f77d06a3cad0a1defc291a3ec97ceb92853a1a079
-  data.tar.gz: e5c7f0d376e71bf1bcf6c35d5f9407aa2acc39821a3f61952442b15fe48d48e6e941d79148acabccf84cb3c4bc681a888aa0ff7f62aeeebdbce7ea5ce8f88185
+  metadata.gz: eb38a8021056c2b5a6297841eb22d10cf7146b17dec403f79a1705ea86413dae1ea21dea3c66dba94431aca785c66c55bfe11b8d5c7598f81f9496d28dfce440
+  data.tar.gz: 1c5267b5b39e14052170bb89d1a3f2f5441deeb102e4a1f2aa5ef860f6a8d256a311a277ebb850149af8959f497b82a29b159641f29d0407e7b9707075b6f0a2

data/lib/easter.rb

@@ -20,6 +20,7 @@
 
 
 require 'date'
+require 'human_speakable'
 
 class Easter
 
@@ -58,12 +59,20 @@ class Easter
     end
     
   end
+  
+  def self.holy_thursday(some_year=Time.now.year)
+    easter(some_year) - 3
+  end    
 
   # Determine the date of Good Friday for a given year.
   #
   def self.good_friday(some_year=Time.now.year)
     easter(some_year) - 2
   end
+  
+  def self.holy_saturday(some_year=Time.now.year)
+    easter(some_year) - 1
+  end  
 
   # Determine the date of Palm Sunday for a given year.
   #
@@ -91,6 +100,65 @@ class Easter
 
 end
 
+class EasterVoice
+  using HumanSpeakable
+  
+  def initialize(future: false)
+    @future = future
+  end
+
+  def easter()        date :easter                         end
+  def ascension_day() date :ascension_day, 'Ascension day' end
+  def ash_wednesday() date :ash_wednesday, 'Ash Wednesday' end
+  def good_friday()   date :good_friday,   'Good Friday'   end
+  def holy_thursday() date :holy_thursday, 'Holy Thursday' end        
+  def holy_saturday() date :holy_saturday, 'Holy Saturday' end    
+  def palm_sunday()   date :palm_sunday,   'Palm Sunday'   end
+  def pentecost()     date :pentecost,     'Pentecost'     end
+    
+  def easter_dates()
+    %i(ash_wednesday palm_sunday good_friday easter ascension_day  pentecost)\
+        .map {|day| method(day).call }.join("\n")
+  end
+  
+  
+  def lent_start() date :ash_wednesday, 'Lent'               end
+  def lent_end()   date :holy_thursday, 'The end of Lent'    end
+  
+  def lent()
+    
+    participle = case Date.today
+    when (Easter.ash_wednesday..Easter.holy_thursday) then 'is'      
+    when (Date.new(Date.year)..Easter.ash_wednesday) then 'will be'
+    else 
+      'was'
+    end
+    
+    days =  %i(ash_wednesday holy_thursday)\
+        .map {|x| Easter.method(x).call.humanize(year: true).sub(/on /,'') }
+    "Lent %s from %s to %s." % [participle, *days]
+  end
+  
+  private
+  
+  def date(s, label=s.to_s.capitalize)
+
+    d = Easter.method(s.to_sym).call    
+    
+    year = if d < Date.today and @future then
+      d = Easter.method(s.to_sym).call(Time.now.year+1)
+      ' ' + (Time.now.year+1).to_s
+    else
+      ''
+    end
+    
+    participle = d >= Date.today ? 'is' : 'was'
+    r = "%s %s %s" % [label, participle, d.humanize]
+    r + year + '.'
+  end
+  
+end
+
 if $0 == __FILE__ then
 
   test_year = 2014
@@ -109,4 +177,4 @@ if $0 == __FILE__ then
 
   puts out.join "\n"
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,32 +10,56 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDMxNjE1MDYxNVoXDTE1MDMxNjE1MDYxNVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAOXHlhbOsu/ZyeapVqteHz+mSbZD2wfzABBXGqbdOHzb2/wpUYu0ott9aZAK
-  BTEiuP242oM0mjk+TTGbsls5GS4uKEkEmYXJrAE9m1BxChboMSFRpc9MHKNUSexC
-  wV5pE66Ktj0IlRKaUN0ZFsTgF6TlUczRXwM8NKLrwpvo5PiR+WSX7QKpSt1/Flh+
-  91DToiaFZs2M1SziQdaaAH0bjkoLfLYFw0lEzlGeaeQU8OXGohKWUSsLCsjeNOzU
-  uII6x1c5iEiVK3e2rmhxHn+boj9rkYzvoZMqy7LisCpJLlo8/6FbcGtyAcD6GnxE
-  Yq1ugEOF/JHBCJI3cP4ER1+LaDUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUx8zk6ed9hw6Fo/Az11304nfN9L4wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAvRJFX3mm
-  Q1MH1cYm3wqHSoVLC9brsQH/mlq+1Nnmp+avyppUYzwKTvkJ0Bniqil9yI+4KLxH
-  3eNOS4SPDq5LtjFyfa/+lrKJAhZWV2OoL8ra6+ocU/YOzQD1+fCL9WDfFhDcSDDU
-  TiTsGjlMRxTroAxjaAg4gGpHPEXZGQc+0DlXOypdcgufWsW/HJWQo8vRdeJy7zuZ
-  1KQKCvGPs74xt/kN0+EaSpOQc4zcR9MNxjNe4QBqzrozEcoqoElHEYv1FabohPMM
-  OW9dUl/zTr7KVeB0sQKeNmbhMVFI6bd/YKjhPf55w78F263dXlx12uOhtIAC4IBs
-  P0/HJZKYxWIGWg==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMzEyMTQwNDA2WhcN
+  MjAwMzExMTQwNDA2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCsLGcP
+  N2TZvzn18EabS1LwRBq/o9O+Zd0tOnwu6RGusrqO+p3RpSXiyK1B0j08/BMPDjL8
+  Gv4r/k4QCz1psaSWYrFsqXTdfY9M3luvcEPvZM/dnWR56PMp+ZlMHe5foVybeycY
+  6qnWw9/YMMNrd2cGiOfgdrSe5cD2sQC+UtjhIgVGwneuPqkHXdilx3vy8lDMVtiI
+  LPSkGDZrworgSZxkANQx8L4CsLKUDdJf9zLcYf6/8zpck3JAILFc8VZilXxmZuC1
+  YID98XHoybWsQzQV68yXkFSJKFTGBnb03PEqm8wSduXUhOVTjA/EX+dn71VoCzwR
+  80VALCCk+sd9QlG/Iv+HjvIQY1Da7C7BLX6UY7SrG0qnpwI4UDSssOYkdj7+RnT5
+  F+ciUfHlUcc06p2uJGcUJCTyYKQp9s1gC053kiaxs72kD7BtPcqImfn9W6On2gWu
+  0K8m85vJui+3dTeL04zDugvNZ63avIzAfN34bFKTYddp5XOPZMRZsqqYoDECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU2gCaHyL4
+  LKJ0Yq08/sOjkM+y2rgwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEADUoeXNrLKsgNtC5bk+YibO43Xz+zvutBslPq3vTH
+  4UV0ECXRZiPsjkho5U/TnKCp43JkIrzpjH7QnHGEIIXs/NLdS+5MQkj9nrRLNLT8
+  KTVBT47U1TCTcnlivYOrrUZo/zS9k4rT9iP+9WLb6sU59/ok2e49YhITRGDAOXtT
+  o9hYqTrgWAoGTGA4bbo1FrXLY8NnwOOLUvMU0U35PmH2OPSvODaTS/dD2T/9Op3g
+  q5OWIbWW859juxlpuJaMh362Q5o+uDtfIQITlLzkjsiXPbPiI+EfKKR4a1v5ug6t
+  RcRhD7vHlqjaIiNUEmYx+gS8bsRpb75Czaj+M4TA8yU2VN8Xxgp2g0SSDVHvg3WO
+  SeWYuOIKeuB7CDRo8trpdY3OVbx2Qg/l/RuoLmHaeDWujTgoSx1Phu7CqGPtohsk
+  EGBRx2bgD0vhyFYpo2e56w2tqULQe+YRWNX6Jx5gQAfQtqOksWlBWb6Nt3bwx0Rr
+  k1sGQxBWf1KccWNeZ3xH0oQn
   -----END CERTIFICATE-----
-date: 2014-05-31 00:00:00.000000000 Z
-dependencies: []
+date: 2019-03-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: human_speakable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 description: Returns the date for Easter, Ash Wednesday, Palm Sunday, Good Friday,
   Ascension Day, and Pentecost.
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -53,15 +77,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Calculates Easter day as well as related days