hanreki 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e1aacd0a4f8f841d3494a736aea503be21d5ed8f274895817ac14de17479dab
-  data.tar.gz: 37a0d4efa39e5680d5c9fbd1777448e5b97be00d1c70356c8bc254e09588d8a2
+  metadata.gz: 944f39bf167421f37e9bb814289d58b77a791695cae547cca3d4afd7acd9d2b5
+  data.tar.gz: ca7b46cc65c16e5fe7c61ff6e4739d4a7d8194b64b35a767f312520ca987abfb
 SHA512:
-  metadata.gz: 17f4f1a31987d47f16ee85245ec62b08cc5557c293dc2be2ae8cbc7c812c1d78f0c7a330c7f94937e0133e263e4b4dae432819dac8cc76b8b7efa6b229aac1c4
-  data.tar.gz: bcfdfe534bac710e6de6ff1ba9814b74112c17bcd1dc4e0af27f9196d8058957dec4d5dfb932e346fc04131020ca4916dbdd4d7fc6506e450af33e95663094fb
+  metadata.gz: 81b8d3882ee6bb4186b9d3c5e2acc7d43e5914bc9590bc686707526e247d809e43a90a69a3b35712dc509a304df58881be1386db997e48769bf328792d3b50a2
+  data.tar.gz: 0b406751aef3e864deba94e983811cf8e174cd75db217ecfc8b31ddc1e06cc339c40affcbdccf5e29f90e67cd753be4d188ea454ac37eaff9b01a56ebbad3aaa

data/lib/hanreki/event.rb

@@ -10,8 +10,6 @@ class Event
   attr_accessor :start, :end
   attr_accessor :public_summary, :private_summary
   attr_accessor :url
-  attr_accessor :make_start, :make_end
-  attr_accessor :make_public_summary, :make_private_summary
 
   def initialize(attributes)
     # Create assign methods for event attributes
@@ -34,16 +32,8 @@ class Event
       line_number: line_number,
     })
     first_day = Date.parse("#{month}01")
-    raise ValidationError.new(event), 'invalid number of columns' unless line.length == 7 || line.length == 11
-    if line.length == 7
-      day, dow, hour_start, hour_end, public_summary, private_summary, url = line.fields.map { |c| c.to_s.strip }
-    else
-      day, dow, hour_start, hour_end, public_summary, private_summary, url, make_hour_start, make_hour_end, make_public_summary, make_private_summary = line.fields.map { |c| c.to_s.strip }
-      event.make_start = Time.parse("#{month}#{day} #{make_hour_start} +09:00").getlocal("+09:00")
-      event.make_end = Time.parse("#{month}#{day} #{make_hour_end} +09:00").getlocal("+09:00")
-      event.make_public_summary = make_public_summary unless make_public_summary.empty?
-      event.make_private_summary = make_private_summary unless make_private_summary.empty?
-    end
+    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 ValidationError.new(event), 'invalid day' unless day.length == 2
@@ -66,23 +56,15 @@ class Event
     hash = {
       start: @start,
       end: @end,
-      url: @url,
-      make_start: @make_start,
-      make_end: @make_end
+      url: @url
     }
     case type
-    when :public
-      hash[:title] = @public_summary
-      hash[:make_title] = @make_public_summary
-    when :private
-      hash[:title] = @private_summary
-      hash[:make_title] = @make_private_summary
+    when :public then hash[:title] = @public_summary
+    when :private then hash[:title] = @private_summary
     end
     if time_type == :string
-      hash[:start] = hash[:start].iso8601 unless hash[:start].nil?
-      hash[:end] = hash[:end].iso8601 unless hash[:end].nil?
-      hash[:make_start] = hash[:make_start].iso8601 unless hash[:make_start].nil?
-      hash[:make_end] = hash[:make_end].iso8601 unless hash[:make_end].nil?
+      hash[:start] = hash[:start].iso8601
+      hash[:end] = hash[:end].iso8601
     end
     hash
   end
@@ -100,18 +82,10 @@ class Event
     !@private_summary.nil?
   end
 
-  def make_private?
-    !@make_private_summary.nil?
-  end
-
   def public?
     !@public_summary.nil?
   end
 
-  def make_public?
-    !@make_public_summary.nil?
-  end
-
   # イベントのバリデーションを行う
   # バリデーションに成功した場合は true を返し, 失敗した場合は例外を送出する
   def validate

data/lib/hanreki/i_calendar.rb

@@ -32,17 +32,6 @@ class ICalendar
     end
   end
 
-  def set_make_event(event, type)
-    @calendar.event do |e|
-      e.dtstart = event.make_start
-      e.dtend = event.make_end
-      case type
-      when :make_public then e.summary = event.make_public_summary
-      when :make_private then e.summary = event.make_private_summary
-      end
-    end
-  end
-
   private
 
   # Generate new calendar

data/lib/hanreki/schedule.rb

@@ -43,13 +43,11 @@ class Schedule
     File.open(ICAL_PUBLIC_PATH, 'w') do |f|
       ical = ICalendar.new
       public_events.each { |event| ical.set_event(event, :public) }
-      public_make_events.each { |event| ical.set_make_event(event, :make_public) }
       f.write(ical)
     end
     File.open(ICAL_PRIVATE_PATH, 'w') do |f|
       ical = ICalendar.new
       private_events.each { |event| ical.set_event(event, :private) }
-      private_make_events.each { |event| ical.set_make_event(event, :make_private) }
       f.write(ical)
     end
   end
@@ -57,10 +55,10 @@ class Schedule
   # Output private and public JSON calendar files
   def out_json
     File.open(JSON_PUBLIC_PATH, 'w') do |f|
-      f.write(events_to_json(public_events_for_json, :public, validate: true))
+      f.write(events_to_json(public_events, :public, validate: true))
     end
     File.open(JSON_PRIVATE_PATH, 'w') do |f|
-      f.write(events_to_json(private_events_for_json, :private, validate: true))
+      f.write(events_to_json(private_events, :private, validate: true))
     end
   end
 
@@ -114,26 +112,10 @@ class Schedule
     @events.select(&:public?)
   end
 
-  def public_make_events
-    @events.select(&:make_public?)
-  end
-
-  def public_events_for_json
-    @events.select{ |e| e.public? || e.make_public? }
-  end
-
   def private_events
     @events.select(&:private?)
   end
 
-  def private_make_events
-    @events.select(&:make_private?)
-  end
-
-  def private_events_for_json
-    @events.select{ |e| e.private? || e.make_private? }
-  end
-
   def events_to_json(events, type, validate = false)
     json = events.map { |event| event.to_h(type, :string) }.to_json
     validate_json!(json) if validate

data/lib/hanreki/schema.json

@@ -6,12 +6,6 @@
       "type": "object",
       "properties": {
         "title": {"type": "string"},
-        "make_title": {
-          "anyOf": [
-            {"type": "string"},
-            {"type": "null"}
-          ]
-        },
         "start": {
           "type": "string",
           "format": "date-time"
@@ -25,18 +19,6 @@
             {"type": "string"},
             {"type": "null"}
           ]
-        },
-        "make_start": {
-          "anyOf": [
-            {"type": "string", "format": "date-time"},
-            {"type": "null"}
-          ]
-        },
-        "make_end": {
-          "anyOf": [
-            {"type": "string", "format": "date-time"},
-            {"type": "null"}
-          ]
         }
       },
       "required": ["title", "start", "end", "url"]

data/lib/hanreki/version.rb

@@ -1,3 +1,3 @@
 module Hanreki
-  VERSION = '4.1.0'
+  VERSION = '4.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanreki
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - CAMPHOR-