calendar_days 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a723a72a48eabe4ed80faa6215059d9dcdb7c09
-  data.tar.gz: 5ede3a3cd1cb75789780f4bccb2d658d28a07e28
+  metadata.gz: 31dae8899c926deae858efaef3223ba9149e6167
+  data.tar.gz: fbc47a0501b65486ef3932ebe3c9d6bef338208a
 SHA512:
-  metadata.gz: 0a89bf000bfa2ff3a6fea0002eeed170e0c4c8b9596fa9f8160bb8285d77290911ac744fad75f8345d1eff66cfcf4e3255057eb326c87ee9ad267abe3e66a845
-  data.tar.gz: d2813156ae7aae63294b71897d9acbe16b41183fec10880f05246ff75694e68d65be8b3f3da7182acf2802b8d7730e8fa4d7bfae8245b358669b2db79d5d6dd2
+  metadata.gz: 9fe529aad1cc89d0b7dbae5cc9e439de3877aa47e36311edfb3c74e55cd34a0cc98ed525ee5ae2a056ec499849c2bdf12e0fa225a85936f23347a5b3ebb9dbbb
+  data.tar.gz: 809e8078df712ddbd5a4f48400929b586a01499e30acbfebf8ab5e82a3ad24a220ae357a1e409878bc80942451dc9438c6cef648d54a59a6303f74e5616d3de0

data/README.md

@@ -1,8 +1,6 @@
 # CalendarDays
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/calendar_days`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -22,7 +20,12 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+```
+
+```ruby
+```
+
 
 ## Development
 
@@ -37,3 +40,5 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/mephis
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+

data/lib/calendar_days/calendar_days.rb

@@ -11,7 +11,8 @@ require "calendar_days/net_cache"
 #
 #
 #
-class CalendarDays < ::DateTime
+# class CalendarDays < ::DateTime
+class CalendarDays
 
   include NetCache
 
@@ -22,45 +23,76 @@ end
 #
 #
 class CalendarDays
-  #
-  # https://stackoverflow.com/questions/9049123/why-does-date-new-not-call-initialize
-  #
-  def self.new( in_year = DateTime.now.year, since_month = nil )
-    since_month_tmp = since_month || 1
-    tmp = super(in_year, since_month_tmp, 1)
-    tmp.instance_eval{ initialize(in_year, since_month) }
+
+  def to_s_date( date )
+    date.to_s.gsub(/T.+$/, '')
   end
-  alias :in_year     :year
-  alias :since_month :month
-  alias :since_day   :day
-  def since; DateTime.new(in_year, since_month, since_day); end
 
-  def initialize( in_year, until_month = nil )
+  def date_to_datetime( date )
+    date = DateTime.parse(date) if date.is_a? ::String
+    date
+  end
 
-    until_month ||= 12
-    @until_month = until_month
-    @until_day   = DateTime.new(in_year, until_month, -1).day
+  def valid_date?(date_since = self.since, date_until = self.until)
+    if ics_start <= date_since and date_until <= ics_end
+      true
+    else
+      false
+    end
+  end
 
-    prepare_repo
+  #
+  # ==== Args
+  # _y :: year[opt.]
+  # _m :: month[opt.]
+  #
+  def initialize( _y = nil, _m = nil )
 
     #
+    self.prepare_repo
     ics_file    = File.open(repo_file_fullpath)
     @ics_events = Icalendar::Event.parse(ics_file).sort_by{|ev| ev.dtstart.to_datetime}
     ics_file.close
 
+    @since_year  = _y || self.ics_start.year
+    @since_month = _m ||  1
+    @since_day   = 1
+
+    @until_year  = _y || self.ics_end.year
+    #ng. @until_month = _m || (_y.nil?)? self.ics_end.month : 12
+    @until_month = _m || ((_y.nil?)? self.ics_end.month : 12)
+    @until_day   = DateTime.new(@until_year, @until_month, -1).day
+
+    raise ArgumentError, "You specified #{[_y, _m].compact.join(' and ')}."+
+      " Specify year (and month) in the date range #{to_s_date(ics_start)}"+
+      " - #{to_s_date(ics_end)}." unless valid_date?
+
     self
   end
-  attr_accessor :until_month, :until_day
-  attr_reader   :ics_events
-  def until; DateTime.new(in_year, until_month, until_day); end
-  def ics_start
+
+  attr_reader :since_year, :since_month, :since_day
+  attr_reader :until_year, :until_month, :until_day
+  attr_reader :ics_events
+
+  def since; DateTime.new(since_year, since_month, since_day); end
+  def until; DateTime.new(until_year, until_month, until_day); end
+
+  def __ics_start
     ics_events.first.dtstart.to_datetime
   end
-  def ics_end
+  def __ics_end
     ics_events.last.dtstart.to_datetime
   end
-  def ics_since; DateTime.new(ics_start.year, ics_start.month, ics_start.day); end
-  def ics_until; DateTime.new(ics_end.year,   ics_end.month,   ics_end.day  ); end
+  def ics_start
+    tmp = __ics_start
+    DateTime.new(tmp.year, tmp.month, 1)
+  end
+  def ics_end
+    tmp = __ics_end
+    DateTime.new(tmp.year, tmp.month, -1)
+  end
+  alias :ics_since :ics_start
+  alias :ics_until :ics_end
 
 end
 
@@ -70,62 +102,79 @@ end
 #
 class CalendarDays
 
-  def date_to_datetime( date )
-    date = DateTime.parse(date) if date.is_a? ::String
-    date
+  # get the weekdays from the specified date range except saturday, sunday, and holiday.
+  # 指定した年(もしくは月)の平日 Weekday (土日祝日を抜いた日) を得る
+  #
+  #
+  def __weekday_list( dt_since = self.since, dt_until = self.until )
+    (dt_since..dt_until).select{|d| yield(d) }
   end
 
-  # 指定した年(もしくは月)の平日 Weekday (土日祝日を抜いた日) を得る
+  # get the weekdays from the user-specified date range.
+  #
+  #
+  def weekday_list
+    __weekday_list{|dt|
+      not(is_weekend?(dt)) and not(is_holiday?(dt))
+    }
+  end
+
+  # get the weekdays defined in the ics file.
   #
   #
-  def __weekday_list
-    ret = []
+  def ics_weekday_list
+    __weekday_list(ics_start, ics_end){|dt|
+      not(is_weekend?(dt)) and not(is_holiday?(dt))
+    }
+  end
 
-    dt_since = DateTime.new(in_year, since_month, since_day)
-    dt_until = DateTime.new(in_year, until_month, until_day)
+  alias :week_days      :weekday_list
+  alias :working_days   :weekday_list
+  alias :buisiness_days :weekday_list
 
-    dt_tmp = dt_since
-    begin
-      # if is_weekend?(dt_tmp) or is_holiday?(dt_tmp)
-      if yield(dt_tmp)
-        ret.push dt_tmp
-      end
+  alias :weekdays      :weekday_list
+  alias :workingdays   :weekday_list
+  alias :buisinessdays :weekday_list
 
-      dt_tmp += 1
-    end while dt_tmp <= dt_until
+  alias :ics_week_days     :ics_weekday_list
+  alias :ics_working_days  :ics_weekday_list
+  alias :ics_business_days :ics_weekday_list
 
-    ret
-  end
-  def weekday_list
-    ret = __weekday_list{|dt| not(is_weekend?(dt)) and not(is_holiday?(dt)) }
-    ret
-  end
+  alias :ics_weekdays     :ics_weekday_list
+  alias :ics_workingdays  :ics_weekday_list
+  alias :ics_businessdays :ics_weekday_list
 
-  #
+  # get saturdays and sundays.
   # ==== Attention
   # there exists such days which are both weekend and holiday.
   def weekend_list
-    ret = __weekday_list{|dt| is_weekend?(dt) }
-    ret
+    __weekday_list{|dt| is_weekend?(dt) }
+  end
+  def ics_weekend_list
+    __weekday_list(ics_start, ics_end){|dt| is_weekend?(dt) }
   end
-  alias :weekdays    :weekday_list
-  alias :workingdays :weekday_list
-  alias :weekends    :weekend_list
+  alias :weekends     :weekend_list
+  alias :ics_weekends :ics_weekend_list
 
+  #
+  #
+  #
   def is_saturday?( date )
     date_to_datetime(date).saturday?
   end
-  alias :is_sat? :is_saturday?
-  alias :is_sat? :is_saturday?
+  alias :is_sat?   :is_saturday?
+  alias :saturday? :is_saturday?
 
   def is_sunday?( date )
     date_to_datetime(date).sunday?
   end
   alias :is_sun? :is_sunday?
+  alias :sunday? :is_sunday?
 
   def is_weekend?(date)
     is_saturday?(date) or is_sunday?(date)
   end
+  alias :weekend? :is_weekend?
 
 end
 
@@ -178,6 +227,7 @@ class CalendarDays
     dt = __dt.to_s.gsub(/T.+$/, '')
     holiday_list.map{|e| e.first.to_s }.grep( /^#{dt}/ ).size > 0
   end
+  alias :holiday? :is_holiday?
 
   def holiday_name( date )
     if date.is_a? ::String
@@ -193,6 +243,11 @@ class CalendarDays
     end
   end
 
+  # get the date of holiday from name.
+  # ==== Args
+  # name :: name of holiday.
+  # ==== Return
+  # Name or [ Name, ... ] (in case two or more dates are matched)
   def holiday_date( name )
     ret = unless block_given?
             holiday_list.select{|e| e.last =~ /#{name}/i }.map{|e| e.first }

data/lib/calendar_days/version.rb

@@ -1,3 +1,3 @@
 class CalendarDays
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calendar_days
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - YAMAMOTO, Masayuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler