mcalendar 0.3.3 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d49258fa85dc25cba82e52375c0d9652863a5b5c432b11de5d2772ab5cb95eb
-  data.tar.gz: ba46bf414da324ceff275435f1a786fe51c44c8638719b3c9543d1ad6389e6e7
+  metadata.gz: 1c37d4882b2dcea8a3df4b7e8802b319ccbfd1f650fe2fc90e6fb6fafa9919d3
+  data.tar.gz: f6005e4ea03becf4302e45490dcd4a0f00230d6db48d1bec4d6411f7d45c9560
 SHA512:
-  metadata.gz: 80c9b282b8e0f427f23facda279b0d626100d02b26077c2c49ff3792e2ee1beb60de9555b356b508ce8b86e852c7bcdae1719d4271c5b0e1ca2a01df20f62920
-  data.tar.gz: 213447a21b7a77c6d196f566da8b48d259ba918b82f8ccc162da887f173b08e7b669eba2ac1e9cb76bb40620e7d3413c52a1058fd30d19a526cf37f03a7c6cab
+  metadata.gz: '093c36d9b6ccfc75fe69e9c7fe4a406202e24c8592738f0b572f26dfe51802beadee078cfd84e32d4a2ee197406d1b2a97acb9b08e47de98efd1a3efd1f1ccb7'
+  data.tar.gz: ca679323931aaa7cdf0803c2a386b15c23f20d2ecf0902769f4e7e2a770ea5fb8124c1eada288e0847e4dbaaf92045b3a248060cef24ed37828a9cdd7f188690

data/.gitignore

@@ -9,3 +9,4 @@
 /Gemfile.lock
 pdf/*.pdf
 *.pdf
+/.vscode/

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/command.rb

@@ -2,7 +2,6 @@
 
 module Mcalendar
   class Command
-
     def self.run(argv)
       new(argv).execute
     end
@@ -12,12 +11,12 @@ module Mcalendar
     end
 
     def execute
-
       options = Mcalendar::Options.parse(@argv)
       date = options[:date]
       console = options[:opt][:console]
       pdf = options[:opt][:pdf]
       pdf_name = options[:opt][:name]
+      version = options[:opt][:version]
       calendar = Mcalendar::Calendar.new(date.year, date.month, pdf_name)
 
       # output calendar
@@ -25,11 +24,10 @@ module Mcalendar
       calendar.pdf if pdf
 
       # both outputs if no options
-      if console.nil? && pdf.nil?
+      if console.nil? && pdf.nil? && version.nil?
         calendar.display
         calendar.pdf
       end
-      
     end
   end
 end

data/lib/mcalendar/config.rb

@@ -1,80 +1,86 @@
 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",
+  }.freeze
 
-    DAY_OF_WEEK = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
-    DEFAULT_PDF_NAME = "calendar.pdf"
+  DAY_OF_WEEK = %w[Sun Mon Tue Wed Thu Fri Sat].freeze
+  DEFAULT_PDF_NAME = "calendar.pdf".freeze
 
-    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)
+      holiday_description_language
       days_basic
       holiday
       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
-      y = "%4d" % @first_of_month.year
-      m = "%02d" % @first_of_month.month
+    def holiday_description_language
+      Mcalendar.const_set(:HOLIDAY, Mcalendar::EN::HOLIDAY)
+      Mcalendar.const_set(:ANNIVERSARY, Mcalendar::EN::ANNIVERSARY)
+    end
+
+    def holiday
+      y = format("%4d", @first_of_month.year)
+      m = format("%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
-      y = "%4d" % @first_of_month.year
-      m = "%02d" % @first_of_month.month
+    def anniversary
+      y = format("%4d", @first_of_month.year)
+      m = format("%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
-      pdf_days = @days_config.each_value.map {|val| val}
-      @first_of_month.wday.times {pdf_days.unshift("  ")}
+    def days
+      pdf_days = @days_config.each_value.map { |val| val }
+      @first_of_month.wday.times { pdf_days.unshift("  ") }
       pdf_days
     end
-      
   end
-end
+end

data/lib/mcalendar/holiday.rb

@@ -1,31 +1,63 @@
 module Mcalendar
+  module JA
+    # Japanese holidays in Japanese
+    HOLIDAY = {
+      "20200101": "元日",
+      "20200113": "成人の日",
+      "20200211": "建国記念の日",
+      "20200223": "天皇誕生日",
+      "20200224": "振替休日",
+      "20200320": "春分の日",
+      "20200429": "昭和の日",
+      "20200503": "憲法記念日",
+      "20200504": "みどりの日",
+      "20200505": "子供の日",
+      "20200506": "振替休日",
+      "20200723": "海の日",
+      "20200724": "スポーツの日",
+      "20200810": "山の日",
+      "20200921": "敬老の日",
+      "20200922": "秋分の日",
+      "20201103": "文化の日",
+      "20201123": "勤労感謝の日",
+    }.freeze
 
-  # Japanese holidays
-  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"
-  }
+    ANNIVERSARY = {
+      "20200224": "Rubyの誕生日",
+      "20200903": "RubyKaigi 2020 Nagano",
+      "20200904": "RubyKaigi 2020 Nagano",
+      "20200905": "RubyKaigi 2020 Nagano",
+    }.freeze
+  end
 
-  ANNIVERSARY = {
-    "20200224": "Ruby's Birthday",
-    "20200409": "RubyKaigi 2020 Nagano",
-    "20200410": "RubyKaigi 2020 Nagano",
-    "20200411": "RubyKaigi 2020 Nagano"
-  }
+  module EN
+    # Japanese holidays in English
+    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",
+    }.freeze
+
+    ANNIVERSARY = {
+      "20200224": "Ruby's Birthday",
+      "20200903": "RubyKaigi 2020 Nagano",
+      "20200904": "RubyKaigi 2020 Nagano",
+      "20200905": "RubyKaigi 2020 Nagano",
+    }.freeze
+  end
 end

data/lib/mcalendar/options.rb

@@ -1,17 +1,17 @@
 module Mcalendar
   module Options
-
     def self.parse(argv)
       options = {}
 
       parser = OptionParser.new do |o|
-        o.on_head('-v', '--version', 'Show version') do
+        o.on_head("-v", "--version", "Show version") do |v|
+          options[:version] = v
           o.version = Mcalendar::VERSION
           puts o.version
         end
-        o.on('-p', '--pdf', 'output pdf') {|v| options[:pdf] = v}
-        o.on('-n NAME', '--name=NAME', String, 'output pdf name') {|v| options[:name] = v}
-        o.on('-c', '--console', 'output console') {|v| options[:console] = v}
+        o.on("-p", "--pdf", "output pdf") { |v| options[:pdf] = v }
+        o.on("-n NAME", "--name=NAME", String, "output pdf name") { |v| options[:name] = v }
+        o.on("-c", "--console", "output console") { |v| options[:console] = v }
       end
 
       begin
@@ -24,14 +24,14 @@ module Mcalendar
           options[:name] = Mcalendar::DEFAULT_PDF_NAME
         end
       end
-      
+
       begin
         d = Date.parse(remained.first)
       rescue
         d = Date.today
       end
 
-      {date: d, opt: options}
+      { date: d, opt: options }
     end
   end
 end

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.7"
 end

data/mcalendar.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "prawn"
+  spec.add_runtime_dependency "prawn-table"
+
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "test-unit-rr"
   spec.add_development_dependency "prawn"

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.7
 platform: ruby
 authors:
 - icm7216
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: prawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: prawn-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +124,7 @@ homepage: https://github.com/icm7216/mcalendar
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: Ruby Monthly calendar
 test_files: []