hanreki 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69378428442222929c31ba165cf8213e804ce84f
-  data.tar.gz: 7ee07bc29447c1d75d930e89418efe60ddf0fa78
+  metadata.gz: e19a99e96ee72d1f6259a403d3be1b18aa8141f2
+  data.tar.gz: 61b77c384c40eb397c0ca071cecbeac193332de7
 SHA512:
-  metadata.gz: 194af880c2fe39643b839e9424fb4ef57855530043bc9549614af24431e65e12334bc182bc4961aa38ed0929132ce8261ab0634dad95ee288b3c18e6028608af
-  data.tar.gz: 1331487c47e23072bcafca73a2918fc0c887a3e04fa1b2239975918ac689332be70a24f2127e6aa0b1c699ff60780efa702ac383984cebee76a17b4da3892340
+  metadata.gz: dc07f84b3368ffe36618ce9d39918cc4e8fd89c79b67d7b0719a5b8d34626bb76189046b6179090e083b8173b73165a16d47344a14da60042c3da11ab196f978
+  data.tar.gz: c9737f48c8221baaf4e50c4b7d0545d9469db75237041697eab1c5548d501e6020630857e7c2d8f5b1c51200ac2021b722574bfcc23872b96060d93c2540702a

data/lib/hanreki/event.rb

@@ -4,7 +4,7 @@ require 'hanreki/time_util'
 # Event of CAMPHOR- Schedule
 class Event
   using ExtendTime
-  WDAYS = %w(日 月 火 水 木 金 土)
+  DOWS = %w(日 月 火 水 木 金 土)
   attr_accessor :start, :end
   attr_accessor :public_summary, :private_summary
   attr_accessor :url
@@ -26,16 +26,19 @@ class Event
   def self.from_master(month, line)
     event = Event.new({})
     first_day = Date.parse("#{month}01")
-    day, _, hour_start, hour_end, public_summary, private_summary, url = line.fields.map { |c| c.to_s.strip }
+    day, dow, hour_start, hour_end, public_summary, private_summary, url = line.fields.map { |c| c.to_s.strip }
     # Zero-fill (eg. 1 -> 01, 02 -> 02)
     day = day.rjust(2, "0")
     raise ArgumentError, 'invalid day' unless day.length == 2
     raise ArgumentError, 'invalid day' unless (first_day...first_day.next_month).include?(Date.parse("#{month}#{day}"))
-    event.start = Time.parse("#{month}#{day} #{hour_start} +09:00")
-    event.end = Time.parse("#{month}#{day} #{hour_end} +09:00")
+    event.start = Time.parse("#{month}#{day} #{hour_start} +09:00").getlocal("+09:00")
+    event.end = Time.parse("#{month}#{day} #{hour_end} +09:00").getlocal("+09:00")
     event.public_summary = public_summary unless public_summary.empty?
     event.private_summary = private_summary unless private_summary.empty?
     event.url = url unless url.empty?
+    # 曜日はインスタンス変数に保持しないのでここでチェックする
+    raise ArgumentError, 'invalid day of the week' unless DOWS.include? dow
+    raise ArgumentError, 'invalid day of the week' unless DOWS[event.start.wday] == dow
     event.validate
     event
   end
@@ -61,11 +64,11 @@ class Event
 
   # Format for master CSV files
   def to_master
-    wday = WDAYS[@start.wday]
+    dow = DOWS[@start.wday]
     date_str = @start.strftime('%d')
     start_string = @start.strftime('%R')
     end_string =  @end.strftime('%R')
-    [date_str, wday, start_string, end_string, @public_summary, @private_summary, @url]
+    [date_str, dow, start_string, end_string, @public_summary, @private_summary, @url]
   end
 
   def private?

data/lib/hanreki/version.rb

@@ -1,3 +1,3 @@
 module Hanreki
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanreki
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - CAMPHOR-
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Simple schedule manager for CAMPHOR-