night-time 1.0.1 → 1.0.2

data/README

@@ -27,16 +27,16 @@ SYNOPSIS
 DESCRIPTION
    * NightTime.mktime(*args)
    * NightTime.parse(text)
-   * NightTime::Jst.parse(text)
+   * NightTime::Jst.parse(text, now = nil)  # => a Time
+   * NightTime::Jst.parsedate(text)         # => an Array
 
 JST
     NightTime::Jst can extract time from Japanese texts.
 
-      jst = NightTime::Jst.new("テレビ7月8日(土)24:30～25:00")
-      jst.parse
+      jst = NightTime::Jst.parsedate("テレビ7月8日(土)24:30～25:00")
       => [nil,7,8,24,30,nil]
 
-      jst.time
+      jst = NightTime::Jst.parse("テレビ7月8日(土)24:30～25:00")
       => Mon Jul 09 00:30:00 +0900 2012
 
 CHANGES

data/lib/night-time/jst.rb

@@ -3,32 +3,50 @@ require 'nkf'
 
 module NightTime
   class Jst
+    ######################################################################
+    ### Class Methods
+
     def self.parse(text, now = nil)
       new(text).time(now)
     end
 
+    def self.parsedate(text)
+      new(text).parse
+    end
+
+    ######################################################################
+    ### Builder
+
     class Build < RuntimeError
       attr_accessor :year,:month,:day,:hour,:min,:sec
       def date?; month and day; end
       def time?; hour and min; end
       def full?; date? and time?; end
-      def to_array; [year, month, day, hour, min, sec]; end
+      def to_a; [year, month, day, hour, min, sec]; end
       def to_time; NightTime.mktime(year, month, day, hour||0, min||0, sec||0); end
       def inspect; "<Build: %s>" % [year,month,day,hour,min,sec].inspect; end
     end
 
+    class Changed   < RuntimeError; end
+    class Completed < RuntimeError; end
+
+    ######################################################################
+    ### Jst class
+
     def initialize(text)
       @text  = NKF.nkf('-Wwxm0Z0', text).gsub(/\s+/m,' ').strip
       @build = Build.new
+      @trace = []
     end
 
-    def parsedate
+    def trace
       build!
-      @build.to_array
+      return @trace
     end
 
     def parse
-      parsedate
+      build!
+      @build.to_a
     end
 
     def time(now = nil)
@@ -64,81 +82,105 @@ module NightTime
 
     private
       def build!
-        catch(:completed) {
-          parse_nengappi
-          parse_gappi
-          parse_iso8601
-          parse_jifunbyou
-          parse_jifun
-          parse_month_slash_day
-          parse_hour_colon_min
-        }
+        try :parse_nengappi
+        try :parse_gappi
+        try :parse_iso8601
+        try :parse_jifunbyou
+        try :parse_jifun
+        try :parse_month_slash_day
+        try :parse_hour_colon_min
+      rescue Completed
       end
 
       def parse_nengappi
         @text.scan(/(\d{4})\s*年\s*(\d{1,2})\s*月\s*(\d{1,2})\s*日/) {
-          @build.year  ||= $1.to_i
-          @build.month ||= $2.to_i
-          @build.day   ||= $3.to_i
-          return validate!
+          return observe {
+            @build.year  ||= $1.to_i
+            @build.month ||= $2.to_i
+            @build.day   ||= $3.to_i
+          }
         }
       end
 
       def parse_gappi
         @text.scan(/(\d{1,2})\s*月\s*(\d{1,2})\s*日/) {
-          @build.month ||= $1.to_i
-          @build.day   ||= $2.to_i
-          return validate!
+          return observe {
+            @build.month ||= $1.to_i
+            @build.day   ||= $2.to_i
+          }
         }
       end
 
       def parse_iso8601
-        @text.scan(/(\d{4})[-\/](\d{1,2})[-\/](\d{1,2})/) {
-          @build.year  ||= $1.to_i
-          @build.month ||= $2.to_i
-          @build.day   ||= $3.to_i
-          return validate!
+        @text.scan(/(?:^|[^\d\/])(\d{4})[-\/](\d{1,2})[-\/](\d{1,2})($|[^\d\/])/) {
+          (1..12).include?($2.to_i) or return false
+          (1..31).include?($3.to_i) or return false
+          return observe {
+            @build.year  ||= $1.to_i
+            @build.month ||= $2.to_i
+            @build.day   ||= $3.to_i
+          }
         }
       end
 
       def parse_month_slash_day
-        @text.scan(/(\d{1,2})\/(\d{1,2})/) {
-          @build.month ||= $1.to_i
-          @build.day   ||= $2.to_i
-          return validate!
+        @text.scan(/(?:^|[^\d\/])(\d{1,2})\/(\d{1,2})($|[^\d\/])/) {
+          (1..12).include?($1.to_i) or return false
+          (1..31).include?($2.to_i) or return false
+          return observe {
+            @build.month ||= $1.to_i
+            @build.day   ||= $2.to_i
+          }
         }
       end
 
       def parse_jifunbyou
         @text.scan(/(夜)?\s*(\d{1,2})\s*時\s*(\d{1,2})\s*分\s*(\d{1,2})秒/) {
-          hour_margin = ($1 and $2.to_i < 5) ? 24 : 0
-          @build.hour ||= hour_margin + $2.to_i
-          @build.min  ||= $3.to_i
-          @build.sec  ||= $4.to_i
-          return validate!
+          return observe {
+            hour_margin = ($1 and $2.to_i < 5) ? 24 : 0
+            @build.hour ||= hour_margin + $2.to_i
+            @build.min  ||= $3.to_i
+            @build.sec  ||= $4.to_i
+          }
         }
       end
 
       def parse_jifun
         @text.scan(/(夜)?\s*(\d{1,2})\s*時\s*(\d{1,2})\s*分/) {
-          hour_margin = ($1 and $2.to_i < 5) ? 24 : 0
-          @build.hour ||= hour_margin + $2.to_i
-          @build.min  ||= $3.to_i
-          return validate!
+          return observe {
+            hour_margin = ($1 and $2.to_i < 5) ? 24 : 0
+            @build.hour ||= hour_margin + $2.to_i
+            @build.min  ||= $3.to_i
+          }
         }
       end
 
       def parse_hour_colon_min
         @text.scan(/(夜)?\s*(\d{1,2}):(\d{1,2})/) {
-          hour_margin = ($1 and $2.to_i < 5) ? 24 : 0
-          @build.hour ||= hour_margin + $2.to_i
-          @build.min  ||= $3.to_i
-          return validate!
+          return observe {
+            hour_margin = ($1 and $2.to_i < 5) ? 24 : 0
+            @build.hour ||= hour_margin + $2.to_i
+            @build.min  ||= $3.to_i
+          }
         }
       end
 
+      def try(method)
+        __send__(method)
+      rescue Changed
+        @trace << method
+        validate!
+      end
+
+      def observe(&block)
+        a1 = @build.to_a
+        block.call
+        a2 = @build.to_a        
+        raise Changed if a1 != a2
+      end
+
       def validate!
-        throw(:completed) if @build.full?
+        raise Completed if @build.full?
       end
     end
 end

data/lib/night-time/version.rb

@@ -1,3 +1,3 @@
 module NightTime
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/jst_spec.rb

@@ -8,6 +8,12 @@ describe NightTime::Jst do
       NightTime::Jst.parse("2012/7/3 11:30").should == Time.mktime(2012,7,3,11,30)
     end
   end
+
+  describe ".parsedate" do
+    it "should return an Array" do
+      NightTime::Jst.parsedate("2012/7/3 11:30").should == [2012, 7, 3, 11, 30, nil]
+    end
+  end
 end
 
 describe NightTime::Jst do
@@ -28,6 +34,12 @@ describe NightTime::Jst do
     its(:time ) { should == Time.mktime(2012,7,3) }
   end
 
+  context "(X/X)" do
+    let(:text ) { "7/3" }
+    its(:parse) { should == [nil,7,3,nil,nil,nil] }
+    its(:time ) { should == Time.mktime(2012,7,3) }
+  end
+
   context "(XX月XX日)[半角]" do
     let(:text ) { "テレビ7月8日(土)24:30～25:00" }
     its(:parse) { should == [nil,7,8,24,30,nil] }
@@ -75,4 +87,66 @@ describe NightTime::Jst do
     its(:parse) { should == [nil, nil, nil, 23, 30, nil] }
     its(:time ) { should == Time.mktime(year,month,day,23,30) }
   end
+
+  ######################################################################
+  ### ignore range error
+
+  context "(13/X)" do
+    let(:text ) { "13/3" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(X/32)" do
+    let(:text ) { "1/32" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(0/X)" do
+    let(:text ) { "0/1" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(X/0)" do
+    let(:text ) { "1/0" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(XXXX/0/X)" do
+    let(:text ) { "2012/0/3" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(XXXX/X/0)" do
+    let(:text ) { "2012/1/0" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(XXXX/13/X)" do
+    let(:text ) { "2012/13/1" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(XXXX/X/32)" do
+    let(:text ) { "2012/1/32" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(YYYYY/MM/DD)" do
+    let(:text ) { "11994-04-12" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  ######################################################################
+  ### ambiguous value
+
+  context "(2012/1/1/1)" do
+    let(:text ) { "2012/1/1/1" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
+  context "(1/1/1)" do
+    let(:text ) { "1/1/1" }
+    its(:parse) { should == [nil,nil,nil,nil,nil,nil] }
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: night-time
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 Z
+date: 2012-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec