hanreki 3.1.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4d5d51295a519391b161cb91eae07d899bf9a260
-  data.tar.gz: 2b9fd146dc373dfa1147b028a7e187a1f084ff4d
+SHA256:
+  metadata.gz: 0e1aacd0a4f8f841d3494a736aea503be21d5ed8f274895817ac14de17479dab
+  data.tar.gz: 37a0d4efa39e5680d5c9fbd1777448e5b97be00d1c70356c8bc254e09588d8a2
 SHA512:
-  metadata.gz: 8615ef2ab3c0b10a1e63303155b181e9ae48576da4b3ac123770012ec23a09985160d6c4e632e34ab87453dbdf329f945aa6775be8a70c3f0e4e0b101fb9f695
-  data.tar.gz: 1d7852bac0484984f375de1131a36ec796aa018fa8e96739df7613070131eb2f6bb62d2585ac6ac1bcf3853c31754297f2a4f29523bea96da32af2cec666708a
+  metadata.gz: 17f4f1a31987d47f16ee85245ec62b08cc5557c293dc2be2ae8cbc7c812c1d78f0c7a330c7f94937e0133e263e4b4dae432819dac8cc76b8b7efa6b229aac1c4
+  data.tar.gz: bcfdfe534bac710e6de6ff1ba9814b74112c17bcd1dc4e0af27f9196d8058957dec4d5dfb932e346fc04131020ca4916dbdd4d7fc6506e450af33e95663094fb

data/hanreki.gemspec

@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'thor', '>= 0.19', '< 2.0'
   spec.add_dependency 'icalendar', '~> 2.3'
   spec.add_dependency 'json-schema', '~> 2.7'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/hanreki/event.rb

@@ -10,6 +10,8 @@ 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
@@ -32,8 +34,16 @@ class Event
       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 }
+    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
     # Zero-fill (eg. 1 -> 01, 02 -> 02)
     day = day.rjust(2, "0")
     raise ValidationError.new(event), 'invalid day' unless day.length == 2
@@ -56,15 +66,23 @@ class Event
     hash = {
       start: @start,
       end: @end,
-      url: @url
+      url: @url,
+      make_start: @make_start,
+      make_end: @make_end
     }
     case type
-    when :public then hash[:title] = @public_summary
-    when :private then hash[:title] = @private_summary
+    when :public
+      hash[:title] = @public_summary
+      hash[:make_title] = @make_public_summary
+    when :private
+      hash[:title] = @private_summary
+      hash[:make_title] = @make_private_summary
     end
     if time_type == :string
-      hash[:start] = hash[:start].iso8601
-      hash[:end] = hash[:end].iso8601
+      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?
     end
     hash
   end
@@ -82,10 +100,18 @@ 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
@@ -101,6 +127,12 @@ class Event
       end
     end
 
+    if @public_summary == 'Online Open'
+      if @start == @end
+        raise ValidationError.new(self), '"online open" event should have duration'
+      end
+    end
+
     if @private_summary == 'Closed'
       if not @public_summary.nil?
         raise ValidationError.new(self), 'invalid public summary for a closed event'

data/lib/hanreki/i_calendar.rb

@@ -32,6 +32,17 @@ 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,11 +43,13 @@ 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
@@ -55,10 +57,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, :public, validate: true))
+      f.write(events_to_json(public_events_for_json, :public, validate: true))
     end
     File.open(JSON_PRIVATE_PATH, 'w') do |f|
-      f.write(events_to_json(private_events, :private, validate: true))
+      f.write(events_to_json(private_events_for_json, :private, validate: true))
     end
   end
 
@@ -112,10 +114,26 @@ 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,6 +6,12 @@
       "type": "object",
       "properties": {
         "title": {"type": "string"},
+        "make_title": {
+          "anyOf": [
+            {"type": "string"},
+            {"type": "null"}
+          ]
+        },
         "start": {
           "type": "string",
           "format": "date-time"
@@ -19,6 +25,18 @@
             {"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 = '3.1.0'
+  VERSION = '4.1.0'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hanreki
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.1.0
 platform: ruby
 authors:
 - CAMPHOR-
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +64,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple schedule manager for CAMPHOR-