mcalendar 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcbc60858456eb075831cb05c8f42459f7e446f31e8d57c4d8f244d1ed8ac3a0
-  data.tar.gz: 248a5c705642187131f7eb47744c4c768bec5442e8ed900a6399089689b055d5
+  metadata.gz: b4f1a0686f0df1be91433adbdde9d74b9be99d2f27604e22bb1013594e20628e
+  data.tar.gz: c9a3f6121b369d8f2b47d235a39e321fb20365c1e4eb1564dc712cc96e6e6ad1
 SHA512:
-  metadata.gz: 0e5f3c0035fe8dbb307916ac63de8ccbd890cac92afd6f790675786c6f5552581d3ee7039e4e12cc25410536de1f149b32ca72fecf1c6fbded43b2dba61849fd
-  data.tar.gz: baacdc721cf8552af2616f706894d3707baf4b6ea83b741da8b082934692fc7dae1598d45983259921a2ed9738d4722f60a3d06b59887e0977bad0aa086de93e
+  metadata.gz: 2c32d50df9618cb81a32e0f38abe8f0fa2fc7d15f0925d3ec737089d549920475630eb999b3e894e4578640e31f7da8db7a1736b8b6e7239a879e15a3ed842dd
+  data.tar.gz: c9fb9883a4295a4066c841a589c65eba589a7ba89f5002975d5e85f00ccc8ce6fcec8188928945cfafe47ebf1476cf8d5603550d26d3effe27a7746991bd0d24

data/lib/mcalendar/calendar.rb

@@ -24,7 +24,7 @@ module Mcalendar
     end
 
     def to_s
-      week_header = Mcalendar::DAY_OF_WEEK.join(" ")
+      week_header = Mcalendar::Config::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

@@ -0,0 +1,26 @@
+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",  
+    }
+
+    DAY_OF_WEEK = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+  
+  end
+end

data/lib/mcalendar/output_pdf.rb

@@ -3,8 +3,8 @@ module Mcalendar
 
     def initialize(obj_calendar)
       @month_header = [[obj_calendar.month_title]]
-      @day_of_week = [Mcalendar::DAY_OF_WEEK] 
-      @calendar = obj_calendar.days.each_slice(7).to_a
+      @day_of_week = [Mcalendar::Config::DAY_OF_WEEK] 
+      @calendar = obj_calendar.days.each_slice(7).map
       @cell_height = @calendar.size > 5 ? 50 : 60
  
       super(page_size: 'A4', margin: 20)
@@ -24,15 +24,28 @@ 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 = "FF0000"
+        cells[0, 0].text_color = Mcalendar::Config::COLOR[:red]
       end
     end
-    
+
     def day_content
-      table(@calendar, cell_style: {height: @cell_height}) do
-        cells.style(width: 79, align: :center, size: 19)
-        row(0).padding = 15
-        column(0).map {|c| c.text_color = "FF0000"}
+      @calendar.each do |c|
+        table([c], 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_bottom = 0
+          column(0).map {|c| c.text_color = Mcalendar::Config::COLOR[:red]}
+        end
+
+        dummy_text = [""] * c.size
+        table([dummy_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_bottom = 0
+        end
       end
     end
 

data/lib/mcalendar/version.rb

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

data/lib/mcalendar.rb

@@ -3,6 +3,7 @@ require "prawn"
 require "prawn/table"
 require "optparse"
 
+require_relative 'mcalendar/config'
 require_relative 'mcalendar/calendar'
 require_relative 'mcalendar/command'
 require_relative 'mcalendar/options'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - icm7216
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -86,6 +86,7 @@ files:
 - lib/mcalendar.rb
 - lib/mcalendar/calendar.rb
 - lib/mcalendar/command.rb
+- lib/mcalendar/config.rb
 - lib/mcalendar/options.rb
 - lib/mcalendar/output_pdf.rb
 - lib/mcalendar/version.rb