hanreki 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a867b87334a1a1be5954d74b9059cd465651f1a5
-  data.tar.gz: 2961b20754273404809b8c9f8f1d2d789edfb879
+  metadata.gz: 5063f6f82205ddf8c8ba3393966f4e743e95c834
+  data.tar.gz: '06729fefac6d2ff13f70e81f4dede11d8940159b'
 SHA512:
-  metadata.gz: a04b6f1fe15222d4de38772121cfe025a0df77008a58a726e09cec72bf0f2b4fa3650ac7ec4e4ef1f4ef1eca17d850bd8889369c920bab1dd332114a15d44709
-  data.tar.gz: 8579bada5beea05a9b7cf71eea9e2e423a456425430e28034dc77e2c19e3a0f36cb2fba1db85351ac6b097a9bca8ec536c53036b288d96e2f466eb3d6ffed9e7
+  metadata.gz: ef56f66855bc14838ff616b045f9452def5b53fc7591f602ab9aec1a1bd16b32fe6cd06fcbdcbd4230bc642362bb4a0150a0603106deb5fb4ced4f60abb5757a
+  data.tar.gz: 979e7634f02f3b456c83e63d4f3b49cda6be01c9800f50aeb17aa750ff849e5b81a8a7620d4c52c03037d91aca304147f51907ca6742d4965f7fd0e57bcc7d9e

data/hanreki.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'icalendar', '~> 2.3'

data/lib/hanreki/cli.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'thor'
+require 'hanreki/exceptions'
 require 'hanreki/schedule'
 require 'hanreki/time_util'
 require 'hanreki/version'
@@ -31,8 +32,7 @@ module Hanreki
 
     desc 'sync', 'Sync iCal, JSON, and JSONP'
     def sync
-      schedule = Schedule.new
-      schedule.load_master_files
+      schedule = load_schedule
       schedule.out_ical
       schedule.out_json
       schedule.out_jsonp
@@ -41,11 +41,7 @@ module Hanreki
     desc 'validate', 'Validate master files'
     def validate
       schedule = Schedule.new
-      begin
-        schedule.load_master_files
-      rescue => e
-        raise "validation error: #{e}"
-      end
+      schedule = load_schedule
     end
 
     desc 'version', 'Show the version information'
@@ -56,6 +52,24 @@ module Hanreki
 
     private
 
+    def load_schedule()
+      schedule = Schedule.new
+      begin
+        schedule.load_master_files
+      rescue ValidationError => e
+        message = 'validation error'
+        if e.event
+          message += " at line #{e.event.line_number}" if e.event.line_number
+          message += " in #{e.event.filename}" if e.event.filename
+          message += "\n#{e.event.row.to_s.strip}" if e.event.row
+        end
+        message += "\n#{e}"
+        puts message
+        exit 1
+      end
+      schedule
+    end
+
     # Parse a string (YYYYMM) in options[:date] and returns [YYYY, MM]
     def parse_month_in_options(options, default = nil)
       date = options[:date]

data/lib/hanreki/event.rb

@@ -1,10 +1,12 @@
 require 'icalendar'
+require 'hanreki/exceptions'
 require 'hanreki/time_util'
 
 # Event of CAMPHOR- Schedule
 class Event
   using ExtendTime
   DOWS = %w(日 月 火 水 木 金 土)
+  attr_accessor :filename, :line_number, :row
   attr_accessor :start, :end
   attr_accessor :public_summary, :private_summary
   attr_accessor :url
@@ -23,29 +25,34 @@ class Event
   # month: String (e.g. 201510)
   # line: CSV::Row
   # (eg. [01, 水, 15:00, 20:00, "HOUSE 開館", "HOUSE 当番 @ivstivs", https://camph.net])
-  def self.from_master(month, line)
-    event = Event.new({})
+  def self.from_master(filename, line_number, month, line)
+    event = Event.new({
+      row: line,
+      filename: filename,
+      line_number: line_number,
+    })
     first_day = Date.parse("#{month}01")
+    raise ValidationError.new(event), 'invalid number of columns' unless line.length == 7
     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}"))
+    raise ValidationError.new(event), 'invalid day' unless day.length == 2
+    raise ValidationError.new(event), 'invalid day' unless (first_day...first_day.next_month).include?(Date.parse("#{month}#{day}"))
     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
+    raise ValidationError.new(event), 'invalid day of the week' unless DOWS.include? dow
+    raise ValidationError.new(event), 'invalid day of the week' unless DOWS[event.start.wday] == dow
     event.validate
     event
   end
 
   def to_h(type, time_type = :time)
-    fail ArgumentError, 'Invalid type' unless [:public, :private].include?(type)
-    fail ArgumentError, 'Invalid time_type' unless [:time, :string].include?(time_type)
+    fail ValidationError.new(self), 'invalid type' unless [:public, :private].include?(type)
+    fail ValidationError.new(self), 'invalid time_type' unless [:time, :string].include?(time_type)
     hash = {
       start: @start,
       end: @end,
@@ -82,35 +89,35 @@ class Event
   # イベントのバリデーションを行う
   # バリデーションに成功した場合は true を返し, 失敗した場合は例外を送出する
   def validate
-    raise ArgumentError, 'invalid start & end' if @start > @end
+    raise ValidationError.new(self), 'invalid start & end' if @start > @end
 
     if @public_summary.nil? and @private_summary.nil?
-      raise ArgumentError, 'both summaries are not set'
+      raise ValidationError.new(self), 'both summaries are not set'
     end
 
     if @public_summary == 'Open'
       if @start == @end
-        raise ArgumentError, '"open" event should have duration'
+        raise ValidationError.new(self), '"open" event should have duration'
       end
     end
 
     if @private_summary == 'Closed'
       if not @public_summary.nil?
-        raise ArgumentError, 'invalid public summary for a closed event'
+        raise ValidationError.new(self), 'invalid public summary for a closed event'
       end
 
       if not @start.is_midnight_in_jst
-        raise ArgumentError, 'start must be 0:00 for a closed event'
+        raise ValidationError.new(self), 'start must be 0:00 for a closed event'
       end
 
       if not @end.is_midnight_in_jst
-        raise ArgumentError, 'end must be 0:00 for a closed event'
+        raise ValidationError.new(self), 'end must be 0:00 for a closed event'
       end
     end
 
     unless @url.nil?
       unless @url.start_with?('http://') or @url.start_with?('https://')
-        raise ArgumentError, 'invalid url scheme'
+        raise ValidationError.new(self), 'invalid url scheme'
       end
     end
 

data/lib/hanreki/exceptions.rb

@@ -0,0 +1,8 @@
+class ValidationError < StandardError
+  attr_reader :event
+
+  def initialize(event)
+    super
+    @event = event
+  end
+end

data/lib/hanreki/i_calendar.rb

@@ -19,8 +19,8 @@ class ICalendar
   end
 
   def set_event(event, type)
-    fail ArgumentError, 'Invalid date' unless event.start && event.end
-    fail ArgumentError, 'Invalid type' unless [:public, :private].include?(type)
+    fail ValidationError.new(event), 'invalid date' unless event.start && event.end
+    fail ValidationError.new(event), 'invalid type' unless [:public, :private].include?(type)
     @calendar.event do |e|
       e.dtstart = event.start
       e.dtend = event.end

data/lib/hanreki/schedule.rb

@@ -35,7 +35,7 @@ class Schedule
     @events = Dir.glob('master/*.csv').flat_map do |f|
       month = f.match(/master\/(\d+).csv/)[1]
       CSV.open(f, headers: true) do |csv|
-        csv.map { |line| Event.from_master(month, line) }
+        csv.map { |row| Event.from_master(f, $., month, row) }
       end
     end
   end

data/lib/hanreki/version.rb

@@ -1,3 +1,3 @@
 module Hanreki
-  VERSION = '1.2.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanreki
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - CAMPHOR-
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -110,6 +110,7 @@ files:
 - lib/hanreki.rb
 - lib/hanreki/cli.rb
 - lib/hanreki/event.rb
+- lib/hanreki/exceptions.rb
 - lib/hanreki/i_calendar.rb
 - lib/hanreki/schedule.rb
 - lib/hanreki/schema.json
@@ -127,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="