mcalendar 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f1a0686f0df1be91433adbdde9d74b9be99d2f27604e22bb1013594e20628e
-  data.tar.gz: c9a3f6121b369d8f2b47d235a39e321fb20365c1e4eb1564dc712cc96e6e6ad1
+  metadata.gz: 2a619d15bdf7550215ac9ed848508a86ebac27ca5ddfb3c760f890c6e50f93cf
+  data.tar.gz: e76dc41e97df81ef0a473931202b59eaccb71c059b8fb3578c1073783e2e335d
 SHA512:
-  metadata.gz: 2c32d50df9618cb81a32e0f38abe8f0fa2fc7d15f0925d3ec737089d549920475630eb999b3e894e4578640e31f7da8db7a1736b8b6e7239a879e15a3ed842dd
-  data.tar.gz: c9fb9883a4295a4066c841a589c65eba589a7ba89f5002975d5e85f00ccc8ce6fcec8188928945cfafe47ebf1476cf8d5603550d26d3effe27a7746991bd0d24
+  metadata.gz: 2beaf4b682f708bc7ecf63fe41a6e4b1f77602df58c9be037525d33892e4d2d70b25bf52117c7024b9243c7844984ae902a78e61f68b08d2944755752b82577f
+  data.tar.gz: ed12bf433ad7fd82b132e976d1b765f032ca374960257c90578f48bcd97ab834f0b99c4f7b48f6b7fb728bfec6396c69b71fb32e9d881959fc8b8d35e48fe3a0

data/lib/mcalendar.rb

@@ -3,9 +3,10 @@ require "prawn"
 require "prawn/table"
 require "optparse"
 
-require_relative 'mcalendar/config'
 require_relative 'mcalendar/calendar'
 require_relative 'mcalendar/command'
+require_relative 'mcalendar/config'
+require_relative 'mcalendar/holiday'
 require_relative 'mcalendar/options'
 require_relative 'mcalendar/output_pdf'
 require_relative 'mcalendar/version'

data/lib/mcalendar/calendar.rb

@@ -1,14 +1,12 @@
 
 module Mcalendar
-  DEFAULT_PDF_NAME = "calendar.pdf"
-  DAY_OF_WEEK = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
 
   class Calendar
-    attr_reader :pdf_name, :month_title, :days
+    attr_reader :pdf_name, :month_title, :days, :first_of_month, :end_of_month
 
     def initialize(year, month, pdf_name)
-      first_of_month = Date.new(year, month, 1)
-      end_of_month = Date.new(year, month, -1)
+      @first_of_month = Date.new(year, month, 1)
+      @end_of_month = Date.new(year, month, -1)
       @days = (1..end_of_month.day).map {|m| "%2d" % m}
       first_of_month.wday.times {@days.unshift("  ")}
       @month_title = first_of_month.strftime("%B %Y")
@@ -17,7 +15,7 @@ module Mcalendar
     
     def set_pdf_name(name)
       if  name.nil? || name.empty?
-        @pdf_name = Mcalendar::DEFAULT_PDF_NAME
+        @pdf_name = Mcalendar::Config::DEFAULT_PDF_NAME
       else
         @pdf_name = name
       end

data/lib/mcalendar/config.rb

@@ -21,6 +21,43 @@ module Mcalendar
     }
 
     DAY_OF_WEEK = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+    DEFAULT_PDF_NAME = "calendar.pdf"
+
+    Config_day = Struct.new("ConfigDay", :day, :text, :color)
+
+    def self.days_information(obj_calendar)
+      @first_of_month = obj_calendar.first_of_month
+      @end_of_month = obj_calendar.end_of_month
+
+      @days_config = Hash.new(nil)
+      days_basic
+      holiday
+    end
+
+    def self.days_basic
+      (@first_of_month..@end_of_month).each do |date|
+        d_sym = date.strftime("%Y%m%d").to_sym
+        @days_config[d_sym] = Config_day.new(date.day, " ", :black)
+      end
+    end
+
+    def self.holiday
+      y = "%4d" % @first_of_month.year
+      m = "%02d" % @first_of_month.month
+      regex = /#{y}#{m}\d\d/
   
+      Mcalendar::HOLIDAY.keys.grep(regex).each do |d|
+        @days_config[d].day = Date.parse(d.to_s).day
+        @days_config[d].text = Mcalendar::HOLIDAY[d]
+        @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("  ")}
+      pdf_days
+    end
+      
   end
 end

data/lib/mcalendar/holiday.rb

@@ -0,0 +1,22 @@
+module Mcalendar
+  HOLIDAY = {
+    "20200101": "New Year's Day", 
+    "20200113": "Coming-of-age Day", 
+    "20200211": "National Foundation Day", 
+    "20200223": "Emperor's Birthday", 
+    "20200224": "Substitute Holiday", 
+    "20200320": "Vernal Equinox Day", 
+    "20200429": "Showa Day", 
+    "20200503": "Constitution Memorial Day", 
+    "20200504": "Greenery Day", 
+    "20200505": "Children's Day", 
+    "20200506": "Substitute Holiday", 
+    "20200723": "Marine Day", 
+    "20200724": "Sports Day", 
+    "20200810": "Mountain Day", 
+    "20200921": "Respect for the Aged Day", 
+    "20200922": "Autumnal Equinox Day", 
+    "20201103": "Culture Day", 
+    "20201123": "Labour Thanksgiving Day"
+  }
+end

data/lib/mcalendar/output_pdf.rb

@@ -4,7 +4,11 @@ module Mcalendar
     def initialize(obj_calendar)
       @month_header = [[obj_calendar.month_title]]
       @day_of_week = [Mcalendar::Config::DAY_OF_WEEK] 
-      @calendar = obj_calendar.days.each_slice(7).map
+      
+      @pdf_days = []
+      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
  
       super(page_size: 'A4', margin: 20)
@@ -30,22 +34,33 @@ module Mcalendar
 
     def day_content
       @calendar.each do |c|
-        table([c], cell_style: {height: @cell_height / 2}) do
+        row_day = c.map {|x| (x.class == Struct::ConfigDay) ? x.day : x}
+        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
           cells.style(width: 79, align: :center, size: 19)
           row(0).borders = [:top, :left, :right]
-          row(0).padding_top = 10
+          row(0).padding_top = 5
           row(0).padding_bottom = 0
-          column(0).map {|c| c.text_color = Mcalendar::Config::COLOR[:red]}
+          row_color.each_with_index do |color, index|
+            rows(0).columns(index).text_color = Mcalendar::Config::COLOR[color]
+          end
         end
 
-        dummy_text = [""] * c.size
-        table([dummy_text], cell_style: {height: @cell_height / 2}) do
+        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}
           row(0).borders = [:bottom, :left, :right]
-          row(0).padding_top = 2
+          row(0).padding_top = 1
           row(0).padding_bottom = 0
+          row(0).padding_left = 0
+          row(0).padding_right = 0
+          row_color.each_with_index do |color, index|
+            rows(0).columns(index).text_color = Mcalendar::Config::COLOR[color]
+          end
         end
+
       end
     end
 

data/lib/mcalendar/version.rb

@@ -1,3 +1,3 @@
 module Mcalendar
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - icm7216
@@ -87,6 +87,7 @@ files:
 - lib/mcalendar/calendar.rb
 - lib/mcalendar/command.rb
 - lib/mcalendar/config.rb
+- lib/mcalendar/holiday.rb
 - lib/mcalendar/options.rb
 - lib/mcalendar/output_pdf.rb
 - lib/mcalendar/version.rb