tokiyomi 0.0.1 → 0.1.0

data/README.md

@@ -26,9 +26,24 @@ Tokiyomi.parse('10日前')  # => 2012-12-31T12:34:56
 ### Supported formats
 
 * 年, 月, 日, 時間, 分, 秒 + [前後]
-  * eg: 10日前
+
+```
+Tokiyomi.parse('10日前')    # => 2012-12-31T12:34:56
+Tokiyomi.parse('3時間後')   # => 2013-01-10T15:34:56
+```
+
 * hour and minutes are also able to specified.
-  * eg: 2ヵ月前の20:00
+
+```
+Tokiyomi.parse('2ヵ月前の20:00')   # => 2012-11-10T20:00:00
+Tokiyomi.parse('1週間後の0:00')    # => 2013-01-17T00:00:00
+```
+
+* 今日, 明日, 明後日, 昨日, 一昨日
+
+```
+Tokiyomi.parse('明日')  # => 2013-01-11T12:34:56
+```
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "spec/**/*_spec.rb"
+end
+
+task :default => [:spec]

data/lib/tokiyomi.rb

@@ -1,10 +1,15 @@
 require 'tokiyomi/version'
 require 'tokiyomi/relative_time'
+require 'tokiyomi/named_time'
 
 module Tokiyomi
   extend self
 
   def parse(str)
-    RelativeTime.new(str.encode('UTF-8')).calculate(Time.now)
+    TimeBase.parser_for(str.encode('UTF-8')).calculate(Time.now)
+  end
+
+  def readable?(str)
+    TimeBase.readable?(str)
   end
 end

data/lib/tokiyomi/named_time.rb

@@ -0,0 +1,29 @@
+# coding: utf-8
+require 'tokiyomi/time_base'
+
+module Tokiyomi
+  class NamedTime < TimeBase
+    Definition = Struct.new(:duration, :direction)
+
+    NAMED_TIMES = {
+      'おととい'  => Definition.new(2, :ago),
+      '一昨日'    => Definition.new(2, :ago),
+      '昨日'      => Definition.new(1, :ago),
+      '今日'      => Definition.new(0, :ago),
+      '明日'      => Definition.new(1, :since),
+      '明後日'    => Definition.new(2, :since),
+      'あさって'  => Definition.new(2, :since),
+    }.freeze
+
+    def self.readable?(str)
+      str.in?(NAMED_TIMES.keys)
+    end
+
+    def initialize(str)
+      definition = NAMED_TIMES[str]
+      @duration   = definition.duration
+      @unit       = :days
+      @direction  = definition.direction
+    end
+  end
+end

data/lib/tokiyomi/relative_time.rb

@@ -1,8 +1,8 @@
 # coding: utf-8
-require 'active_support/core_ext'
+require 'tokiyomi/time_base'
 
 module Tokiyomi
-  class RelativeTime
+  class RelativeTime < TimeBase
     UNITS = {
         '年'    => :years,
         '月'    => :months,
@@ -18,16 +18,19 @@ module Tokiyomi
       str =~ RELATIVE_TIME
     end
 
-    attr_reader :duration, :unit, :direction, :hour_min
-
     def initialize(str)
       raise ArgumentError, "can't understand `#{str}'" unless self.class.readable?(str)
 
-      init_from_dynamic_value(str)
+      duration, unit, direction, *hour_min= str.scan(RELATIVE_TIME).first
+
+      @duration   = duration.to_i
+      @unit       = UNITS[unit]
+      @direction  = direction == '前' ? :ago : :since
+      @hour_min   = hour_min.all?(&:nil?) ? nil : Hash[[:hour, :min].zip(hour_min.map(&:to_i))]
     end
 
     def calculate(base)
-      datetime = duration.send(unit).send(direction, base)
+      datetime = super
 
       hour_min_fixable? ? datetime.change(hour_min) : datetime
     end
@@ -37,14 +40,5 @@ module Tokiyomi
     def hour_min_fixable?
       hour_min && unit.in?([:years, :months, :days])
     end
-
-    def init_from_dynamic_value(str)
-      duration, unit, direction, *hour_min= str.scan(RELATIVE_TIME).first
-
-      @duration   = duration.to_i
-      @unit       = UNITS[unit]
-      @direction  = direction == '前' ? :ago : :since
-      @hour_min   = hour_min.all?(&:nil?) ? nil : Hash[[:hour, :min].zip(hour_min.map(&:to_i))]
-    end
   end
 end

data/lib/tokiyomi/time_base.rb

@@ -0,0 +1,27 @@
+require 'active_support/core_ext'
+
+module Tokiyomi
+  class TimeBase
+    attr_reader :duration, :unit, :direction, :hour_min
+
+    class << self
+      def readable?(str)
+        !!handlable_subclass(str)
+      end
+
+      def parser_for(str)
+        handlable_subclass(str).new(str)
+      end
+
+      private
+
+      def handlable_subclass(str)
+        subclasses.detect {|klass| klass.readable?(str) }
+      end
+    end
+
+    def calculate(base)
+      duration.send(unit).send(direction, base)
+    end
+  end
+end

data/lib/tokiyomi/version.rb

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

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+def RSpec.root
+  @spec_root ||= Pathname.new(File.dirname(__FILE__))
+end
+
+$: << File.expand_path('../lib', File.dirname(__FILE__))
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end
+
+RSpec::Matchers.define :be_calculated_to do |expect|
+  match do |relative_time|
+    relative_time.calculate(now).should == Time.parse(expect)
+  end
+end
+require 'time'

data/spec/tokiyomi_named_time_spec.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+require 'spec_helper'
+require 'tokiyomi/named_time'
+
+describe Tokiyomi::NamedTime do
+  let(:now) { Time.local(2013, 1, 10, 12, 34, 56) }
+
+  def named_time(str)
+    Tokiyomi::NamedTime.new(str)
+  end
+
+  specify  { expect(named_time('昨日')).to      be_calculated_to('2013/01/09 12:34:56') }
+  specify  { expect(named_time('おととい')).to  be_calculated_to('2013/01/08 12:34:56') }
+  specify  { expect(named_time('今日')).to      be_calculated_to('2013/01/10 12:34:56') }
+  specify  { expect(named_time('明後日')).to    be_calculated_to('2013/01/12 12:34:56') }
+end

data/spec/tokiyomi_relative_time_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require 'time'
+require 'spec_helper'
 require 'tokiyomi/relative_time'
 
 describe Tokiyomi::RelativeTime do
@@ -9,12 +9,6 @@ describe Tokiyomi::RelativeTime do
     Tokiyomi::RelativeTime.new(str)
   end
 
-  RSpec::Matchers.define :be_calculated_to do |expect|
-    match do |relative_time|
-      relative_time.calculate(now).should == Time.parse(expect)
-    end
-  end
-
   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') }
 

data/spec/tokiyomi_spec.rb

@@ -3,4 +3,11 @@ require 'tokiyomi'
 
 describe Tokiyomi do
   specify { Tokiyomi.parse('10日前').should 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 }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tokiyomi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,8 +72,12 @@ files:
 - README.md
 - Rakefile
 - lib/tokiyomi.rb
+- lib/tokiyomi/named_time.rb
 - lib/tokiyomi/relative_time.rb
+- lib/tokiyomi/time_base.rb
 - lib/tokiyomi/version.rb
+- spec/spec_helper.rb
+- spec/tokiyomi_named_time_spec.rb
 - spec/tokiyomi_relative_time_spec.rb
 - spec/tokiyomi_spec.rb
 - tokiyomi.gemspec
@@ -102,5 +106,7 @@ signing_key:
 specification_version: 3
 summary: Japanese relative date/time string parser.
 test_files:
+- spec/spec_helper.rb
+- spec/tokiyomi_named_time_spec.rb
 - spec/tokiyomi_relative_time_spec.rb
 - spec/tokiyomi_spec.rb