hijiri 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f78f98f2ce0dfeb75aab733cf323212362188d
-  data.tar.gz: 6e4b4abd808bb28cd566e2c0821cc3e671e791d7
+  metadata.gz: b22a31494b32923a5b77125592d3a0c0407033bd
+  data.tar.gz: 39efeea88c7970e4e987db5d6ee3a7b719261440
 SHA512:
-  metadata.gz: 04adbd3cf983a0be52d002085438725a005790b7ad9bfcafdaac3bda13cc49b31684fd4a50db5c3f79f05867f27b4946fed8c8a2a4581c0ba4ed6aeea729eab0
-  data.tar.gz: a49dcc55b07e1ce40f85cebdb23cc6cfeaa9b80de1d0fa9c76d6701c85fd7e5ed6872e76e9db24d1f3acadd9c82ca99411fc70d100b00f3ccf1a7bcafe0f256f
+  metadata.gz: 3d1d6288efe3a6926994f383e9f72af070b3d498a69156c10277c034531d6a492d541bfeb8d20a7ab97939874682856a9ed5eefda899913df7e96bcc2bef19ab
+  data.tar.gz: 988548084cbe0346712f790afbba409be0ac033bf4ce9ed3cca06de6197d3f828124ab417223098ac91366f2fe651b844175f7825b89bef2058387eb40057f6c

data/hijiri.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "timecop"
   spec.add_development_dependency "rspec"
 end

data/lib/hijiri/parser.rb

@@ -41,6 +41,15 @@ module Hijiri
         .scan(/(?:(?:[\d]+年)?(?:[\d]+月)?(?:[\d]+日)?(?:[\d]+時間?)?(?:[\d]+分)?(?:[\d]+秒)?(?:#{TIMER_WORDS})?)+/)
         .delete_if(&:blank?)
         .delete_if{ |word| !word.match(/\d/) }
+
+      if words.blank?
+        begin
+          time = Time.parse(@text)
+          words.push(time.strftime("%Y年%m月%d日 %H時%M分%S秒"))
+        rescue
+        end
+      end
+
       @results = words.map{ |result| Hashie::Mash.new(word: result) }
     end
 
@@ -118,7 +127,7 @@ module Hijiri
       end
       if n && h.nil? && d.nil? && m.nil? && y.nil? && conv_time(y,m,d,h,n,s) < @current
         h = @current.hour + 1
-        h = 1 if h > 24
+        h = 0 if h > 23
         return point_time(y,m,d,h,n,s)
       end
       if s && n.nil? && h.nil? && d.nil? && m.nil? && y.nil? && conv_time(y,m,d,h,n,s) < @current
@@ -127,6 +136,12 @@ module Hijiri
         return point_time(y,m,d,h,n,s)
       end
 
+      s = 0 if s.to_i == 0
+      n = 0 if s.to_i == 0 && n.to_i == 0
+      h = 0 if s.to_i == 0 && n.to_i == 0 && h.to_i == 0
+      d = 1 if s.to_i == 0 && n.to_i == 0 && h.to_i == 0 && d.to_i == 0
+      m = 1 if s.to_i == 0 && n.to_i == 0 && h.to_i == 0 && [0,1].include?(d.to_i) && m.to_i == 0
+
       conv_time(y,m,d,h,n,s)
     end
 

data/lib/hijiri/version.rb

@@ -1,3 +1,3 @@
 module Hijiri
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/hijiri/parser_spec.rb

@@ -57,6 +57,56 @@ describe Hijiri::Parser do
         expect(result.send(method)).to eq(time.send(method))
       end
     end
+    context "年月日時分のみ指定" do
+      it '分のみ指定の場合0秒' do
+        Timecop.travel(2015, 1, 1, 1, 2, 2) do
+          text = "3分"
+          result = Hijiri::Parser.new(text).parse.results.first.datetime
+          expect(result.sec).to eq(0)
+        end
+      end
+      it '時間のみ指定の場合0分' do
+        Timecop.travel(2015, 1, 1, 1, 2) do
+          text = "12時"
+          result = Hijiri::Parser.new(text).parse.results.first.datetime
+          expect(result.min).to eq(0)
+        end
+      end
+      it '日のみ指定の場合0時0分' do
+        Timecop.travel(2015, 1, 1, 1, 2) do
+          text = "2日"
+          result = Hijiri::Parser.new(text).parse.results.first.datetime
+          expect(result.hour).to eq(0)
+          expect(result.min).to eq(0)
+        end
+      end
+      it '付きのみ指定の場合1日0時0分' do
+        Timecop.travel(2015, 1, 1, 1, 2) do
+          text = "12月"
+          result = Hijiri::Parser.new(text).parse.results.first.datetime
+          expect(result.month).to eq(12)
+          expect(result.day).to eq(1)
+          expect(result.hour).to eq(0)
+          expect(result.min).to eq(0)
+        end
+      end
+      it '年のみ指定の場合1日0時0分' do
+        Timecop.travel(2015, 1, 1, 1, 2) do
+          text = "2016年"
+          result = Hijiri::Parser.new(text).parse.results.first.datetime
+          expect(result.month).to eq(1)
+          expect(result.day).to eq(1)
+          expect(result.hour).to eq(0)
+          expect(result.min).to eq(0)
+        end
+      end
+    end
+    it "15:00" do
+      text = "15:00"
+      result = Hijiri::Parser.new(text).parse.results.first.datetime
+      expect(result.hour).to eq(15)
+      expect(result.min).to eq(0)
+    end
   end
   describe "〜時間後" do
     it '1時間後' do
@@ -130,4 +180,13 @@ describe Hijiri::Parser do
       expect(result[1].datetime.year).to eq(time.next_year.year)
     end
   end
+
+  describe "日付表現が含まれない" do
+    it "エラーにならない" do
+      ['', '適当な文字列', '1 + 2 = 3'].each do |text|
+        result = Hijiri::Parser.new(text).parse.results
+        expect(result.size).to eq(0)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'hijiri'
+require 'timecop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hijiri
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kkosuge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement