four-pillars 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a123e8b07f965a3e7a7659e3897db368a3a2ab0904845c8a21d4cd25c5cb7845
-  data.tar.gz: 5ceb94b92ad003a66af88df64a6e153b6651c60d7c2bbf8f8ddf929e2fe5e3cf
+  metadata.gz: 4af28e0c7492629860cfefa10e408001a09f522f217930e9c6a54a2a2f993631
+  data.tar.gz: ba92cb749d89f4b0af02b00d2b146761e93eb879e6bff81f68dad4a4fbca55dc
 SHA512:
-  metadata.gz: c3ea6db851952af8757c94f849aa6ceda15325b47a2adccf2c37d8cef6d132dc0157976356f1fe37d3157cae6f6fb5b004400c68e2a97105507fd0c9c18a0ed4
-  data.tar.gz: 4d1ec6ed3b786bd249304108b62c7907c8053e1c32f42f28300bf426bc6cdf4df0c6eb7d9bd33159399d5dd73adfae0cfe9a89678b73797127e9ed01f4357c12
+  metadata.gz: a17b6e76c63cedf7694ea1e247912245db0ef8ae478cfa5257833b65a8caeeb9896622db31d78f1b8bb4aeb848332d43eae830910c951cd2bda10c57aa66e2ae
+  data.tar.gz: b9db9e123171c3a6afdf5559a0138660652b047f558277769dbe85d91a764d62df13661366a640044b38f4134907806799856fb83cb3dc4737d8c345ea55b611

data/lib/four-pillars.rb

@@ -130,15 +130,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 +155,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
@@ -223,6 +224,10 @@ 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) = 甲子
@@ -232,12 +237,12 @@ class FourPillarsLogic
     return [KANSHI_ARRAY[dd % 60],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 +373,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 +538,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]
@@ -572,8 +576,8 @@ class FourPillarsLogic
     order,year = taiun
     return [] if order.nil?
     d = order == '順行' ? 1 : -1
-    j_day = kanshi[0][0] # 日柱の十干
-    k = kanshi_as_number[1] - 1 # 月柱の干支番号
+    j_day = kanshi[offset_for_day][0] # 日柱の十干
+    k = kanshi_as_number[offset_for_day + 1] - 1 # 月柱の干支番号
     rows = []
     # [0,1,"癸亥","偏印","死",2]
     y1, y2 = 0, year

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: four-pillars
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Yosei Ito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies: []
 description: A class which tells fortune by Four Pillar astrology(四柱推命).
 email: y-itou@lumber-mill.co.jp