mcalendar 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b957b8968e85884abff40ef75462a3061a99fe97d057f8a80c5360a8f1ba11a4
-  data.tar.gz: 508e4d57573f0bc0f0d44634553fe465cdab91efe94138c8385398d39fbf1e68
+  metadata.gz: 12d1ccf31150634c56cc06e9da682bc4cfcac632e8b84417016daba633162434
+  data.tar.gz: fa7418fb37a87aefe0d40d55dc309110eaa289a77f57aaf86c6395b92f44011b
 SHA512:
-  metadata.gz: 7ec173986099a1c9d4070ccdb424b05093e5b2d70d54831595a6968d6ab7a08c7fa43b684d42986b00135c2455e7ad38d83f9b71ca36efca409f2a7a69e33aef
-  data.tar.gz: 5903ccb62a28c78ff60deb53635d28e8b2c6e401ca8a0f5d471c02b54773da584b3c335679923e20816e14beb8e14630e99ef1e479e930832113316363588770
+  metadata.gz: 68922119c2ebe0ee50d2874270c382834178e119f72489ab441d504fcf9cd57876aad8ab4dd1ac8962a74a5cd1c5ce275ae4c84c1873e3b36f8e345689ff2e75
+  data.tar.gz: 69ff48ccb4793f99113d7cc4cd3ee97f2dabab2d0f4175d42eddeb272187bda99c370ff97cbe89abc62b1a20582bc482d2c47be295eb7996a86c5e3e115dde67

data/lib/mcalendar/calendar.rb

@@ -1,16 +1,18 @@
 
 module Mcalendar
   DEFAULT_PDF_NAME = "calendar.pdf"
+  DAY_OF_WEEK = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
 
   class Calendar
-    WEEKS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+    attr_reader :pdf_name, :month_title, :days
 
     def initialize(year, month, pdf_name)
-      @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("  ")}
-      set_pdf_name(pdf_name)
+      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")
+      set_pdf_name(pdf_name)  
     end
     
     def set_pdf_name(name)
@@ -21,13 +23,9 @@ module Mcalendar
       end
     end
 
-    def month_title
-      @first_of_month.strftime("%B %Y")
-    end
-
     def to_s
-      week_header = WEEKS.join(" ")
-      month_header = month_title.center(week_header.size).rstrip
+      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("  ")]}
       [month_header, calendar]
@@ -38,30 +36,7 @@ module Mcalendar
     end
 
     def pdf
-      month_header = [[month_title]]
-      calendar = [WEEKS]
-      @days.each_slice(7) {|x| calendar << x}
-
-      pdf = Prawn::Document.new(page_size: 'A4', margin: 20)
-      # stroke_axis
-      cell_height = calendar.size > 6 ? 50 : 60
-
-      pdf.bounding_box([0, 400], width: 553, height: 400) do
-        pdf.stroke_bounds
-
-        pdf.table(month_header) do
-          cells.style(width: 553, height: 59, align: :center, size: 26)
-          row(0).padding_top = 15
-          row(0).padding_bottom = 0
-        end
-        
-        pdf.table(calendar) do
-          cells.style(width: 79, height: cell_height, align: :center, size: 19, padding: 15)
-          row(0).height = 40
-          row(0).padding_top = 10
-          row(0).padding_bottom = 0
-        end
-      end
+      pdf = Mcalendar::OutputPdf.new(self)
       pdf.render_file @pdf_name
     end
 

data/lib/mcalendar/output_pdf.rb

@@ -0,0 +1,49 @@
+module Mcalendar
+  class OutputPdf < Prawn::Document
+
+    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
+      @cell_height = @calendar.size > 5 ? 50 : 60
+ 
+      super(page_size: 'A4', margin: 20)
+      calendar_render
+    end
+    
+    def month_header
+      table(@month_header) do
+        cells.style(width: 553, height: 59, align: :center, size: 26)
+        row(0).padding_top = 15
+        row(0).padding_bottom = 0
+      end
+    end
+    
+    def week_header
+      table(@day_of_week) do
+        cells.style(width: 79, height: 40, align: :center, size: 19)
+        row(0).padding_top = 10
+        row(0).padding_bottom = 0
+      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
+      end
+    end
+
+    def calendar_render
+      # stroke_axis
+      
+      bounding_box([0, 400], width: 553, height: 400) do
+        stroke_bounds
+        month_header
+        week_header
+        day_content
+      end
+    end
+
+  end
+end

data/lib/mcalendar/version.rb

@@ -1,3 +1,3 @@
 module Mcalendar
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/mcalendar.rb

@@ -6,4 +6,5 @@ require "optparse"
 require_relative 'mcalendar/calendar'
 require_relative 'mcalendar/command'
 require_relative 'mcalendar/options'
+require_relative 'mcalendar/output_pdf'
 require_relative 'mcalendar/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - icm7216
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -87,6 +87,7 @@ files:
 - lib/mcalendar/calendar.rb
 - lib/mcalendar/command.rb
 - lib/mcalendar/options.rb
+- lib/mcalendar/output_pdf.rb
 - lib/mcalendar/version.rb
 - mcalendar.gemspec
 homepage: https://github.com/icm7216/mcalendar