mcalendar 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1beacf564591914f261e7a7391c499c8031a1b7eca6f41cb018808ed06662bd
-  data.tar.gz: ac452242093d4e691725c8d129b5fe2524ba7a83d6baaf3540c9ff8767387b3b
+  metadata.gz: 7f26751cd7124cc591143e0a0fe1cfe6062e0a9a5e3b05d6b6159d7bf5add079
+  data.tar.gz: 10c26d535fab1b442877f877eb55251f6a5e728c150d088810221561cac0945e
 SHA512:
-  metadata.gz: cbb5e2d7fabb38866013fb45be2db6e89cec29a2afe710ed9af0d2ed0ada7c0e9a9a87fee3ddbb67de8854283f7362b9c95db6e007b2f17d2f1d33f37db41f93
-  data.tar.gz: a7c9ef7215ce231e20c4bce45a1d21afe285bfe88c23e139a5733b786f6363ea720a57ca5d63879b4a1d1ef7377008a93756bd5eb63887dbb931bba74a55c322
+  metadata.gz: 3165f35909445ceb798da668ba224721520e05af8b55823eb92f1074b49cbfba13f33a9296b9814d42d1ffb37b8cce1f1a76eea410267dbe57b10b5ba4407ac9
+  data.tar.gz: '0738ea2950b47e1533bd775c3246bd1a377c21ed1875b453b4c3c142838775ef5c209e20370270ae1e41bfd5d8807e6432bafc928fb040963f4733055ce71069'

data/lib/mcalendar/config.rb

@@ -32,6 +32,7 @@ module Mcalendar
       @days_config = Hash.new(nil)
       days_basic
       holiday
+      anniversary
     end
 
     def self.days_basic
@@ -53,6 +54,22 @@ module Mcalendar
       end
     end
 
+    def self.anniversary
+      y = "%4d" % @first_of_month.year
+      m = "%02d" % @first_of_month.month
+      regex = /#{y}#{m}\d\d/
+  
+      Mcalendar::ANNIVERSARY.keys.grep(regex).each do |d|
+        @days_config[d].day = Date.parse(d.to_s).day
+        if @days_config[d].text.size > 1
+          @days_config[d].text += (", " + Mcalendar::ANNIVERSARY[d])
+        else
+          @days_config[d].text += Mcalendar::ANNIVERSARY[d]
+        end
+        @days_config[d].color = :black if @days_config[d].color != :red
+      end
+    end
+
     def self.days
       pdf_days = @days_config.each_value.map {|val| val}
       @first_of_month.wday.times {pdf_days.unshift("  ")}

data/lib/mcalendar/holiday.rb

@@ -1,4 +1,6 @@
 module Mcalendar
+
+  # Japanese holidays
   HOLIDAY = {
     "20200101": "New Year's Day", 
     "20200113": "Coming-of-age Day", 
@@ -19,4 +21,11 @@ module Mcalendar
     "20201103": "Culture Day", 
     "20201123": "Labour Thanksgiving Day"
   }
+
+  ANNIVERSARY = {
+    "20200224": "Ruby's Birthday",
+    "20200809": "RubyKaigi 2020 Nagano",
+    "20200810": "RubyKaigi 2020 Nagano",
+    "20200811": "RubyKaigi 2020 Nagano"
+  }
 end

data/lib/mcalendar/output_pdf.rb

@@ -9,7 +9,8 @@ module Mcalendar
       Mcalendar::Config::days_information(obj_calendar)
       @pdf_days = Mcalendar::Config::days
       @calendar = @pdf_days.each_slice(7).map
-      @cell_height = @calendar.size > 5 ? 50 : 60
+      @day_height = @calendar.size > 5 ? 20 : 20
+      @text_height = @calendar.size > 5 ? 30 : 40
  
       super(page_size: 'A4', margin: 20)
       calendar_render
@@ -38,10 +39,10 @@ module Mcalendar
         row_color = c.map {|x| (x.class == Struct::ConfigDay) ? x.color : :black}
         row_text = c.map {|x| (x.class == Struct::ConfigDay) ? x.text : x}
 
-        table([row_day], cell_style: {height: @cell_height / 2}) do
+        table([row_day], cell_style: {height: @day_height}) do
           cells.style(width: 79, align: :center, size: 19)
           row(0).borders = [:top, :left, :right]
-          row(0).padding_top = 5
+          row(0).padding_top = 2
           row(0).padding_bottom = 0
           row_color.each_with_index do |color, index|
             rows(0).columns(index).text_color = Mcalendar::Config::COLOR[color]
@@ -49,11 +50,10 @@ module Mcalendar
           column(0).map {|col| col.text_color = Mcalendar::Config::COLOR[:red]}
         end
 
-        table([row_text], cell_style: {height: @cell_height / 2}) do
-          cells.style(width: 79, align: :center, size: 10)
-          row(0).style = {overflow: :shrink_to_fit}
+        table([row_text], cell_style: {height: @text_height}) do
+          cells.style(width: 79, align: :center, size: 8, overflow: :shrink_to_fit)
           row(0).borders = [:bottom, :left, :right]
-          row(0).padding_top = 1
+          row(0).padding_top = 0
           row(0).padding_bottom = 0
           row(0).padding_left = 0
           row(0).padding_right = 0

data/lib/mcalendar/version.rb

@@ -1,3 +1,3 @@
 module Mcalendar
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - icm7216