christian_calendar 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c92abe7e35a2a9f1ba887096110ade4c91d3f39
-  data.tar.gz: 006b6f9174ab1f07da29a021397c8abd26355682
+  metadata.gz: 71a00a7ed18b45caf96820a7aa249fa1d56cc880
+  data.tar.gz: f396804091f7698b73097670b00a236e37acc3f4
 SHA512:
-  metadata.gz: 2d5d2c216671f7c1653c754b3338b9d362e5876b88d14bb4860abccf8012dd30806b2f40f304cec4d95c5e02059f42279caa4207a4d372b46355e93977fc5e19
-  data.tar.gz: a66ad95550a83a181b59ff0fe53281f79d093815d22f988715e3979136fa985291f70a3c8e50214f411ea6994e6980981a0b87506d8077cea6104afaef381036
+  metadata.gz: 9a89ba05c9199bf234318e7be3daf95aca21234032d34058694b06a14203225464d2656f7a3194fee0ba6b1feea3e481cd088e0dca30fc9f859600c198a49bff
+  data.tar.gz: 81cf9d77ea91cbfd42bf55f233bd9f6a87373cfad3cf72232d3b31129e745eebf0df4f940729582a581c627e70f19a7a3aec2720362aade0bd3922bff858d70a

data/lib/christian_calendar.rb

@@ -58,7 +58,13 @@ class ChristianCalendar
   end
   
   def to_s()
-    to_h.map {|k,v| "%+16s: %s" % [k,v.strftime("%d-%b")]}.join("\n")
+    
+    a = to_h.sort_by{|k, v| v.to_datetime}.map do |k,v| 
+      label = k.to_s.sub(/s(?=_)/,"'s").gsub('_', ' ').split.map(&:capitalize).join(' ')
+      "%+16s: %s" % [label,v.strftime("%d-%b-%Y")]
+    end
+    
+    a.join("\n")
   end
 
   def trinity_sunday()
@@ -109,4 +115,4 @@ if __FILE__ == $0 then
   cc.advent_sunday
 
   cc.to_h
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: christian_calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - James Robertson