night-time 0.0.1 → 1.0.1

data/README

@@ -1,5 +1,5 @@
 NAME
-    An extension to Time class that supports out of ranged values
+    NightTime behaves like Time but it also supports out of ranged values
 
 SYNOPSIS
     Native "mktime" method is too strict.
@@ -7,25 +7,41 @@ SYNOPSIS
       Time.mktime(2010, 1, 10, 26, 40)
       => ArgumentError: argument out of range
 
+      Time.mktime(2010, 2, 32)
+      => ArgumentError: argument out of range
+
     We the midnight workers want flexible one.
 
       require 'night-time'
-      Time.mktime(2010, 1, 10, 26, 40)
+      NightTime.mktime(2010, 1, 10, 26, 40)
       => Mon Jan 11 02:40:00 +0900 2010 
 
-      Time.parse('2010-01-10 26:40')
+      NightTime.parse('2010-01-10 26:40')
       => Mon Jan 11 02:40:00 +0900 2010 
 
+      NightTime.mktime(2010, 2, 32)
+      => Thu Mar 04 00:00:00 +0900 2010
+
     w00t!
 
 DESCRIPTION
-    Modified methods are
+   * NightTime.mktime(*args)
+   * NightTime.parse(text)
+   * NightTime::Jst.parse(text)
+
+JST
+    NightTime::Jst can extract time from Japanese texts.
 
-      * Time.mktime
+      jst = NightTime::Jst.new("テレビ7月8日(土)24:30～25:00")
+      jst.parse
+      => [nil,7,8,24,30,nil]
 
-    Added methods are
+      jst.time
+      => Mon Jul 09 00:30:00 +0900 2012
 
-      * Time.parse (use ParseDate)
+CHANGES
+  * 1.0.0: independent from Time object
+  
 
 HOMEPAGE
     http://github.com/maiha/night-time

data/Rakefile

@@ -1,51 +1 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-
-GEM_NAME = "night-time"
-AUTHOR = "maiha"
-EMAIL = "maiha@wota.jp"
-HOMEPAGE = "http://github.com/maiha/night-time"
-SUMMARY = "An extension to Time class that supports out of ranged values"
-GEM_VERSION = "0.0.1"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'asakusarb'
-  s.executables = []
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "MIT-LICENSE"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.require_path = 'lib'
-  s.files = %w(MIT-LICENSE README Rakefile) + Dir.glob("{lib,spec}/**/*")
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
-
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
-
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
-
-require 'spec/rake/spectask'
-desc 'Default: run spec examples'
-task :default => 'spec'
+require "bundler/gem_tasks"

data/lib/night-time/calculate.rb

@@ -0,0 +1,45 @@
+require 'parsedate'
+
+module NightTime
+  module Calculate
+    def mod_midnight(hour, min, sec)
+      extra = 0
+
+      squeeze = lambda{|val, max, unit, extra|
+        num, new_val = val.divmod(max)
+        [new_val, extra + max*num*unit]
+      }
+      sec , extra = squeeze.call(sec.to_i , 60, 1    , extra)
+      min , extra = squeeze.call(min.to_i , 60, 60   , extra)
+      hour, extra = squeeze.call(hour.to_i, 24, 60*60, extra)
+
+      return [hour, min, sec, extra]
+    end
+
+    def mktime(*args)
+      year, mon, day, hour, min, sec, usec = args
+      extra = 0
+      if hour.to_i >= 24 or min.to_i >= 60 or sec.to_i > 60
+        hour, min, sec, extra = mod_midnight(hour, min, sec)
+      end
+
+      begin
+        Time.mktime(year, mon, day, hour, min, sec, usec) + extra
+      rescue ArgumentError
+        if day < 28
+          raise
+        else
+          extra += (day - 28) * 86400
+          day = 28
+          Time.mktime(year, mon, day, hour, min, sec, usec) + extra
+        end
+      end
+    end
+
+    def parse(text)
+      mktime(*ParseDate.parsedate(text)[0,7])
+    end
+  end
+
+  extend Calculate
+end

data/lib/night-time/jst.rb

@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+require 'nkf'
+
+module NightTime
+  class Jst
+    def self.parse(text, now = nil)
+      new(text).time(now)
+    end
+
+    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_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
+
+    def initialize(text)
+      @text  = NKF.nkf('-Wwxm0Z0', text).gsub(/\s+/m,' ').strip
+      @build = Build.new
+    end
+
+    def parsedate
+      build!
+      @build.to_array
+    end
+
+    def parse
+      parsedate
+    end
+
+    def time(now = nil)
+      unless now
+        now = Time.now
+        now = Time.mktime(now.year, now.month, now.day)
+      end
+
+      build!
+      b = @build.dup
+      b.year  ||= now.year
+      b.month ||= now.month
+      b.day   ||= now.day
+      b.hour  ||= now.hour
+      b.min   ||= now.min
+      b.sec   ||= now.sec
+      return b.to_time
+    end
+    
+    def parse!
+      build!
+      
+      if @build.full?
+        return @build.to_time
+      elsif @build.date?
+        build = @build.dup
+        build.year ||= Time.now.year
+        return build.to_time
+      else
+        return nil
+      end
+    end
+
+    private
+      def build!
+        catch(:completed) {
+          parse_nengappi
+          parse_gappi
+          parse_iso8601
+          parse_jifunbyou
+          parse_jifun
+          parse_month_slash_day
+          parse_hour_colon_min
+        }
+      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!
+        }
+      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!
+        }
+      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!
+        }
+      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!
+        }
+      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!
+        }
+      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!
+        }
+      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!
+        }
+      end
+
+      def validate!
+        throw(:completed) if @build.full?
+      end
+    end
+end
+  

data/lib/night-time/version.rb

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

data/lib/night-time.rb

@@ -1,37 +1,8 @@
-require 'parsedate'
+require "night-time/version"
 
-class Time
-  class << self
-    def mod_midnight(hour, min, sec)
-      extra = 0
-
-      squeeze = lambda{|val, max, unit, extra|
-        num, new_val = val.divmod(max)
-        [new_val, extra + max*num*unit]
-      }
-      sec , extra = squeeze.call(sec.to_i , 60, 1    , extra)
-      min , extra = squeeze.call(min.to_i , 60, 60   , extra)
-      hour, extra = squeeze.call(hour.to_i, 24, 60*60, extra)
-
-      return [hour, min, sec, extra]
-    end
-
-
-    alias mktime_without_night_time mktime
+module NightTime
+  autoload :Jst, "night-time/jst"
+end
 
-    def mktime(*args)
-      year, mon, day, hour, min, sec, usec = args
-      extra = 0
-      if hour.to_i >= 24 or min.to_i >= 60 or sec.to_i > 60
-        hour, min, sec, extra = mod_midnight(hour, min, sec)
-      end
-      mktime_without_night_time(year, mon, day, hour, min, sec, usec) + extra
-    end
+require File.join(File.dirname(__FILE__), "night-time/calculate")
 
-    unless respond_to?(:parse)
-      def parse(text)
-        Time.mktime(*ParseDate.parsedate(text)[0,7])
-      end
-    end
-  end
-end

data/night-time.gemspec

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "night-time/version"
+
+Gem::Specification.new do |s|
+  s.name        = "night-time"
+  s.version     = NightTime::VERSION
+  s.authors     = ["maiha"]
+  s.email       = ["maiha@wota.jp"]
+  s.homepage    = "https://github.com/maiha/night-time"
+  s.summary     = %q{NightTime behaves like Time but it also supports out of ranged values}
+  s.description = %q{NightTime behaves like Time but it also supports out of ranged values}
+
+  s.rubyforge_project = "night-time"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency "rspec"
+end

data/spec/jst_spec.rb

@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+
+require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+
+describe NightTime::Jst do
+  describe ".parse" do
+    it "should return a time object" do
+      NightTime::Jst.parse("2012/7/3 11:30").should == Time.mktime(2012,7,3,11,30)
+    end
+  end
+end
+
+describe NightTime::Jst do
+  let(:year ) { Time.now.year  }
+  let(:month) { Time.now.month }
+  let(:day  ) { Time.now.day   }
+  subject { NightTime::Jst.new(text) }
+
+  context "(YYYY-MM-DD)" do
+    let(:text ) { "1994-04-12" }
+    its(:parse) { should == [1994,4,12,nil,nil,nil] }
+    its(:time ) { should == Time.mktime(1994,4,12) }
+  end
+
+  context "(XXXX/X/X)" do
+    let(:text ) { "2012/7/3" }
+    its(:parse) { should == [2012,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] }
+    its(:time ) { should == Time.mktime(year,7,9,0,30) }
+  end
+
+  context "(XX月XX日)[全角]" do
+    let(:text ) { "テレビ ７月８日（土）２４：３０～２５：００" }
+    its(:parse) { should == [nil,7,8,24,30,nil] }
+    its(:time ) { should == Time.mktime(year,7,9,0,30) }
+  end
+
+  context "(XX年XX月XX日XX時XX分)" do
+    let(:text ) { "日テレ　2012年7月8日（日）12時45分～13時55分(1)水中を走る車" }
+    its(:parse) { should == [2012,7,8,12,45,nil] }
+    its(:time ) { should == Time.mktime(2012,7,8,12,45) }
+  end
+
+  context "(XX年XX月XX日26時XX分)" do
+    let(:text ) { "TBSチャンネルHD 2012年7月6日（金）  26時55分～27時25分" }
+    its(:parse) { should == [2012,7,6,26,55,nil] }
+    its(:time ) { should == Time.mktime(2012,7,7,2,55) }
+  end
+
+  context "(X月X日X時夜XX分XX秒)" do
+    let(:text ) { "【#65】7月2日(月)深夜3時33分22秒～【#66】7月3日(火)" }
+    its(:parse) { should == [nil, 7, 2, 27, 33, 22] }
+    its(:time ) { should == Time.mktime(year,7,3,3,33,22) }
+  end
+
+  context "(XX年XX月XX日XX:XX)" do
+    let(:text ) { "日テレ7月9日(月)19:00～20:54ＭＣ" }
+    its(:parse) { should == [nil, 7, 9, 19, 0, nil] }
+    its(:time ) { should == Time.mktime(year,7,9,19) }
+  end
+
+  context "(XX年XX月XX日 夜XX:XX)" do
+    let(:text ) { "XXX7/14(土)夜0:15-1:45 NHK" }
+    its(:parse) { should == [nil, 7, 14, 24, 15, nil] }
+    its(:time ) { should == Time.mktime(year,7,15,0,15) }
+  end
+
+  context "(XX:XX)" do
+    let(:text ) { "隔週木曜23:30-24:00" }
+    its(:parse) { should == [nil, nil, nil, 23, 30, nil] }
+    its(:time ) { should == Time.mktime(year,month,day,23,30) }
+  end
+end

data/spec/night_time_spec.rb

@@ -0,0 +1,32 @@
+
+require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+
+describe NightTime do
+  describe ".mktime" do
+    it "should treat late night time" do
+      NightTime.mktime(2010,1,10,26,40).should == Time.mktime(2010,1,11,2,40)
+    end
+
+    it "should treat date overflow" do
+      NightTime.mktime(2010,2,33).should == Time.mktime(2010,3,5)
+    end
+
+    it "should treat valid time too" do
+      NightTime.mktime(2010,1,10, 2,40).should == Time.mktime(2010,1,10,2,40)
+    end
+  end
+
+  it "should provide .parse" do
+    NightTime.should respond_to(:parse)
+  end
+
+  describe ".parse" do
+    it "should parse late night time" do
+      NightTime.parse('2010-01-10 26:40').should == Time.mktime(2010,1,11,2,40)
+    end
+
+    it "should treat valid time too" do
+      NightTime.parse('2010-01-10 02:40').should == Time.mktime(2010,1,10,2,40)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
+$KCODE = 'u'
 
-require 'spec'
+require 'rspec'
 
 require File.join(File.dirname(__FILE__), '/../lib/night-time')

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: night-time
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  hash: 21
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - maiha
@@ -9,28 +15,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +09:00
-default_executable: 
-dependencies: []
-
-description: An extension to Time class that supports out of ranged values
-email: maiha@wota.jp
+date: 2012-07-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+description: NightTime behaves like Time but it also supports out of ranged values
+email: 
+- maiha@wota.jp
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
-- MIT-LICENSE
+extra_rdoc_files: []
+
 files: 
 - MIT-LICENSE
 - README
 - Rakefile
 - lib/night-time.rb
-- spec/time_spec.rb
+- lib/night-time/calculate.rb
+- lib/night-time/jst.rb
+- lib/night-time/version.rb
+- night-time.gemspec
+- spec/jst_spec.rb
+- spec/night_time_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/maiha/night-time
+homepage: https://github.com/maiha/night-time
 licenses: []
 
 post_install_message: 
@@ -39,23 +61,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: asakusarb
-rubygems_version: 1.3.5
+rubyforge_project: night-time
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: An extension to Time class that supports out of ranged values
+summary: NightTime behaves like Time but it also supports out of ranged values
 test_files: []
 

data/spec/time_spec.rb

@@ -1,28 +0,0 @@
-
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
-
-describe Time do
-  describe ".mktime" do
-    it "should treat late night time" do
-      Time.mktime(2010,1,10,26,40).should == Time.mktime(2010,1,11,2,40)
-    end
-
-    it "should treat valid time too" do
-      Time.mktime(2010,1,10, 2,40).should == Time.mktime(2010,1,10,2,40)
-    end
-  end
-
-  it "should provide .parse" do
-    Time.should respond_to(:parse)
-  end
-
-  describe ".parse" do
-    it "should parse late night time" do
-      Time.parse('2010-01-10 26:40').should == Time.mktime(2010,1,11,2,40)
-    end
-
-    it "should treat valid time too" do
-      Time.parse('2010-01-10 02:40').should == Time.mktime(2010,1,10,2,40)
-    end
-  end
-end