mcalendar 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d49258fa85dc25cba82e52375c0d9652863a5b5c432b11de5d2772ab5cb95eb
-  data.tar.gz: ba46bf414da324ceff275435f1a786fe51c44c8638719b3c9543d1ad6389e6e7
+  metadata.gz: 21ef82a6c59eecbb2f6352fcdd3c07319ba97b7c0171c3e0f62acd2af9cf2b69
+  data.tar.gz: a0964b22fc234f1c30e4ff849891cc9e87ce4df0d0fd1b319fb7b7ab33371f38
 SHA512:
-  metadata.gz: 80c9b282b8e0f427f23facda279b0d626100d02b26077c2c49ff3792e2ee1beb60de9555b356b508ce8b86e852c7bcdae1719d4271c5b0e1ca2a01df20f62920
-  data.tar.gz: 213447a21b7a77c6d196f566da8b48d259ba918b82f8ccc162da887f173b08e7b669eba2ac1e9cb76bb40620e7d3413c52a1058fd30d19a526cf37f03a7c6cab
+  metadata.gz: 937ead03075cbc8f91df5051cb1b4ba8c20f64bcad713f213c328e3a7dc285aa3404fc44a2bb5803fe49811456844020b12366c60a8c7a228ac43ce07fa3b0c2
+  data.tar.gz: 3d2082a57b49dce4647546899083832d7b9a8e7b754f0aa0a113c5a5142c8cc93f796510f96ba758bd76d6ffbc058a7814b5d58ddca665761e504707fc3f6246

data/README.md

@@ -1,8 +1,8 @@
 
 # Mcalendar [![Gem Version](https://badge.fury.io/rb/mcalendar.svg)](https://badge.fury.io/rb/mcalendar)
 
-Ruby monthly calendar, console and pdf.
-
+Ruby monthly calendar, console and pdf.  
+This calendar includes Japanese holidays.
 
 ## Installation
 

data/lib/mcalendar/calendar.rb

@@ -15,14 +15,14 @@ module Mcalendar
     
     def set_pdf_name(name)
       if  name.nil? || name.empty?
-        @pdf_name = Mcalendar::Config::DEFAULT_PDF_NAME
+        @pdf_name = Mcalendar::DEFAULT_PDF_NAME
       else
         @pdf_name = name
       end
     end
 
     def to_s
-      week_header = Mcalendar::Config::DAY_OF_WEEK.join(" ")
+      week_header = Mcalendar::DAY_OF_WEEK.join(" ")
       month_header = @month_title.center(week_header.size).rstrip
       calendar = [[week_header]]
       @days.each_slice(7) {|x| calendar << [x.join("  ")]}

data/lib/mcalendar/config.rb

@@ -1,33 +1,39 @@
 module Mcalendar
-  module Config
-    COLOR = {
-      white:    "FFFFFF",
-      silver:   "C0C0C0",
-      gray:     "808080",
-      black:    "000000",
-      red:      "FF0000",
-      maroon:   "800000",
-      yellow:   "FFFF00",
-      olive:    "808000",
-      lime:     "00FF00",
-      green:    "008000",
-      aqua:     "00FFFF",
-      teal:     "008080",
-      blue:     "0000FF",
-      navy:     "000080",
-      fuchsia:  "FF00FF",
-      purple:   "800080",
-      orange:   "FFA500",  
-    }
+  COLOR = {
+    white:    "FFFFFF",
+    silver:   "C0C0C0",
+    gray:     "808080",
+    black:    "000000",
+    red:      "FF0000",
+    maroon:   "800000",
+    yellow:   "FFFF00",
+    olive:    "808000",
+    lime:     "00FF00",
+    green:    "008000",
+    aqua:     "00FFFF",
+    teal:     "008080",
+    blue:     "0000FF",
+    navy:     "000080",
+    fuchsia:  "FF00FF",
+    purple:   "800080",
+    orange:   "FFA500",  
+  }
 
-    DAY_OF_WEEK = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
-    DEFAULT_PDF_NAME = "calendar.pdf"
+  DAY_OF_WEEK = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+  DEFAULT_PDF_NAME = "calendar.pdf"
 
-    Config_day = Struct.new("ConfigDay", :day, :text, :color)
+  Config_day = Struct.new(
+    "ConfigDay", 
+    :day, 
+    :day_color, 
+    :holiday_text, 
+    :anniversary_text 
+  )
 
-    def self.days_information(obj_calendar)
-      @first_of_month = obj_calendar.first_of_month
-      @end_of_month = obj_calendar.end_of_month
+  module Config
+    def days_information
+      # @first_of_month = obj_calendar.first_of_month
+      # @end_of_month = obj_calendar.end_of_month
 
       @days_config = Hash.new(nil)
       days_basic
@@ -35,42 +41,37 @@ module Mcalendar
       anniversary
     end
 
-    def self.days_basic
+    def 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)
+        @days_config[d_sym] = Config_day.new(date.day, :black, nil, nil)
       end
     end
 
-    def self.holiday
+    def 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
+        @days_config[d].day_color = :red
+        @days_config[d].holiday_text = Mcalendar::HOLIDAY[d]
       end
     end
 
-    def self.anniversary
+    def 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
+        @days_config[d].anniversary_text = Mcalendar::ANNIVERSARY[d]
       end
     end
 
-    def self.days
+    def days
       pdf_days = @days_config.each_value.map {|val| val}
       @first_of_month.wday.times {pdf_days.unshift("  ")}
       pdf_days

data/lib/mcalendar/output_pdf.rb

@@ -1,13 +1,16 @@
 module Mcalendar
   class OutputPdf < Prawn::Document
+    include Mcalendar::Config
 
     def initialize(obj_calendar)
+      @first_of_month = obj_calendar.first_of_month
+      @end_of_month = obj_calendar.end_of_month
       @month_header = [[obj_calendar.month_title]]
-      @day_of_week = [Mcalendar::Config::DAY_OF_WEEK] 
+      @day_of_week = [Mcalendar::DAY_OF_WEEK] 
       
       @pdf_days = []
-      Mcalendar::Config::days_information(obj_calendar)
-      @pdf_days = Mcalendar::Config::days
+      days_information
+      @pdf_days = days
       @calendar = @pdf_days.each_slice(7).map
       @day_height = @calendar.size > 5 ? 20 : 20
       @text_height = @calendar.size > 5 ? 30 : 40
@@ -29,15 +32,24 @@ module Mcalendar
         cells.style(width: 79, height: 40, align: :center, size: 19)
         row(0).padding_top = 10
         row(0).padding_bottom = 0
-        cells[0, 0].text_color = Mcalendar::Config::COLOR[:red]
+        cells[0, 0].text_color = Mcalendar::COLOR[:red]
       end
     end
 
     def day_content
       @calendar.each do |c|
         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}
+        row_color = c.map {|x| (x.class == Struct::ConfigDay) ? x.day_color : :black}
+        row_text = c.map do |x|
+          str = ""
+          if x.class == Struct::ConfigDay
+            holiday_str = %Q[<color rgb="#{Mcalendar::COLOR[:red]}">#{x.holiday_text}</color>\n]
+            anniversary_str = %Q[<color rgb="#{Mcalendar::COLOR[:green]}">#{x.anniversary_text}</color>]         
+            str += holiday_str if x.holiday_text
+            str += anniversary_str if x.anniversary_text
+          end
+          str
+        end
 
         table([row_day], cell_style: {height: @day_height}) do
           cells.style(width: 79, align: :center, size: 19)
@@ -45,23 +57,19 @@ module Mcalendar
           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]
+            rows(0).columns(index).text_color = Mcalendar::COLOR[color]
           end
-          column(0).map {|col| col.text_color = Mcalendar::Config::COLOR[:red]}
+          column(0).map {|col| col.text_color = Mcalendar::COLOR[:red]}
         end
 
         table([row_text], cell_style: {height: @text_height}) do
-          cells.style(width: 79, align: :center, size: 8, overflow: :shrink_to_fit)
+          cells.style(width: 79, align: :center, size: 8, overflow: :shrink_to_fit, inline_format: true)
           row(0).borders = [:bottom, :left, :right]
           row(0).padding_top = 0
           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.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - icm7216
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit