ruby_calendar 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8dbda9b1b6104d2ea1d4090ef7b3727923addcdb2011fe9e4a4efe846708985
-  data.tar.gz: e83bb3b4e9dc078ccf6eec87ab848bd8d7425a31e04adcf7dc0bb3d49c713c2e
+  metadata.gz: 6048b0b0dfc52fb9363ec4759390f68da7194378f601df9b81c2f17a18476957
+  data.tar.gz: 0b33bbd7beb16225d2808679a607ef34ccab1ee8dfe646493d6bf3b989133e21
 SHA512:
-  metadata.gz: 78d09f93fde491dd14fcdc8b4f1b7df37432db3cecbb7f27ca59f7cc330ea2278ad815151fbe985c06c97e42a3a008cb0466613fb16cbcd8098f57b3aff536e5
-  data.tar.gz: 2ccb12cb15861beb4d61c0cd04fa26d3efa8f0b3a88dde480ecea6b8928575023716e23d9fe28de5830e034bcc3166c57df3a47d35e8962573b3aaaa1d7dd260
+  metadata.gz: 4dcc5f5d57e772f9baa753601ebc31976e1f1365996f81673ec370023a66a922a186d401b90be5415cd5f3af1ad0bca6c7836679d380fe4e136ca328ca94c668
+  data.tar.gz: b1b77df11e7cf6b51ff4a50d94a6663257358608df19ed5ed50f3bb897d9bb824e9736df8c99c0a9c34bc5da35fc3011c761b9b4008d492f4a9cb3827f9aad3a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_calendar (0.0.1)
+    ruby_calendar (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -18,7 +18,7 @@ $ gem install ruby_calendar
 
 ```ruby
 calendar = RubyCalendar::Calendar.new
-puts calendar.format_month(2021,1)
+puts calendar.month(2021,1)
 #     January 2021
 # Su Mo Tu We Th Fr Sa
 #                 1  2
@@ -32,7 +32,7 @@ puts calendar.format_month(2021,1)
 
 ## Calendar class methods
 
-### format_month(year, month, w=0, l=0)
+### month(year, month, w=0, l=0)
 
 Return a month’s calendar in a multi-line string.
 * w: it specifies the width of the date columns which are centered(default: 0).
@@ -49,7 +49,7 @@ calendar = RubyCalendar::Calendar.new
 # => #<RubyCalendar::Calendar:0x00007fd334b9c0d0 @firstweekday=0>
 
 calendar.set_firstweekday(1) # set the first day of the week to Monday
-puts calendar.format_month(2021,1)
+puts calendar.month(2021,1)
 #     January 2021
 # Mo Tu We Th Fr Sa Su
 #              1  2  3

data/lib/ruby_calendar/calendar.rb

@@ -3,6 +3,7 @@ module RubyCalendar
     attr_accessor :firstweekday
 
     WEEK_DAY_NAME = %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday].freeze
+    MONTH_NAMES = %w[January February March April May June July August September October November December].freeze
 
     def initialize
       @firstweekday = 0
@@ -12,7 +13,7 @@ module RubyCalendar
       @firstweekday = firstweekday
     end
 
-    def format_month(year, month, w=0, l=0)
+    def month(year, month, w=0, l=0)
       w = [2, w].max
       l = [1, l].max
       s = format_month_name(year, month, 7*(w+1)-1)
@@ -27,8 +28,41 @@ module RubyCalendar
       s
     end
 
+    def calendar(year, w=2, l=1, c=6, m=3)
+      w = [2, w].max
+      l = [1, l].max
+      c = [2, c].max
+      colwidth = 7*(w+1)-1
+      a = []
+      a.push(year.to_s.center(colwidth*m+c*(m-1)).rstrip)
+      a.push("\n"*l)
+      header = format_week_header(w)
+      MONTH_NAMES.each_slice(m).to_a.each do |months|
+        a.push(months.map{|month| format_month_name(year, month_to_i(month), colwidth, false) << (' '*c)}.join.rstrip)
+        a.push("\n"*l)
+        a.push(months.map{format_week_header(w) << (' '*c)}.join.rstrip)
+        a.push("\n"*l)
+        month_array = months.map{|month| month_days_calendar(year, month_to_i(month))}
+        slice_month_array = month_array.map{|array| array.each_slice(7).to_a}
+        max_element_count = slice_month_array.map{|array| array.length}.max - 1
+        replace_array = []
+        for num in 0..max_element_count do
+          replace_array.push(slice_month_array.map {|array| array[num].nil? ? [] : array[num]})
+        end
+        replace_array.each do |weeks|
+          a.push(weeks.map{|week| format_week_name(week, w) << (' '*c)}.join.rstrip)
+          a.push("\n"*l)
+        end
+      end
+      a
+    end
+
     private
 
+    def month_to_i(month)
+      MONTH_NAMES.index(month)+1
+    end
+
     def localized_day(format)
       days = []
       for i in 1..7 do
@@ -42,8 +76,12 @@ module RubyCalendar
       s.center(width)
     end
 
-    def format_month_name(year, month, width)
-      Date.new(year, month).strftime("%B #{year}").center(width)
+    def format_month_name(year, month, width, withyear=true)
+      if withyear
+        Date.new(year, month).strftime("%B #{year}").center(width)
+      else
+        Date.new(year, month).strftime("%B").center(width)
+      end
     end
 
     def format_week_header(width)
@@ -62,13 +100,20 @@ module RubyCalendar
     def month_days_calendar(year, month)
       firstday_wday = (Date.new(year, month, 1).wday - @firstweekday) % 7
       lastday_date = Date.new(year, month, -1).day
+      lastday_wday = (6 + @firstweekday - Date.new(year, month, -1).wday) % 7
 
       days = Array.new(firstday_wday){0}
       days.push(*1..lastday_date)
+      lastday_wday.times{ days.push(0) }
+      days
     end
 
     def format_week_name(week, width)
-      week.map{|day| format_day(day, width)}.join(' ')
+      if week.empty?
+        Array.new(7){0}.map{|day| format_day(day, width)}.join(' ')
+      else
+        week.map{|day| format_day(day, width)}.join(' ')
+      end
     end
   end
 end

data/lib/ruby_calendar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCalendar
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/ruby_calendar.gemspec

@@ -5,20 +5,19 @@ require_relative "lib/ruby_calendar/version"
 Gem::Specification.new do |spec|
   spec.name          = "ruby_calendar"
   spec.version       = RubyCalendar::VERSION
-  spec.authors       = ["sakura888"]
+  spec.authors       = ["saku888"]
   spec.email         = ["sakura.orn888@gmail.com"]
 
   spec.summary       = %q{This is a calender of gem}
   spec.description   = %q{This gem produces a calendar output similar to the Unix cal program}
-  spec.homepage      = "https://github.com/sakura888/ruby_calendar"
+  spec.homepage      = "https://github.com/saku888/ruby-calendar"
   spec.license       = "MIT"
   spec.required_ruby_version = ">= 2.4.0"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/sakura888/ruby_calendar"
-  spec.metadata["changelog_uri"] = "https://github.com/sakura888/calender/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/saku888/ruby-calendar"
+  spec.metadata["changelog_uri"] = "https://github.com/saku888/ruby-calendar/blob/master/CHANGELOG.md"
 
   # 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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
-- sakura888
+- saku888
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies: []
 description: This gem produces a calendar output similar to the Unix cal program
 email:
@@ -32,14 +32,14 @@ files:
 - lib/ruby_calendar/calendar.rb
 - lib/ruby_calendar/version.rb
 - ruby_calendar.gemspec
-homepage: https://github.com/sakura888/ruby_calendar
+homepage: https://github.com/saku888/ruby-calendar
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/sakura888/ruby_calendar
-  source_code_uri: https://github.com/sakura888/ruby_calendar
-  changelog_uri: https://github.com/sakura888/calender/blob/main/CHANGELOG.md
+  homepage_uri: https://github.com/saku888/ruby-calendar
+  source_code_uri: https://github.com/saku888/ruby-calendar
+  changelog_uri: https://github.com/saku888/ruby-calendar/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: