four-pillars 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4af28e0c7492629860cfefa10e408001a09f522f217930e9c6a54a2a2f993631
-  data.tar.gz: ba92cb749d89f4b0af02b00d2b146761e93eb879e6bff81f68dad4a4fbca55dc
+  metadata.gz: 4382511acd1f1368f0521311c524b106d043283e3c49b1493d8bb5dbd0035758
+  data.tar.gz: 66fa7174de02c05426e23bfd676deacec29a2fbea287da325e479a0737e608cc
 SHA512:
-  metadata.gz: a17b6e76c63cedf7694ea1e247912245db0ef8ae478cfa5257833b65a8caeeb9896622db31d78f1b8bb4aeb848332d43eae830910c951cd2bda10c57aa66e2ae
-  data.tar.gz: b9db9e123171c3a6afdf5559a0138660652b047f558277769dbe85d91a764d62df13661366a640044b38f4134907806799856fb83cb3dc4737d8c345ea55b611
+  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) # 陽
@@ -184,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
 
   # 翌月の節入日
@@ -203,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
@@ -232,11 +248,10 @@ class FourPillarsLogic
     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 @know_time
       jyunishi_idx = h == 23 ? 0 : ((h + 1) / 2)
       jikkan_idx = ((JIKKAN.index(dp[0]) % 5) * 2 + jyunishi_idx) % 10

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: four-pillars
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Yosei Ito
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-25 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: []