lita-ragoon 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22d94ac47cfd867d49763b40089c10498ab9d7ed
-  data.tar.gz: 6a1fd91a5a895cb00f8e702e2d969ce1a9058d00
+  metadata.gz: 91f9788a52c728ce0f0d01eadabc9e9aff491159
+  data.tar.gz: 3c95676b10ed2bc4d39fa21c376d3a2b412345e7
 SHA512:
-  metadata.gz: 010cdd263258d01baec5612b4ba0e95504f4446ac2ab66f5f7459d7ee090b3a3e34e6c8f198da074cda404951a8a930ecc8cc88657f684c940c496d05a36fc92
-  data.tar.gz: 0a0a5dfc7be20fd8fc7039ded9af9ad0a933952d1fb23836e5ff973d3e8c81c83482735656d109a8c86cbc3fb88a4efff465c875c5d606f3acfbb32abd57f93e
+  metadata.gz: 233fccb3250447d05719e1096ba140eb719aeb22378fbe7d27b3d9d002bf162be82d13701aacf69af5ac8d1c8780ef400a2bbe8e35d9cca5418fdac1c1071bdc
+  data.tar.gz: d56d6788075c5bd1dc5bd754b0dbc5817e3367202881213a7b016ff7301a427ff50f118619628b21e35c6ffd19e06ea369ea3c38579f6a9ea1da5a43e1fc653a

data/lib/lita/handlers/ragoon.rb

@@ -22,15 +22,63 @@ module Lita
 
       def today(request)
         events = ::Ragoon::Services::Schedule.new.schedule_get_events
-        request.reply(render_template('today', events: events))
+        request.reply(
+          render_template(
+            'events',
+            events: format_events(events, request.private_message?)
+          )
+        )
       end
 
       def tomorrow(request)
         events = ::Ragoon::Services::Schedule.new.schedule_get_events(::Ragoon::Services.start_and_end(Date.today + 1))
-        request.reply(render_template('today', events: events))
+        request.reply(
+          render_template(
+            'events',
+            events: format_events(events, request.private_message?)
+          )
+        )
       end
 
       Lita.register_handler(self)
+
+      private
+
+      def format_events(events, private)
+        events.map { |event| format_event(event, private) }
+      end
+
+      def format_event(event, private)
+        plan = event[:plan].to_s != '' ? "【#{event[:plan].strip}】" : ''
+        period = if event[:allday]
+                   '終日'
+                 else
+                   "#{format_time(event[:start_at])}〜#{format_time(event[:end_at])}"
+                 end
+        if !private && event[:private]
+          title = '予定あり'
+          facilities = ''
+        else
+          title = event[:title]
+          facilities = event[:facilities].join(', ')
+        end
+
+        {
+          plan:       plan,
+          period:     period,
+          title:      title,
+          facilities: facilities,
+          private:    event[:private],
+        }
+      end
+
+      def format_time(time)
+        if time.to_s == ''
+          ''
+        else
+          Time.parse(time).localtime.strftime('%R')
+        end
+      end
     end
   end
 end

data/lita-ragoon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-ragoon'
-  spec.version       = '0.3.1'
+  spec.version       = '0.4.0'
   spec.authors       = ['SHIOYA, Hiromu']
   spec.email         = ['kwappa.856@gmail.com']
   spec.description   = 'lita-ragoon is a handler beween lita and ragoon.'
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'ragoon', '~> 0.2.0'
+  spec.add_dependency 'ragoon', '~> 0.3.0'
 
   spec.add_runtime_dependency 'lita', '>= 4.6'
 

data/templates/events.erb

@@ -0,0 +1,3 @@
+<% @events.each do |event| %>
+* <%= event[:period] %> <%= event[:plan] %> <%= event[:private] ? ':lock: ' : '' %><%= event[:title] %> <%= event[:facilities] %>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-ragoon
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - SHIOYA, Hiromu
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
@@ -126,8 +126,7 @@ files:
 - locales/en.yml
 - spec/lita/handlers/ragoon_spec.rb
 - spec/spec_helper.rb
-- templates/.gitkeep
-- templates/today.erb
+- templates/events.erb
 homepage: https://github.com/kwappa/lita-ragoon
 licenses:
 - MIT

data/templates/today.erb

@@ -1,5 +0,0 @@
-<% @events.each do |event| %>
-<% plan = event[:plan].to_s != '' ? "【#{event[:plan].strip}】" : ''  %>
-<%= event[:period] %> <%= plan %> <%= event[:title] %> <%= event[:facility].join(',') %>
-
-<% end %>