genealogy 2.5.0 → 2.5.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: da5a494d35d958b648df8c4f1976db27abd22d9b1388cf9bdbfa82f9ff5ac92c
4
- data.tar.gz: 75613c06ae73ff27fb53b24dc9dd867fd56e5c8b72c43ea54afb08a6d7601373
3
+ metadata.gz: d858d2fc87619a42668203041a43ea391b052550cf88e0a57693c1d294452635
4
+ data.tar.gz: 98550f9bd2a67d5e0952b238a1aa7fd505e857db69e32b149011428fd057eb71
5
5
  SHA512:
6
- metadata.gz: 5061aa292b318ed81e38ae9897ed4f25f6edab8a6a84d0667a50e1940269e0739000091884fa953d6948978397bd63c23695ae49d11f14fecc63c6c2c0fe1362
7
- data.tar.gz: c794897c6484d2ebcc254a870e5456064a01e3538695ece896f2c926eff0f3928b942b9732eb0abf513d5f218310628088bc1019fbae0fb117fefe59fc462604
6
+ metadata.gz: bd940397fd970b02cd958e60af9bd64ee01c2ea3787bf6e1f44693fdb9217e14d2661b2b4faecc58a20cceda64fbbdab60f11b3090d8df0ae1a322dd5d79e928
7
+ data.tar.gz: 99641b731bc5f637684513dd9400cc712a9b6a550b80fb046d7634079985faa3264a9572ea2196a0d345737920d710d8cd74ce0a168a6856f50c554ec1da26fd
@@ -111,7 +111,7 @@ module Genealogy
111
111
  # @!macro [attach] generate_method_ineligibles_half_siblings_with_docs
112
112
  # @method ineligible_$1_half_siblings
113
113
  # list of individual who cannot be $1 half_sibling according to the ineligibility level in use.
114
- # At `:pedigree` level it returns `self` along with siblings, other lineage halfsiblngs and all individuals with differnt $2
114
+ # At `:pedigree` level it returns $2 ineligible children, other lineage halfsiblings and all individuals with $2 set
115
115
  # At `:pedigree_and_dates` level it also includes all individuals who cannot be siblings for age reasons. If $2 is known it includes $2's ineligible children,
116
116
  # otherwise it tries to estimate $2's fertility period: if it's possible it includes all individuals whose estimated birth period doesn't overlap $2's fertility period.
117
117
  # @return [Array]
@@ -121,9 +121,9 @@ module Genealogy
121
121
  parent = LINEAGE2PARENT[lineage]
122
122
  p = send(parent)
123
123
  if gclass.ineligibility_level >= PEDIGREE
124
- ineligibles |= siblings | [self,p]
124
+ ineligibles |= p.ineligible_children
125
125
  ineligibles |= send("#{OPPOSITELINEAGE[lineage]}_half_siblings") # other lineage half siblings would become full siblings so they cannot be current lineage half sibling
126
- ineligibles |= gclass.all_with(parent).where("#{parent}_id != ?", p) if p
126
+ ineligibles |= gclass.all_with(parent)
127
127
  end
128
128
  if gclass.ineligibility_level >= PEDIGREE_AND_DATES
129
129
  if p
@@ -1,3 +1,3 @@
1
1
  module Genealogy
2
- VERSION = "2.5.0"
2
+ VERSION = "2.5.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: genealogy
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0
4
+ version: 2.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - masciugo