ruboty-reminder 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c56465750cafb460b35d7e84402b23590ea03d6f
-  data.tar.gz: c3c163fe199748c4f45ae8caf74f941d3ba7abfc
+  metadata.gz: b61dbf5e2d3f2467a36ade7b6341532e8a8c0a8b
+  data.tar.gz: 5a3aa8f9e41fca2487f805f7ff4e61c6d6c1e4a4
 SHA512:
-  metadata.gz: 5cc958e1a1ae1774962297d3d5303302f9467605165e8831bafa9e50a29606439ad7dc1e6f1b439bb179b6b1adf5fe640192f71872415e367d7cbd5fa750d6d3
-  data.tar.gz: 0a18aa9fb81d7186fb5647f7f07d28ef8641341539f839f8a52da0e982c77249e15cc3c81f041aaac56683ebf41434d0323f07be7f8e1f6b3c4bd9d5db81a3d9
+  metadata.gz: 6ef089c0cb2f1b10f60593c4aa19bcd869cac0d151ef0b4b287d57f56f87ef64a24271f40d5ebddb22c6251c40a50b175a81e83beee6d99c0dc0a799da127876
+  data.tar.gz: 6b8340491b685bc134aa8ab3ab8e69ecea29b3f91d821a8d38828c9c4d80592cbbb8af8fafc24fe5db54cdd5407c6a31768e39f838337618a09f6f8cae7f0545

data/README.md

@@ -13,15 +13,18 @@ gem 'ruboty-reminder'
 ## Usage
 
 ```
-@ruboty add task HH:MM <task>
-@ruboty delete task <id>
-@ruboty list tasks <id>
+@ruboty add reminder yyyy/MM/dd HH:mm <reminder>
+@ruboty delete reminder <id>
+@ruboty list reminders <id>
 ```
 
 ## Example
 
 ```
-> @ruboty add task 07:00 Hi,kaihara!
-Task 270 is created.
+> @ruboty add reminder 07:00 Hi,kaihara!
+Reminder 270 is created.
 Hi, kaihara!
+> @ruboty add reminder 2015/01/01 00:00 Happy New Year!
+Reminder 300 is created.
+Happy New Year!
 ```

data/lib/ruboty/handlers/reminder.rb

@@ -1,11 +1,15 @@
 module Ruboty
   module Handlers
     class Reminder < Base
-      NAMESPACE = 'reminder'
+      YEAR_RANGE = (2000..2100)
+      MONTH_RANGE = (1..12)
+      DAY_RANGE = (1..31)
+      HOUR_RANGE = (0..23)
+      MIN_RANGE = (0..59)
 
-      on /add task (?<hh>\d{2}):(?<mm>\d{2}) (?<task>.+)/, name: 'add', description: 'Add a task'
-      on /delete task (?<id>.+)/, name: 'delete', description: 'Delete a task'
-      on /list tasks\z/, name: 'list', description: 'Show all reminders'
+      on /add reminder( (?<year>\d{4})\/(?<month>\d{2})\/(?<day>\d{2}))? (?<hour>\d{2}):(?<min>\d{2}) (?<reminder>.+)/, name: 'add', description: 'Add a reminder'
+      on /delete reminder (?<id>.+)/, name: 'delete', description: 'Delete a reminder'
+      on /list reminders\z/, name: 'list', description: 'Show all reminders'
 
       def initialize(*args)
         super
@@ -13,66 +17,97 @@ module Ruboty
       end
 
       def add(message)
-        hour = message[:hh].to_i
-        min = message[:mm].to_i
+        year, month, day =
+          # [year, month, day] can be omitted.
+          if message[:year] && message[:month] && message[:day]
+            [message[:year].to_i, message[:month].to_i, message[:day].to_i]
+          else
+            now_time = Time.now
+            [now_time.year, now_time.month, now_time.day]
+          end
+        hour = message[:hour].to_i
+        min = message[:min].to_i
 
-        # Validate
-        unless hour >= 0 && hour <= 23 && min >= 0 && min <= 59
+        unless validate_time_format(year, month, day, hour, min)
           message.reply('Invalid time format.')
           return
         end
 
+        target_unixtime = Time.new(year, month, day, hour, min, 0).to_i
+
+        if past?(target_unixtime)
+          message.reply('Already past.')
+          return
+        end
+
         task = Ruboty::Reminder::Task.new(
           message.original.except(:robot).merge(
             id: generate_id,
-            body: message[:task],
+            body: message[:reminder],
+            year: year,
+            month: month,
+            day: day,
             hour: hour,
-            min: min
+            min: min,
+            unixtime: target_unixtime
           )
         )
         task.start(robot)
-        message.reply("Task #{task.hash[:id]} is created.")
+        message.reply("Reminder #{task.hash[:id]} is created.")
 
-        # Insert to the brain
-        tasks[task.hash[:id]] = task.hash
+        reminders[task.hash[:id]] = task.hash
       end
 
       def delete(message)
-        if tasks.delete(message[:id].to_i)
-          message.reply("Task #{message[:id]} is deleted.")
+        if reminders.delete(message[:id].to_i)
+          message.reply("Reminder #{message[:id]} is deleted.")
         else
-          message.reply("Task #{message[:id]} is not found.")
+          message.reply("Reminder #{message[:id]} is not found.")
         end
       end
 
       def list(message)
-        if tasks.empty?
-          message.reply("The task doesn't exist.")
+        if reminders.empty?
+          message.reply("The reminder doesn't exist.")
         else
-          task_list = tasks.map do |id, hash|
-            "#{id}: #{'%02d' % hash[:hour]}:#{'%02d' % hash[:min]} -> #{hash[:body]}"
-          end.join("\n")
-          message.reply(task_list, code: true)
+          reminder_list = reminders.map do |id, hash|
+            date = "#{hash[:year]}/#{'%02d' % hash[:month]}/#{'%02d' % hash[:day]}"
+            time = "#{'%02d' % hash[:hour]}:#{'%02d' % hash[:min]}"
+            "#{id}: #{date} #{time} -> #{hash[:body]}"
+          end
+          message.reply(reminder_list.join("\n"), code: true)
         end
       end
 
       def restart
-        tasks.each do |id, hash|
+        reminders.each do |id, hash|
           task = Ruboty::Reminder::Task.new(hash)
           task.start(robot)
         end
       end
 
-      def tasks
-        robot.brain.data[NAMESPACE] ||= {}
+      def reminders
+        robot.brain.data[Ruboty::Reminder::NAMESPACE] ||= {}
       end
 
       def generate_id
         loop do
           id = rand(1000)
-          return id unless tasks.has_key?(id)
+          return id unless reminders.has_key?(id)
         end
       end
+
+      def validate_time_format(year, month, day, hour, min)
+        YEAR_RANGE.include?(year) &&\
+          MONTH_RANGE.include?(month) &&\
+          DAY_RANGE.include?(day) &&\
+          HOUR_RANGE.include?(hour) &&\
+          MIN_RANGE.include?(min)
+      end
+
+      def past?(unixtime)
+        (unixtime - Time.now.to_i) < 0
+      end
     end
   end
 end

data/lib/ruboty/reminder.rb

@@ -1,3 +1,9 @@
 require 'ruboty'
 require 'ruboty/reminder/task'
 require 'ruboty/handlers/reminder'
+
+module Ruboty
+  module Reminder
+    NAMESPACE = 'reminder'
+  end
+end

data/lib/ruboty/reminder/task.rb

@@ -1,8 +1,6 @@
 module Ruboty
   module Reminder
     class Task
-      NAMESPACE = 'reminder'
-
       attr_reader :hash
 
       def initialize(hash)
@@ -10,22 +8,7 @@ module Ruboty
       end
 
       def start(robot)
-        current_time = Time.new.to_i
-        target_time = Time.new(
-          Time.now.year,
-          Time.now.month,
-          Time.now.day,
-          hash[:hour],
-          hash[:min],
-          0
-        ).to_i
-
-        wait_time =
-          if target_time - current_time < 0
-            (target_time + 24*60*60) - current_time
-          else
-            target_time - current_time
-          end
+        wait_time = hash[:unixtime] - Time.now.to_i
 
         Thread.start do
           sleep(wait_time)

data/lib/ruboty/reminder/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Reminder
-    VERSION = '0.0.3'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-reminder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty