tokiyomi 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ece9455957384d0c7355d4fae09c84a2f28e118a
+  data.tar.gz: ee54e8bc0cf03d55ad953c63dfb613e9d338bf54
+SHA512:
+  metadata.gz: 9c195dbf208bd89513600336f3259addad4b1eb4b2c0a04947d09b20055b8e965510f3ae2c334419e74098a5269e1b4f2e83f932020ca85e54e43847e096f616
+  data.tar.gz: f7e2c8a60da63373734192033aca50a83c4a3b14c0a011ad80ebb7e29b06d436306be9bab56906a91c57c6bcf5c9d578aa881deede0e587cc74128c670f9b9ba

data/README.md

@@ -36,7 +36,7 @@ Tokiyomi.parse('3時間後')   # => 2013-01-10T15:34:56
 
 ```
 Tokiyomi.parse('2ヵ月前の20:00')   # => 2012-11-10T20:00:00
-Tokiyomi.parse('1週間後の0:00')    # => 2013-01-17T00:00:00
+Tokiyomi.parse('1週間後の00:00')    # => 2013-01-17T00:00:00
 ```
 
 * 今日, 明日, 明後日, 昨日, 一昨日

data/lib/tokiyomi/relative_time.rb

@@ -7,6 +7,7 @@ module Tokiyomi
         '年'    => :years,
         '月'    => :months,
         '日'    => :days,
+        '週間'  => :weeks,
         '時間'  => :hours,
         '分'    => :minutes,
         '秒'    => :seconds,
@@ -38,7 +39,7 @@ module Tokiyomi
     private
 
     def hour_min_fixable?
-      hour_min && unit.in?([:years, :months, :days])
+      hour_min && unit.in?([:years, :months, :weeks, :days])
     end
   end
 end

data/lib/tokiyomi/time_base.rb

@@ -21,7 +21,7 @@ module Tokiyomi
     end
 
     def calculate(base)
-      duration.send(unit).send(direction, base)
+      duration.__send__(unit).__send__(direction, base)
     end
   end
 end

data/lib/tokiyomi/version.rb

@@ -1,3 +1,3 @@
 module Tokiyomi
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ end
 
 RSpec::Matchers.define :be_calculated_to do |expect|
   match do |relative_time|
-    relative_time.calculate(now).should == Time.parse(expect)
+    expect(relative_time.calculate(now)).to eq(Time.parse(expect))
   end
 end
 require 'time'

data/spec/tokiyomi_relative_time_spec.rb

@@ -11,8 +11,10 @@ describe Tokiyomi::RelativeTime do
 
   specify  { expect(rel_time('3日前')).to be_calculated_to('2013/01/07 12:34:56') }
   specify  { expect(rel_time('10分後')).to be_calculated_to('2013/01/10 12:44:56') }
+  specify  { expect(rel_time('1週間前')).to be_calculated_to('2013/01/03 12:34:56') }
 
   specify  { expect(rel_time('2日後の20:00')).to be_calculated_to('2013/01/12 20:00:00') }
+  specify  { expect(rel_time('1週間後の00:00')).to be_calculated_to('2013/01/17 00:00:00') }
 
   specify { expect { rel_time('いつか').to raise_error(ArgumentError) } }
   specify { expect { rel_time('1日後の10:').to raise_error(ArgumentError) } }

data/spec/tokiyomi_spec.rb

@@ -2,12 +2,12 @@
 require 'tokiyomi'
 
 describe Tokiyomi do
-  specify { Tokiyomi.parse('10日前').should be_kind_of(Time) }
+  specify { expect(Tokiyomi.parse('10日前')).to be_kind_of(Time) }
 
   describe '.readable?' do
-    specify { Tokiyomi.readable?('10日前').should be_true }
-    specify { Tokiyomi.readable?('日後').should be_false }
-    specify { Tokiyomi.readable?('おっととい').should be_false }
-    specify { Tokiyomi.readable?('おととい').should be_true }
+    specify { expect(Tokiyomi.readable?('10日前')).to be_truthy }
+    specify { expect(Tokiyomi.readable?('日後')).to be_falsey }
+    specify { expect(Tokiyomi.readable?('おっととい')).to be_falsey }
+    specify { expect(Tokiyomi.readable?('おととい')).to be_truthy }
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: tokiyomi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - moro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Japanese relative date/time string parser.
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,27 +76,26 @@ files:
 - tokiyomi.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Japanese relative date/time string parser.
 test_files:
 - spec/spec_helper.rb