four-pillars 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05b1b6919825e6f97cd615abbf7ca7d446d031bc15524c7e42a8f17c211bf905
-  data.tar.gz: 2c4f1c1450a8af51b2fd0aaa65dd41559b77de7a8d7fb64d2cc8793109ddf748
+  metadata.gz: 3aea37ba5dcf75ab1e43016b9714bdfb764edee6caef59224d320ff630ba6667
+  data.tar.gz: da2aea2cb270e68f4ec22492d52d6df22312ede7d8f408503c2e01ce1c6619a9
 SHA512:
-  metadata.gz: bce4f1bcec1539c8d75a5a9e1009464fc07f64389f9649becbb69da6e6ea70f3d8fac0ce5e6bbc52dcf150daaf98f68317b4a9c1e509ec9c379fefa2a7ec6d42
-  data.tar.gz: 07333c1ea69b35433eebd12e83b2ddebf0327b866a6c9d765330b3fc585662d4603e639416d3e2222aea0b7cceda9f7aeb9dcb382a3324781e08bec3449c897e
+  metadata.gz: a158ad4720f46597b970c98919d113902680a5b682af608ad9f4a5a0458c4f47bc4ac86fa50e8b625c6e31c0da15fc48dcc415db7bd718b913a318c5b123ccb9
+  data.tar.gz: cf06e21200c9c684fc9b1e0a2149b0306e8ec4fae8110ce75845d788dc70f29eadcdc22c2d6df109d59967b4f40b1fc69553f5b9a1b5ae91e76b7b2a01e4896d

data/lib/four-pillars-setsuiri.txt

@@ -1801,7 +1801,7 @@
 2022,11,7,19,47
 2022,12,7,12,46
 2023,1,6,0,4
-2023,2,4,11,42
+2023,2,4,11,43
 2023,3,6,5,36
 2023,4,5,10,12
 2023,5,6,3,19

data/lib/four-pillars.rb

@@ -86,8 +86,7 @@ class FourPillarsLogic
 
   # 通変星
   def self.tsuhensei(j_day,j_src) # 日柱の十干、月柱または年柱の十干
-    j = JIKKAN.index(j_day)
-    if j % 2 == 0 # 陽
+    if plus_jikkan?(j_day) # 陽
       jikkan = JIKKAN
     else # 陰
       jikkan = JIKKAN_IN
@@ -109,10 +108,15 @@ class FourPillarsLogic
     JYUNIUNSEI[(ji + offset) % 12]
   end
 
-  # TODO エネルギー
+  # 十干の陰陽 陽:true 陰:false
+  def self.plus_jikkan?(jikkan)
+    i = JIKKAN.index(jikkan)
+    raise "Invalid jikkan: #{jikkan}" if i.nil?
+    return i % 2 == 0
+  end
 
   # 生年月日時間, 性別(大運の向きに使用)
-  attr_reader :birth_dt,:gender
+  attr_reader :birth_dt, :gender
 
   def initialize(birth_dt,gender)
     @birth_dt = birth_dt.map {|v| v.to_i }
@@ -292,6 +296,7 @@ class FourPillarsLogic
     [d,m,y]
   end
 
+  # 十二運星エネルギー
   def jyuniunsei_energy
     jyuniunsei.map {|v| JYUNIUNSEI_ENERGY[v] }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: four-pillars
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Yosei Ito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies: []
 description: A class which tells fortune by Four Pillar astrology(四柱推命).
 email: y-itou@lumber-mill.co.jp
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Four Pillar astrology