ruboty-timecard 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1f1616cf3b8a9d7cf7ef40b198dbe2e3999f856
-  data.tar.gz: c675e4636e1d83409c37215d2b5c6dfdd4eba6a2
+  metadata.gz: 71ad66c046501bdc3a30f3c85d31b67ff6af0917
+  data.tar.gz: d137fb6c255570abf7a59812872e3933118b4938
 SHA512:
-  metadata.gz: bd8e64035c6b4cf4e10a9bcb9f6a9a23bbbf96cf069b1780730e29fbe4113a27ddc108a8ce8b0f64e26450ca22c6f8db2943e3d94bfc9e8111a52f29f2f7a7cf
-  data.tar.gz: f3743bd62148ea9e2ff947f4730ffd6a304af96269d349a42cf9c5bfbb28a8982966d4595f3bd8898bdb7f4a30b3647c26949105243b03eb639ffae1e1671069
+  metadata.gz: a5ec350b5ae6d512c6f20941c83624a3b6438beec9abd34305d541fa96e38a3ebfbc3969935d37bd57ae846353a422da7772ec5dbcfa04e3b53b24f68c389a1d
+  data.tar.gz: 4958374c3206c44e33f99adfc58559f1f5c0d67f1b54c2c1acf14bc958e23c46251f99ca2ebb9af426993f507b3ec5352bd7d7a3a870d279fac5f981c210777b

data/lib/ruboty/handlers/timecard.rb

@@ -3,7 +3,7 @@ require "date"
 module Ruboty
   module Handlers
     class Timecard < Base
-      DATE_FORMAT = "%Y-%m-%d"
+      DATE_FORMAT = "%Y/%m/%d"
       DATETIME_FORMAT = "%H:%M"
       SEPARATOR = " ~ "
 
@@ -11,9 +11,9 @@ module Ruboty
 
       def punch(message)
         @member = message.from || "Anonymous"
-        storage[1, member_index] = @member
-        storage[date_index, 1] = date_timestamp
-        storage[date_index, member_index] = timestamp
+        storage[member_row, member_column] = @member
+        storage[date_row, date_column] = today_timestamp
+        storage[date_row, member_column] = timestamp
       end
 
       private
@@ -22,21 +22,33 @@ module Ruboty
         robot.brain.data[0]
       end
 
-      def member_index
-        member_index = storage.rows[0].find_index(@member)
-        if member_index.nil?
-          storage.num_cols + 1
+      def member_row
+        1
+      end
+
+      def member_column
+        if storage.num_rows > 0
+          member_index = storage.rows[0].find_index(@member)
+          member_index.nil? ? storage.num_cols + 1 : member_index + 1
         else
-          member_index + 1
+          2
         end
       end
 
-      def date_index
-        latest_date = Date.parse(storage[storage.num_rows, 1])
-        latest_date == Date.today ? storage.num_rows : storage.num_rows + 1
+      def date_column
+        1
+      end
+
+      def date_row
+        begin
+          latest_date = Date.parse(storage[storage.num_rows, 1])
+          latest_date == Date.today ? storage.num_rows : storage.num_rows + 1
+        rescue
+          2
+        end
       end
 
-      def date_timestamp
+      def today_timestamp
         Time.now.strftime(DATE_FORMAT)
       end
 
@@ -45,7 +57,7 @@ module Ruboty
       end
 
       def start_time
-        value = storage[member_index, date_index]
+        value = storage[date_row, member_column]
         if value.empty?
           Time.now.strftime(DATETIME_FORMAT)
         else
@@ -58,4 +70,4 @@ module Ruboty
       end
     end
   end
-end
+end

data/lib/ruboty/timecard/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Timecard
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-timecard
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Naoto Kaneko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty