datte 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ea673d705622d1bdc0a948f5176642ced4efb1
-  data.tar.gz: 23d0c88f4952ab62f3e6930c923f38bbde6b7d5b
+  metadata.gz: bc322b1b841443f6126d408c18bf35663c5f0553
+  data.tar.gz: e94da6f51a9d11c12d7f4a6cd4816fe37cb055b9
 SHA512:
-  metadata.gz: 67e32414d8019a6ce6dad8b9c20f73069b12a3567d7485d3a2fb1234ad64077a0149a7ac3d93df920981f52a1cf9130155602516ea155e9b86198dc9977b5dd1
-  data.tar.gz: 4f4020ee371670fb1671f1795f62182c52062fc74cbbfd733ab61f2b1c119c52883b1f445e3a58146b236f2fef1f4f55c2b1a12303cef3f691adc00e0c8a804d
+  metadata.gz: cae6a971d24209a0ee4a0f272d75fe209159e03f7e722e2d5360a3c286520df1fe7dca21e232afe08ec5a80ff3df8c26c4a758dd9b8aaa235398467660d2fdfc
+  data.tar.gz: 80f80edb5e229985829ba43e7d09bf44ad99c86d688ac84cdc035c8843d845ff447c06ac76264a619427704484136b594e82e312cc52c397065779249c5ef52e

data/README.md

@@ -1,8 +1,6 @@
-# Datte
+![Datte](https://raw.githubusercontent.com/hyde2able/datte/master/datte.png)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/datte`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+A Fast and Easy DateTime Extractor in Japanese build with love by pokohide & sasaken.
 
 ## Installation
 
@@ -14,7 +12,9 @@ gem 'datte'
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
@@ -22,27 +22,33 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
-
-
-
-
-datte = Datte::Parser.new()
-
-datte.parse_date(body) do |date|
-  # dateには抽出した日付
-  # 日付が抽出出来た場合のみ実行される
+```
+datte = Datte::Parser.new
+body = '明日の10時にxxに集合でよろしくー!'
+datte.parse_date(body) do |datetime|
+  # if body contains datetime, this block is excuted.
+  p datetime
+  # <DateTime: 2017-01-22T10:00:00+00:00 ((2457776j,36000s,0n),+0s,2299161j)>
 end
+```
 
-date = datte.parse_date(body)
+```
+datte = Datte::Parser.new
+body = '3/2まで回答お願いしますー！'
+datetime = datte.parse_date(body)
 if datte.nil?
-  # 抽出できなかった場合
+  puts "body doesn't contain datetime"
 else
-  # 抽出できた場合
+  p datetime
+  # <DateTime: 2017-03-02T18:00:00+00:00 ((2457815j,64800s,0n),+0s,2299161j)>
 end
+```
 
+## Test
 
-
+```
+rspec spec/*
+```
 
 ## Development
 

data/lib/datte/date_parser.rb

@@ -37,6 +37,20 @@ module Datte
         end
       end
 
+      WEEKS.each do |matcher_s, week|
+        matcher = Regexp.new(matcher_s.to_s)
+        if @body.match(matcher)
+          WDAYS.each do |wday_matcher_s, wday|
+            wday_matcher = Regexp.new(wday_matcher_s.to_s)
+            if @body.match(wday_matcher)
+              now_wday = DateTime.now.wday
+              day = 7 * (week || 1) + wday - now_wday
+              @date.after({day: day})
+            end
+          end
+        end
+      end
+
       return @date.to_datetime
     end
 

data/lib/datte/datetime_table.rb

@@ -57,6 +57,23 @@ module Datte
     '(?<min>\d{1,2})分後'
   ].map { |pattern| Regexp.compile(pattern) }.freeze
 
+  WEEKS = {
+    '来週|らいしゅう': 1,
+    '再来週|さらいしゅう': 2,
+    '次の': 1,
+    '翌週': 1
+  }
+
+  WDAYS = {
+    '日曜日|にちようび': 0,
+    '月曜日|げつようび': 1,
+    '火曜日|かようび': 2,
+    '水曜日|すいようび': 3,
+    '木曜日|もくようび': 4,
+    '金曜日|きんようび': 5,
+    '土曜日|どようび': 6
+  }
+
   class DatetimeTable
     def initialize
     end

data/lib/datte/dattetime.rb

@@ -39,13 +39,17 @@ module Datte
         @year, @month, @day = now[:year] + md[:year].to_i, now[:month], now[:day]
       end
       if md.matched?(:month)
-        @year, @month, @day = now[:year], now[:month] + md[:month].to_i, now[:day]
+        carry = (now[:month] + md[:month].to_i) / 12
+        @year, @month, @day = now[:year] + carry, now[:month] + md[:month].to_i , now[:day]
       end
       if md.matched?(:day)
-        @year, @month, @day = now[:year], now[:month], now[:day] + md[:day].to_i
+        days = [31,28,31,30,31,30,31,31,30,31,30,31][now[:month] - 1]
+        carry = (now[:day] + md[:day].to_i) / days
+        @year, @month, @day = now[:year], now[:month] + carry, now[:day] + md[:day].to_i - carry * days
       end
       if md.matched?(:hour)
-        @hour, @min = now[:hour] + md[:hour].to_i, now[:min]
+        carry = (now[:hour] + md[:hour].to_i) / 24
+        @day, @hour = now[:day] + carry, now[:hour] + md[:hour].to_i - carry * 24, now[:min]
       end
       # @date >> (md[:year].to_i * 12) if md.matched?(:year) # 何年後
       # @date >> md[:month].to_i if md.matched?(:month) # 何ヶ月後
@@ -63,8 +67,8 @@ module Datte
     def mi; @min || 0 end
 
     def now
-      d = DateTime.now
-      { year: d.year, month: d.month, day: d.day, hour: d.hour, min: d.min }
+      @d ||= DateTime.now
+      { year: @d.year, month: @d.month, day: @d.day, hour: @d.hour, min: @d.min }
     end
 
     def year!(md)

data/lib/datte/text_converter.rb

@@ -14,7 +14,6 @@ module Datte
         num = kan.scan(/([^千百十]*)([千百十]?)/).inject(-1) do |num, (_1_9, unit)|
           num + KANNUM_1_9[_1_9] * KANNUM_10[unit]
         end
-        p kan, num
         body.gsub!(kan, num.to_s)
       end
       body

data/lib/datte/version.rb

@@ -1,3 +1,3 @@
 module Datte
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/spec/datte_spec.rb

@@ -1,17 +1,8 @@
 require "spec_helper"
 
 describe Datte do
+
   it "has a version number" do
     expect(Datte::VERSION).not_to be nil
   end
-
-  describe "::Parser" do
-    datte = Datte::Parser.new
-
-    it "2016/11/1日に遊ぼー" do
-      body = "2016/11/1日に遊ぼー"
-      d = DateTime.now
-      expect(datte.parse_date(body)).to eq(DateTime.new(2016, 11, 1, d.hour, 0, 0))
-    end
-  end
 end

data/spec/parser.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe Datte::Parser do
+  parser = Datte::Parser.new
+  d = DateTime.now
+
+  it "日時情報を含まなければnilを返す" do
+    body = "ChatBotHack楽しい"
+    expect(parser.parse_date(body)).to eq(nil)
+
+    body = "お腹すいたなぁ"
+    expect(parser.parse_date(body)).to eq(nil)
+  end
+
+
+  it "y/m/d 形式での認識" do
+    body = "2016/11/1日に遊ぼー"
+    expect(parser.parse_date(body)).to eq(DateTime.new(2016, 11, 1, d.hour, 0, 0))
+
+    body = "8/10日に飲みに行かない？"
+    expect(parser.parse_date(body)).to eq(DateTime.new(d.year, 8, 10, d.hour, 0, 0))
+  end
+
+  it "何時何分のような時間の認識" do
+    body = "明日の朝8時集合ね!"
+    expect(parser.parse_date(body).day).to eq((d+1).day)
+    expect(parser.parse_date(body).hour).to eq(8)
+
+    body = "20日の16時集合ね!"
+    expect(parser.parse_date(body).day).to eq(20)
+    expect(parser.parse_date(body).hour).to eq(16)
+  end
+
+  it "明日や明後日といった相対的な文字の認識" do
+    body = "明日テストだ。。。"
+    expect(parser.parse_date(body).day).to eq((d+1).day)
+
+    body = "でも明後日はお肉食べに行く"
+    expect(parser.parse_date(body).day).to eq((d+2).day)
+  end
+
+  # TODO この部分のテスト通らないので本体を修正
+  it "3日後のような相対的な数値" do
+    body = "もう3日後にはセンター試験"
+    expect(parser.parse_date(body).day).to eq((d+3).day)
+
+    body = "今日の一時間後に卓球しない？"
+    expect(parser.parse_date(body).hour).to eq((d+Rational(1, 24)).hour)
+  end
+end

data/spec/text_converter.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Datte::TextConverter do
+  tc = Datte::TextConverter.new()
+
+  it '漢数字を数字に変換' do
+    expect(tc.kan_num('一月二日')).to eq '1月2日'
+    expect(tc.kan_num('十二月二十日に遊びに行こうね！')).to eq '12月20日に遊びに行こうね！'
+    expect(tc.kan_num('今日の一時間後くらいに飲みに行かない？')).to eq '今日の1時間後くらいに飲みに行かない？'
+  end
+
+  it '漢数字がなければ何もしない' do
+    expect(tc.kan_num('おなかすいた')).to eq 'おなかすいた'
+    expect(tc.kan_num('今日は夕ご飯食べるの?')).to eq '今日は夕ご飯食べるの?'
+    expect(tc.kan_num('就活で消耗してる。。。')).to eq '就活で消耗してる。。。'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datte
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - pokohide
@@ -72,6 +72,7 @@ files:
 - bin/console
 - bin/setup
 - datte.gemspec
+- datte.png
 - lib/datte.rb
 - lib/datte/data.txt
 - lib/datte/date_parser.rb
@@ -82,7 +83,9 @@ files:
 - lib/datte/train.rb
 - lib/datte/version.rb
 - spec/datte_spec.rb
+- spec/parser.rb
 - spec/spec_helper.rb
+- spec/text_converter.rb
 homepage: https://github.com/hyde2able/datte.git
 licenses:
 - MIT
@@ -109,4 +112,6 @@ specification_version: 4
 summary: A convenient way to parse string in ruby
 test_files:
 - spec/datte_spec.rb
+- spec/parser.rb
 - spec/spec_helper.rb
+- spec/text_converter.rb