timesteps 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6700d400608b814af5cd0fcc0136f8ef717a6e26939a1d91cf37abf65a7afa94
-  data.tar.gz: 3c34321b6468f3136732a3b6e16137486f6fcb1710049e07d208a663048b0730
+  metadata.gz: ca436a0b5acbd7fc5f9dbb1c937e2b4beeadedf179f5aba8cba8c92610f9bb86
+  data.tar.gz: a9b9585faae128d76f50a32f4d8fcd68f0d02b7a9d500ffd5cced220d4d07131
 SHA512:
-  metadata.gz: dc989ec56ef1812a6d8afc2e4e6d6b70b6b67d6490a88a5db5a38eb3942a80ba28fb61c968f29242dc562b039524943ec6fadd43adfd57c70a1b2b80880c378b
-  data.tar.gz: bcfcf00eeb435e11d9a4fbc7366050f048acb1478c46cbdb9bc40175dabf32b80ba0777f18d4ec7582deaa0077ea5ee7558ef3dd3847c5ff44a44da334cb78cd
+  metadata.gz: 207e61a139b6753ade655c016431c2ef9e99eefdd6068043cd371271b251ca4d347656d551fee0d6f5792f852dd1ce38fa1657470e1d6c8180bb44ea868958c8
+  data.tar.gz: 90ec417c9e01d092497677392969ee85ed183ec68c68e22dd4ce3bc8b496413c65cf3167cb5a7fa94879b0bd869097fcba24141af30e25cf72c84c6083a6eaa2

data/Note.ja.md

@@ -6,13 +6,36 @@ topicブランチ     -> Feature開発版
 
 "XX since YYY" と since: time を同時に指定下場合は、前者が採用される (sinceオプションは無視される)。
 
-### 時間の単位 (udunits)
-    * years, year
-    * months,month
+### 時間の単位 (udunits + α)
+
+Normal cases
+
+    * years, year, yrs, yr, y
+    * months, month, mons, mon
     * days, day, d
-    * hours, hour, h
-    * minutes, minute, min
-    * seconds, sec, s
+    * hours, hour, hrs, hr, h
+    * minutes, minute, mins, min, m
+    * seconds, second, secs, sec, s
+    * milliseconds, millisecond, msecs, msec, ms
+    * microseconds, microsecond, usecs, usec, us
+    * ayears, ayear
+
+Week days (has a one week intervals and a day offset)
+
+    * weeks-sun, week-sun, w-sun
+    * weeks-mon, week-mon, w-mon
+    * weeks-tue, week-tue, w-tue
+    * weeks-wed, week-wed, w-wed
+    * weeks-thu, week-thu, w-thu
+    * weeks-fri, week-fri, w-fri
+    * weeks-sat, week-sat, w-sat
+    * sundays, sunday 
+    * mondays, monday
+    * tuesdays, tuesday
+    * wednesdays, wednesday
+    * thursdays, thursday
+    * fridays, friday
+    * saturdays, saturdays
 
 ### クラス構成
 
@@ -54,6 +77,7 @@ topicブランチ     -> Feature開発版
     TimeSteps::Calendar#parse(spec)  (initialized with bc: option)
 
 ### 暦の種類
+
 #### standard, gregorian
 
 * 今日使われているグレゴリオ暦 
@@ -86,7 +110,14 @@ topicブランチ     -> Feature開発版
 ts = TimeStep.new("6 hours since 2012-01-10 09:00:00")
 ts = ts.shift_origin_with_days(-256.quo(24))
 
+### 謎仕様（修正求む）
+
+#### 1日を1年単位で求めると...
+
+    ts = TimeStep.new("year since 2022-01-01")
+    ts.in("days").inverse(1) ### => (1/2)
 
+なぜに(1/2)
 
 
 

data/lib/timesteps/timestep.rb

@@ -35,16 +35,22 @@ class TimeStep
     'hours?',
     'minutes?',
     'seconds?',
+    'yrs?',
+    'y',
+    'mons?',
     'd',
     'hrs?',
     'h',
     'mins?',
+    'm',
     'secs?',
     's',
     'milliseconds?',
     'msecs?',
     'ms',
     'microseconds?', 
+    'usecs?',
+    'us',
     '(?:weeks?|w)(?:\-(?:sun|mon|tue|wed|thu|fri|sat))?',
     'sundays?',
     'mondays?',
@@ -206,13 +212,13 @@ class TimeStep
     end
     @interval = @numeric
     case symbol
-    when /\Ayears?\z/i
+    when /\A(years?|yrs?|y)\z/i
       unless numeric.denominator == 1
         raise "numeric factor for year should be an integer"
       end
       @symbol = :years
       @interval *= 356.242*86400
-    when /\Amonths?\z/i
+    when /\A(months?|mons?)\z/i
       unless numeric.denominator == 1
         raise "numeric factor for month should be an integer"
       end
@@ -224,7 +230,7 @@ class TimeStep
     when /\A(hours?|hrs?|h)\z/i
       @symbol = :hours
       @interval *= 3600
-    when /\A(minutes?|mins?)\z/i
+    when /\A(minutes?|mins?|m)\z/i
       @symbol = :minutes
       @interval *= 60
     when /\A(seconds?|secs?|s)\z/i
@@ -232,7 +238,7 @@ class TimeStep
     when /\A(milliseconds?|msecs?|ms)\z/i
       @symbol = :seconds
       @interval *= 1.quo(1000)
-    when /\Amicroseconds?\z/i
+    when /\A(microseconds?|usecs?|us)\z/i
       @symbol = :seconds
       @interval *= 1.quo(1000000)
     when /\A(weeks?|w)\-(sun|mon|tue|wed|thu|fri|sat)\z/i
@@ -243,12 +249,12 @@ class TimeStep
     when /\A(weeks?|w)\z/i
       @symbol = :weeks
       @interval *= 7*86400
-    when /\Asundays?|mondays?|tuesdays?|wednesdays?|thursday?|fridays?|saturdays?\z/i
+    when /\A(sundays?|mondays?|tuesdays?|wednesdays?|thursday?|fridays?|saturdays?)\z/i
       symbol =~ /\A(\w{3})/i
       @wday   = $1.downcase.intern
       @symbol = WDAY_NAME[@wday].intern ### :sundays, :mondays, ...
       @interval *= 7*86400
-    when /\Aayears?\z/i
+    when /\A(ayears?)\z/i
       @symbol = :days
       @numeric *= 365.242198781.to_r
       @interval = @numeric * 86400
@@ -453,6 +459,7 @@ class TimeStep
       time = times.first
       time = time.to_datetime if time.is_a?(Time)
       time = @calendar.parse(time, format: format, offset: @origin.offset) if time.is_a?(String)
+      time = time.new_offset(@origin.offset) if time.offset != @origin.offset
       case @symbol
       when :years
         diff = time.difference_in_years(@origin)
@@ -562,7 +569,7 @@ class TimeStep
   #
   # @return [Numeric]
   def next_index_of (time)
-    time = @calendar.parse(time, offset: @origin.offset) if time.is_a?(String)
+    time = @calendar.parse(time) if time.is_a?(String)
     return index_at(time).floor + 1
   end
 
@@ -579,7 +586,7 @@ class TimeStep
   #
   # @return [Numeric]
   def prev_index_of (time)
-    time = @calendar.parse(time, offset: @origin.offset) if time.is_a?(String)
+    time = @calendar.parse(time) if time.is_a?(String)
     return index_at(time).ceil - 1
   end
 
@@ -687,8 +694,8 @@ class TimeStep
   #   ts.range("2001", "2002", ends: "[)")
   #   ts.range("2001", 1)
   #
-  # @param start [Numeric, DateTime]
-  # @param last  [Numeric, DateTime]
+  # @param start [Numeric, DateTime, String]
+  # @param last  [Numeric, DateTime, String]
   # @param count [Integer]
   # @param ends [String] one of "[]", "()", "[)", "(]"
   #

data/spec/timestep_spec.rb

@@ -50,12 +50,15 @@ describe "TimeStep.new" do
       ["minute since 2001-02-03 04:05:06 +07:00", 1, :minutes],
       ["second since 2001-02-03 04:05:06 +07:00", 1, :seconds],
 
+      ["yr since 2001-02-03 04:05:06 +07:00",   1, :years],
+      ["mon since 2001-02-03 04:05:06 +07:00",  1, :months],
       ["d since 2001-02-03 04:05:06 +07:00",    1, :days],
       ["hr since 2001-02-03 04:05:06 +07:00",   1, :hours],
       ["h since 2001-02-03 04:05:06 +07:00",   1, :hours],
       ["min since 2001-02-03 04:05:06 +07:00", 1, :minutes],
       ["sec since 2001-02-03 04:05:06 +07:00", 1, :seconds],
       ["s since 2001-02-03 04:05:06 +07:00", 1, :seconds],
+      ["ms since 2001-02-03 04:05:06 +07:00", 1, :seconds],
 
       ["3 years since 2001-02-03 04:05:06 +07:00",   3, :years],
       ["3 months since 2001-02-03 04:05:06 +07:00",  3, :months],
@@ -115,12 +118,23 @@ describe "TimeStep.new" do
     
     tests.each do |spec, numeric, symbol|
       ts = TimeStep.new(spec)
-
       is_asserted_by { ts.numeric == numeric }
       is_asserted_by { ts.symbol  == symbol }
     end
     
   end
+
+  example 'without since' do
+
+    is_asserted_by { TimeStep.new("year").origin  == DateTime.new(0) }
+    is_asserted_by { TimeStep.new("month").origin == DateTime.new(0) }
+    is_asserted_by { TimeStep.new("week").origin  == DateTime.new(0) }
+    is_asserted_by { TimeStep.new("day").origin   == DateTime.new(0) }
+    is_asserted_by { TimeStep.new("hour").origin  == DateTime.new(1970,1,1) }
+    is_asserted_by { TimeStep.new("min").origin   == DateTime.new(1970,1,1) }
+    is_asserted_by { TimeStep.new("sec").origin   == DateTime.new(1970,1,1) }
+
+  end
   
   example 'since option with format' do
     
@@ -337,6 +351,17 @@ describe "TimeStep#index_at" do
   
   end
 
+  example 'different offset' do 
+    
+    ts = TimeStep.new("1 seconds since 1970-01-01 00:00:00")
+    
+    time_utc = DateTime.parse("2001-01-01 00:00:00 +00:00")
+    time_jst = DateTime.parse("2001-01-01 09:00:00 +09:00")
+
+    is_asserted_by { ts.index_at(time_utc) == ts.index_at(time_jst) }
+  
+  end
+
 end
 
 describe "TimeStep#duration_at" do
@@ -436,7 +461,6 @@ describe "TimeStep#new_origin" do
 
 end
 
-
 describe "TimeStep#right_time?" do
   
   example do 
@@ -449,3 +473,33 @@ describe "TimeStep#right_time?" do
 
 end
 
+describe "TimeStep#truncate" do
+
+  example 'hours' do 
+    
+    ts = TimeStep.new("1 hour")
+    
+    time1 = DateTime.parse("2001-01-01 01:30:00 +00:00")
+    time1_jst = DateTime.parse("2001-01-01 10:30:00 +09:00")
+    time2 = DateTime.parse("2001-01-01 01:00:00 +00:00")
+
+    is_asserted_by { ts.truncate(time1).offset == 0 }
+    is_asserted_by { time2 == ts.truncate(time1) }
+    is_asserted_by { time2 == ts.truncate(time1_jst) }
+
+    ts_jst = TimeStep.new("1 hour since 1970-01-01 00:00 +09:00")
+
+    time1 = DateTime.parse("2001-01-01 01:30:00 +00:00")
+    time1_jst = DateTime.parse("2001-01-01 10:30:00 +09:00")
+    time2 = DateTime.parse("2001-01-01 01:00:00 +00:00")
+    time2_jst = DateTime.parse("2001-01-01 10:00:00 +09:00")
+
+    is_asserted_by { ts_jst.truncate(time1).offset == 9.quo(24) }
+    is_asserted_by { time2 == ts_jst.truncate(time1) }
+    is_asserted_by { time2 == ts_jst.truncate(time1_jst) }
+    is_asserted_by { time2_jst == ts_jst.truncate(time1) }
+    is_asserted_by { time2_jst == ts_jst.truncate(time1_jst) }
+    
+  end
+  
+end

data/timesteps.gemspec

@@ -1,6 +1,6 @@
 
 Gem::Specification::new do |s|
-  version = "1.0.2"
+  version = "1.0.4"
 
   files = Dir.glob("**/*") + [".yardopts"] - [ 
                                Dir.glob("timesteps-*.gem"), 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timesteps
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies: []
 description: "  A library for time conversion and intercomparison of multiple time
   series data \n  in the case of handling time series data of the type that specifies
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A library for handling discrete time series in constant increments