mcalendar 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c37d4882b2dcea8a3df4b7e8802b319ccbfd1f650fe2fc90e6fb6fafa9919d3
-  data.tar.gz: f6005e4ea03becf4302e45490dcd4a0f00230d6db48d1bec4d6411f7d45c9560
+  metadata.gz: 7a634777135f135d9aeae14ea0bc037a3974ebe8f1574d6d021a11f959d01cc7
+  data.tar.gz: 3afd599f14c4689099906def2f233f489ba990b09b4424422dad20dfd2b4e054
 SHA512:
-  metadata.gz: '093c36d9b6ccfc75fe69e9c7fe4a406202e24c8592738f0b572f26dfe51802beadee078cfd84e32d4a2ee197406d1b2a97acb9b08e47de98efd1a3efd1f1ccb7'
-  data.tar.gz: ca679323931aaa7cdf0803c2a386b15c23f20d2ecf0902769f4e7e2a770ea5fb8124c1eada288e0847e4dbaaf92045b3a248060cef24ed37828a9cdd7f188690
+  metadata.gz: 3f54acf7a0748733220713a0fb2395e881c2364e2ee76d95c4ce6f7840bcc5202a8f7f7b1c85eaf0aaa48782af05f063f29761a47cb4313101ca74e0ce0f18ec
+  data.tar.gz: d9f6e5f64f7668e771e7bb183f940f0c5d465e9544819abef54d773d8b3071ffe8f40e4e736cda4b373b26622b5967c32fd06bb4c2d63a1309df2a1339df352b

data/.gitignore

@@ -1,12 +1,12 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/Gemfile.lock
-pdf/*.pdf
-*.pdf
-/.vscode/
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/Gemfile.lock
+pdf/*.pdf
+*.pdf
+/.vscode/

data/Gemfile

@@ -1,6 +1,4 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in mcalendar.gemspec
-gemspec
-
-gem "rake", "~> 12.0"
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in mcalendar.gemspec
+gemspec

data/README.md

@@ -1,65 +1,65 @@
-
-# Mcalendar [![Gem Version](https://badge.fury.io/rb/mcalendar.svg)](https://badge.fury.io/rb/mcalendar)
-
-Ruby monthly calendar, console and pdf.  
-This calendar includes Japanese holidays.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'mcalendar'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
-    $ gem install mcalendar
-
-
-## Usage
-
-If you want to create a calendar for this month.
-
-When you run the command, the calendar appears on the console. The pdf file is created in the current directory.
-```
-mcalendar
-```
-
-If you want to create a calendar for any month.
-```
-mcalendar 2020/02
-```
-
-If you want to output only PDF, use the `-p` option.
-```
-mcalendar 2020/02 -p
-```
-
-Also, If you want to output only console, use the `-c` option.
-```
-mcalendar 2020/02 -c
-```
-
-The default PDF file name is `calendar.pdf`. You can specify any name using the `-n` option.
-```
-mcalendar 2020/02 -n my_calendar.pdf
-```
-
-show help
-```
->mcalendar -h
-Usage: mcalendar [options]
-    -v, --version                    Show version
-    -p, --pdf                        output pdf
-    -n, --name=NAME                  output pdf name
-    -c, --console                    output console
-```
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+# Mcalendar [![Gem Version](https://badge.fury.io/rb/mcalendar.svg)](https://badge.fury.io/rb/mcalendar)
+
+Ruby monthly calendar, console and pdf.  
+This calendar includes Japanese holidays.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'mcalendar'
+```
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install mcalendar
+
+
+## Usage
+
+If you want to create a calendar for this month.
+
+When you run the command, the calendar appears on the console. The pdf file is created in the current directory.
+```
+mcalendar
+```
+
+If you want to create a calendar for any month.
+```
+mcalendar 2020/02
+```
+
+If you want to output only PDF, use the `-p` option.
+```
+mcalendar 2020/02 -p
+```
+
+Also, If you want to output only console, use the `-c` option.
+```
+mcalendar 2020/02 -c
+```
+
+The default PDF file name is `calendar.pdf`. You can specify any name using the `-n` option.
+```
+mcalendar 2020/02 -n my_calendar.pdf
+```
+
+show help
+```
+>mcalendar -h
+Usage: mcalendar [options]
+    -v, --version                    Show version
+    -p, --pdf                        output pdf
+    -n, --name=NAME                  output pdf name
+    -c, --console                    output console
+```
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/mcalendar/calendar.rb

@@ -2,41 +2,37 @@
 module Mcalendar
 
   class Calendar
-    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)
-      @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)  
+    def initialize(year, month)
+      @year = year
+      @month = month
     end
     
-    def set_pdf_name(name)
-      if  name.nil? || name.empty?
-        @pdf_name = Mcalendar::DEFAULT_PDF_NAME
-      else
-        @pdf_name = name
-      end
+    def first_of_month
+      Date.new(@year, @month, 1)
+    end
+    
+    def end_of_month
+      Date.new(@year, @month, -1)
+    end
+    
+    def days
+      days = (1..end_of_month.day).map {|m| "%2d" % m}
+      first_of_month.wday.times {days.unshift("  ")}
+      days
+    end
+
+    def month_title
+      first_of_month.strftime("%B %Y")
     end
 
     def to_s
       week_header = Mcalendar::DAY_OF_WEEK.join(" ")
-      month_header = @month_title.center(week_header.size).rstrip
+      month_header = month_title.center(week_header.size).rstrip
       calendar = [[week_header]]
-      @days.each_slice(7) {|x| calendar << [x.join("  ")]}
+      days.each_slice(7) {|x| calendar << [x.join("  ")]}
       [month_header, calendar]
     end
-        
-    def display
-      puts to_s
-    end
-
-    def pdf
-      pdf = Mcalendar::OutputPdf.new(self)
-      pdf.render_file @pdf_name
-    end
 
   end
 end

data/lib/mcalendar/command.rb

@@ -9,24 +9,42 @@ module Mcalendar
     def initialize(argv)
       @argv = argv
     end
+    
+    def output_console
+      puts @calendar.to_s
+    end
+
+    def output_pdf
+      @outputpdf.render_file(pdf_filename)
+    end
+
+    def pdf_filename
+      if  @pdf_name.nil? || @pdf_name.empty?
+        Mcalendar::DEFAULT_PDF_NAME
+      else
+        @pdf_name = @pdf_name.downcase.end_with?(".pdf")? @pdf_name : @pdf_name + ".pdf"
+      end
+    end
 
     def execute
       options = Mcalendar::Options.parse(@argv)
       date = options[:date]
       console = options[:opt][:console]
       pdf = options[:opt][:pdf]
-      pdf_name = options[:opt][:name]
+      @pdf_name = options[:opt][:name]
       version = options[:opt][:version]
-      calendar = Mcalendar::Calendar.new(date.year, date.month, pdf_name)
+      @calendar = Mcalendar::Calendar.new(date.year, date.month)
+      @outputpdf = Mcalendar::OutputPdf.new(@calendar)
 
       # output calendar
-      calendar.display if console
-      calendar.pdf if pdf
+      output_console if console
+      output_pdf if pdf
+
 
       # both outputs if no options
       if console.nil? && pdf.nil? && version.nil?
-        calendar.display
-        calendar.pdf
+        output_console
+        output_pdf
       end
     end
   end

data/lib/mcalendar/config.rb

@@ -30,33 +30,41 @@ module Mcalendar
     :anniversary_text
   )
 
-  module Config
-    def days_information
-      # @first_of_month = obj_calendar.first_of_month
-      # @end_of_month = obj_calendar.end_of_month
+  class Schedule
+    extend Forwardable
+    def_delegators :@calendar, :first_of_month, :end_of_month
 
+    def initialize(calendar)
+      @calendar = calendar
       @days_config = Hash.new(nil)
+      
+      setup_schedule
+    end
+
+
+    def setup_schedule
       holiday_description_language
       days_basic
-      holiday
-      anniversary
+      holidays_in_the_month
+      anniversaries_in_the_month
+    end
+
+    def holiday_description_language
+      Mcalendar.const_set(:HOLIDAY, Mcalendar::EN::HOLIDAY)
+      Mcalendar.const_set(:ANNIVERSARY, Mcalendar::EN::ANNIVERSARY)
     end
 
     def days_basic
-      (@first_of_month..@end_of_month).each do |date|
+      (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, nil, nil)
       end
+      @days_config
     end
 
-    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)
+    def holidays_in_the_month
+      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|
@@ -64,23 +72,25 @@ module Mcalendar
         @days_config[d].day_color = :red
         @days_config[d].holiday_text = Mcalendar::HOLIDAY[d]
       end
+      @days_config
     end
 
-    def anniversary
-      y = format("%4d", @first_of_month.year)
-      m = format("%02d", @first_of_month.month)
+    def anniversaries_in_the_month
+      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
         @days_config[d].anniversary_text = Mcalendar::ANNIVERSARY[d]
       end
+      @days_config
     end
 
-    def days
-      pdf_days = @days_config.each_value.map { |val| val }
-      @first_of_month.wday.times { pdf_days.unshift("  ") }
-      pdf_days
+    def daily_schedule
+      daily = @days_config.each_value.map { |val| val }
+      first_of_month.wday.times { daily.unshift("  ") }
+      daily
     end
   end
 end

data/lib/mcalendar/output_pdf.rb

@@ -1,19 +1,17 @@
 module Mcalendar
   class OutputPdf < Prawn::Document
-    include Mcalendar::Config
+    extend Forwardable
+    def_delegator :@calendar, :month_title
 
-    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]]
+    def initialize(calendar)
+      @calendar = calendar
+      @month_header = [[month_title]]
       @day_of_week = [Mcalendar::DAY_OF_WEEK] 
-      
-      @pdf_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
+
+      schedule = Mcalendar::Schedule.new(calendar)
+      @weekly_schedule = schedule.daily_schedule.each_slice(7).map
+      @day_height = @weekly_schedule.size > 5 ? 20 : 20
+      @text_height = @weekly_schedule.size > 5 ? 30 : 40
  
       super(page_size: 'A4', margin: 20)
       calendar_render
@@ -36,8 +34,8 @@ module Mcalendar
       end
     end
 
-    def day_content
-      @calendar.each do |c|
+    def days_schedule
+      @weekly_schedule.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.day_color : :black}
         row_text = c.map do |x|
@@ -80,7 +78,7 @@ module Mcalendar
         stroke_bounds
         month_header
         week_header
-        day_content
+        days_schedule
       end
     end
 

data/lib/mcalendar/version.rb

@@ -1,3 +1,3 @@
-module Mcalendar
-  VERSION = "0.3.7"
-end
+module Mcalendar
+  VERSION = "0.4.0"
+end

data/lib/mcalendar.rb

@@ -1,12 +1,13 @@
-require 'date'
-require "prawn"
-require "prawn/table"
-require "optparse"
-
-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'
+require 'date'
+require "prawn"
+require "prawn/table"
+require "optparse"
+require 'forwardable'
+
+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/mcalendar.gemspec

@@ -1,31 +1,32 @@
-require_relative 'lib/mcalendar/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "mcalendar"
-  spec.version       = Mcalendar::VERSION
-  spec.authors       = ["icm7216"]
-  spec.email         = ["icm7216d@gmail.com"]
-
-  spec.summary       = %q{Ruby Monthly calendar}
-  spec.description   = %q{Ruby Monthly Calendar, Console and pdf}
-  spec.homepage      = "https://github.com/icm7216/mcalendar"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  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"
-  spec.add_development_dependency "prawn-table"
-end
+require_relative 'lib/mcalendar/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "mcalendar"
+  spec.version       = Mcalendar::VERSION
+  spec.authors       = ["icm7216"]
+  spec.email         = ["icm7216d@gmail.com"]
+
+  spec.summary       = %q{Ruby Monthly calendar}
+  spec.description   = %q{Ruby Monthly Calendar, Console and pdf}
+  spec.homepage      = "https://github.com/icm7216/mcalendar"
+  spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  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"
+  spec.add_development_dependency "prawn-table"
+  spec.add_development_dependency "rake"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - icm7216
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby Monthly Calendar, Console and pdf
 email:
 - icm7216d@gmail.com