four-pillars 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d417f4cf156efe360aec7529d85d3c2b9550ca69f8b79a6ad5dac6b44cdefa6c
-  data.tar.gz: 94952b904876171d85ff810b05f3a0bbf6c5d3c2107615a710d3eab566743e0f
+  metadata.gz: 4382511acd1f1368f0521311c524b106d043283e3c49b1493d8bb5dbd0035758
+  data.tar.gz: 66fa7174de02c05426e23bfd676deacec29a2fbea287da325e479a0737e608cc
 SHA512:
-  metadata.gz: e3979c857a25124c7d1f7aae95f6f7a9b01e5ac018e7a3dfd21dfe3d4167483ce1902861a606e0d45a40c3aa6d346695a68628f03488dfd96c65885e14a9cdc6
-  data.tar.gz: 0a2dc64a80a4ff9584621ff45b65a9949c726adc57a07e99cf2c7c449e4f41e758a7e61b80b5ea826d10055868c4efa5f0be05f0b14a84f2ce612c77f4defe2a
+  metadata.gz: fa40e2bdbf9e4ddf6b388fa501adc65e5fb60a2e0a31f9049501a4281d740d044af79a7daae2a72e7b5d20273247fa4e65ea4818b136167d895ff5a9c3de7884
+  data.tar.gz: f722c235c243890f782ad347310b790d3a7ed1dc80611516c901753fa7c766e7c49955804a715a261f8390bc3f6d95c11b2b83d4b93d9c6f4215e1d368d9f2a0

data/lib/four-pillars.rb

@@ -42,6 +42,16 @@ class FourPillarsLogic
   end
   KANSHI_HASH = kanshi_hash
 
+  # 日柱の基準日 (この日が甲子)
+  KANSHI_BASE_DATE = Date.new(1863,12,31)
+
+  # 日付に対応する日柱(その日の干支)
+  #   FourPillarsLogic.day_pillar_of(Date.new(2026,9,7)) #=> "甲申"
+  def self.day_pillar_of(date)
+    d = date.respond_to?(:to_date) ? date.to_date : date
+    KANSHI_ARRAY[(d - KANSHI_BASE_DATE).to_i % 60]
+  end
+
   # 陰干通表
   def self.jikkan_in
     j = [nil] * 10
@@ -96,6 +106,12 @@ class FourPillarsLogic
   end
   SETSUIRI_HASH, SETSUIRI_LIST = load_setsuiri
 
+  # 年月に対応する節入り日時 (注:時 = 時間 x 60 + 分) 登録がない場合は nil
+  #   FourPillarsLogic.setsuiri_of(2026,9) #=> [7, 1421]  (7日 23時41分)
+  def self.setsuiri_of(year,month)
+    SETSUIRI_HASH[year*100+month]
+  end
+
   # 通変星
   def self.tsuhensei(j_day,j_src) # 日柱の十干、月柱または年柱の十干
     if plus_jikkan?(j_day) # 陽
@@ -130,15 +146,16 @@ class FourPillarsLogic
   # 生年月日時間, 性別(大運の向きに使用)
   attr_reader :birth_dt, :gender
 
-  def initialize(birth_dt,gender,with_time:false)
-    @birth_dt = birth_dt.map {|v| v.nil? ? nil : v.to_i }
+  def initialize(birth_dt,gender,with_time:false,know_time:true)
+    @birth_dt = birth_dt.map {|v| v.to_i } # 時分がnilの場合、0になる
     @gender = gender
     @with_time = with_time
+    @know_time = know_time && birth_dt[3] != nil
     raise "Incorrect birth date: #{birth_dt}" if @birth_dt.count != 5
     raise "Gender must be m,f or o(other): #{gender}" unless ['o','m','f'].include? @gender
     raise "Year must be larger than 1863" if @birth_dt[0] < 1864
     h = @birth_dt[3]
-    if !h.nil? && (h < 0 || h > 23)
+    if h < 0 || h > 23
       raise "Invalid hour: #{birth_dt}"
     end
   end
@@ -154,10 +171,10 @@ class FourPillarsLogic
     else
       g = ""
     end
-    if h.nil? || i.nil?
-      t = ""
-    else
+    if @know_time
       t = "#{h}時#{i}分"
+    else
+      t = ""
     end
     "#{y}年#{m}月#{d}日#{t}生 #{g}"
   end
@@ -183,7 +200,7 @@ class FourPillarsLogic
     else
       m -= 1
     end
-    SETSUIRI_HASH[y*100+m] || [0,0]
+    self.class.setsuiri_of(y,m) || [0,0]
   end
 
   # 翌月の節入日
@@ -202,13 +219,13 @@ class FourPillarsLogic
   # このメソッドがfalseを返す場合、干支、蔵干が仮の節入日で計算されています。
   def know_setsuiri?
     y,m,d,h,i = @birth_dt
-    SETSUIRI_HASH.include? y*100+m
+    !self.class.setsuiri_of(y,m).nil?
   end
 
   # 生年月に対応する節入り日時 ファイルに登録がない場合は、4日12時を返す
   def setsuiri
     y,m,d,h,i = @birth_dt
-    SETSUIRI_HASH[y*100+m] || [4,12*60]
+    self.class.setsuiri_of(y,m) || [4,12*60]
   end
 
   # 生まれた日が節入日にあたる場合、true
@@ -223,21 +240,24 @@ class FourPillarsLogic
   def kanshi
     y,m,d,h,i = @birth_dt
     sd, st = setsuiri
+    if d == sd 
+      # puts "d=#{d}, h=#{h}, i=#{i}"
+    end
+
     yd = y - 1864 # (till 1865.02.0?) = 甲子
     yd -= 1 if m < 2 || (m == 2 && d < sd) || (m == 2 && d == sd && h*60+i < st)
     md = (y - 1863) * 12 + (m - 12) # (till 1864.01.05) = 甲子
     md -= 1 if d < sd || (d == sd && h*60+i < st)
-    dd = Date.new(y,m,d) - Date.new(1863,12,31) # 1923.10.18 = 甲子
+    dp = self.class.day_pillar_of(Date.new(y,m,d)) # 日柱
 
-    return [KANSHI_ARRAY[dd % 60],KANSHI_ARRAY[md % 60],KANSHI_ARRAY[yd % 60]] unless @with_time
+    return [dp,KANSHI_ARRAY[md % 60],KANSHI_ARRAY[yd % 60]] unless @with_time
 
-    dp = KANSHI_ARRAY[dd % 60] # 日柱
-    if h.nil?
-      tp = nil
-    else
+    if @know_time
       jyunishi_idx = h == 23 ? 0 : ((h + 1) / 2)
       jikkan_idx = ((JIKKAN.index(dp[0]) % 5) * 2 + jyunishi_idx) % 10
       tp = JIKKAN[jikkan_idx] + JYUNISHI[jyunishi_idx]
+    else
+      tp = nil
     end
     return [tp,dp,KANSHI_ARRAY[md % 60],KANSHI_ARRAY[yd % 60]]
   end
@@ -368,10 +388,10 @@ class FourPillarsLogic
     m = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[1 + o][1])
     y = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[2 + o][1])
     return [d,m,y] unless @with_time
-    if @birth_dt[3].nil? # when hour is nil
-      t = nil
-    else
+    if @know_time 
       t = FourPillarsLogic::jyuniunsei(kanshi[o][0],kanshi[0][1])
+    else
+      t = nil
     end
     [t,d,m,y]
   end
@@ -533,9 +553,8 @@ class FourPillarsLogic
   # 大運 [順行 or 逆行, year] or [nil,nil](if gender is not male nor female)
   def taiun
     return [nil,nil] unless ['m','f'].include? @gender
-    k = gogyo_jikkan[2][0]
-    # TODO: 時刻不明の場合は？
-    t = @birth_dt[3] * 60 + @birth_dt[4] # 生まれた時間
+    k = gogyo_jikkan[2 + offset_for_day][0]
+    t = @birth_dt[3] * 60 + @birth_dt[4].to_i # 生まれた時間
     if (@gender == 'm' && k == "+") || (@gender == 'f' && k == '-')
       order = "順行"
       d = setsuiri[0] - birth_dt[2]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: four-pillars
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Yosei Ito
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2026-09-20 00:00:00.000000000 Z
 dependencies: []
 description: A class which tells fortune by Four Pillar astrology(四柱推命).
 email: y-itou@lumber-mill.co.jp
@@ -22,7 +21,6 @@ homepage: https://github.com/lumbermill/four-pillars
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -37,8 +35,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Four Pillar astrology
 test_files: []