ruboty-todo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bd1e0ac44d9d04aa609d980b1b0130bdea37bb0
-  data.tar.gz: 082d74f92dccac328f289508f75d957c72687af3
+  metadata.gz: bc90f5e5958c246beaab630eb1c9e0de372b93d1
+  data.tar.gz: 23ebf15bf1daf4367d47e7f2b4c7847f2ddf2612
 SHA512:
-  metadata.gz: c459d269a61f0e226b6be9bdb611d17f52d7f5e53d41a247bb6711d2cb36032ef2ef7704dcb8dd01d66f5d1225249c38808e5c80d7678d5a144d44fc59198bcf
-  data.tar.gz: 54ff9308ff09c711166550a87b5ddb284a983ab7db215c5fbeffacca8f91b56b02571be393f11ef99cacc79c95fed18a85bbde736deb3e4e5f4313aa0b725fe6
+  metadata.gz: 9bfabfc2166cf181ab60452f22c3fadb856264b72ffe06716851dddf3532d74e95202ec4bc0a0d0c9ba8f1cccb24a851b7b2c567f0ea3ca4009554421f24394f
+  data.tar.gz: 54eae573eceaa3fc9e8afe3cbb3ca6fb57a6eab2596b1766c53ebe924a208e2ae69fc9971962fa9c139233a727edf2009b6f05ee90308f976a8b5877cea23c69

data/lib/ruboty/handlers/todo.rb

@@ -1,10 +1,34 @@
 module Ruboty
   module Handlers
     class Todo < Base
-      on(/todo(\s*)?(?<data>.+)?/, name: 'todo', description: 'todo')
+      on(
+        /(?<command>list|cleanup|renum) todos\z/,
+         name: 'list',
+         description: '(list|cleanup|renum) all todo items'
+      )
 
-      def todo(message)
-        ::Ruboty::Actions::Todo.new(message).call
+      on(
+        /add todo (?<title>.+)\z/,
+        name: 'add',
+        description: 'add todo item'
+      )
+
+      on(
+        /(?<state>start|finish|delete) todo (?<id>\d+)\z/,
+         name: 'state',
+         description: 'change state of todo item'
+      )
+
+      def list(message)
+        ::Ruboty::Todo::Actions::List.new(message).call
+      end
+
+      def add(message)
+        ::Ruboty::Todo::Actions::Add.new(message).call
+      end
+
+      def state(message)
+        ::Ruboty::Todo::Actions::State.new(message).call
       end
     end
   end

data/lib/ruboty/todo.rb

@@ -2,5 +2,8 @@ require 'ruboty'
 require 'ruboty/todo/version'
 require 'ruboty/todo/list'
 require 'ruboty/todo/item'
-require 'ruboty/actions/todo'
+require 'ruboty/todo/actions/base'
+require 'ruboty/todo/actions/list'
+require 'ruboty/todo/actions/add'
+require 'ruboty/todo/actions/state'
 require 'ruboty/handlers/todo'

data/lib/ruboty/todo/actions/add.rb

@@ -0,0 +1,12 @@
+module Ruboty
+  module Todo
+    module Actions
+      class  Add < Base
+        def call
+          super
+          message.reply(todo_list.add(title: message[:title]).format(new_item: true))
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/todo/actions/base.rb

@@ -0,0 +1,25 @@
+module Ruboty
+  module Todo
+    module Actions
+      class  Base < ::Ruboty::Actions::Base
+        attr_reader :todo_list
+
+        def call
+          @todo_list = ::Ruboty::Todo::List.new(message.robot.brain)
+        end
+
+        private
+
+        def from_owner?
+          return true if ENV['TODO_OWNERS'] == 'IGNORE_CHECK'
+          ENV['TODO_OWNERS'].split(',').map(&:strip).include?(message.from_name)
+        end
+
+        def find_item(arg)
+          id = arg.to_i
+          item = todo_list.find(arg.to_i)
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/todo/actions/list.rb

@@ -0,0 +1,26 @@
+module Ruboty
+  module Todo
+    module Actions
+      class List < Base
+        def call
+          super
+          message.reply(send(message[:command].to_sym))
+        end
+
+        def list
+          todo_list.items.map(&:format).join(?\n)
+        end
+
+        def cleanup
+          todo_list.cleanup
+          list
+        end
+
+        def renum
+          todo_list.renum
+          list
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/todo/actions/state.rb

@@ -0,0 +1,24 @@
+module Ruboty
+  module Todo
+    module Actions
+      class State < Base
+        def call
+          super
+          require 'pp'
+          pp message
+
+          message.reply(change_item_state(message[:id].to_i, message[:state].to_sym))
+        end
+
+        private
+
+        def change_item_state(id, state)
+          item = find_item(id)
+          return "item #{id} is not found" if item.nil?
+          item.send(state)
+          item.format
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/todo/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Todo
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-todo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - SHIOYA, Hiromu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -94,9 +94,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/ruboty/actions/todo.rb
 - lib/ruboty/handlers/todo.rb
 - lib/ruboty/todo.rb
+- lib/ruboty/todo/actions/add.rb
+- lib/ruboty/todo/actions/base.rb
+- lib/ruboty/todo/actions/list.rb
+- lib/ruboty/todo/actions/state.rb
 - lib/ruboty/todo/item.rb
 - lib/ruboty/todo/list.rb
 - lib/ruboty/todo/version.rb

data/lib/ruboty/actions/todo.rb

@@ -1,99 +0,0 @@
-module Ruboty
-  module Actions
-    class Todo < Base
-      COMMANDS = %w[list help add start finish delete cleanup renum]
-      attr_reader :todo_list
-
-      def call
-        return unless from_owner?
-
-        (command, arg) = (message[:data] || '').split(/\s/, 2)
-        command = parse_command(command)
-        @todo_list = ::Ruboty::Todo::List.new(message.robot.brain)
-
-        result = self.send(command, arg)
-        message.reply(result)
-      end
-
-      def list(arg)
-        todo_list.items.map(&:format).join(?\n)
-      end
-
-      def help(arg)
-<<EOH
-  `todo list`
-    show todo list
-  `todo add [TITLE]`
-    add list to new todo
-  `todo start [ID]`
-    start todo
-  `todo finish [ID]`
-    finish todo (will removed by `cleanup`)
-  `todo delete [ID]`
-    remove todo (will removed by `cleanup`)
-  `todo cleanup`
-    delete finished and deleted items from list
-  `todo renum`
-    renum id from 1
-  `todo help`
-    show this help
-EOH
-      end
-
-      def add(arg)
-        title = arg.to_s.strip
-        return 'specify todo title like `todo add [TITLE]`' if title == ''
-        todo_list.add(title: title).format(new_item: true)
-      end
-
-      def start(arg)
-        change_item_state(arg, :start)
-      end
-
-      def finish(arg)
-        change_item_state(arg, :finish)
-      end
-
-      def delete(arg)
-        change_item_state(arg, :delete)
-      end
-
-      def cleanup(arg)
-        todo_list.cleanup
-        list(arg)
-      end
-
-      def renum(arg)
-        todo_list.renum
-        list(arg)
-      end
-
-      private
-
-      def from_owner?
-        return true if ENV['TODO_OWNERS'] == 'IGNORE_CHECK'
-        ENV['TODO_OWNERS'].split(',').map(&:strip).include?(message.from_name)
-      end
-
-      def change_item_state(arg, status)
-        item = find_item(arg)
-        return "item #{arg} is not found" if item.nil?
-        item.send(status)
-        item.format
-      end
-
-      def find_item(arg)
-        id = arg.to_i
-        item = todo_list.find(arg.to_i)
-      end
-
-      def parse_command(command)
-        if COMMANDS.include?(command)
-          command.to_sym
-        else
-          :list
-        end
-      end
-    end
-  end
-end