genealogy 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdc120f7f9e2dcf06406a5ff6c0f9ff3e141479c30f7f25e6882003de83b6ba7
-  data.tar.gz: a7d8e6e2842288b654795134416882dcb9f84efea646d6808b24eef3638662f3
+  metadata.gz: da5a494d35d958b648df8c4f1976db27abd22d9b1388cf9bdbfa82f9ff5ac92c
+  data.tar.gz: 75613c06ae73ff27fb53b24dc9dd867fd56e5c8b72c43ea54afb08a6d7601373
 SHA512:
-  metadata.gz: aa770c140025e6f4a990302dcb804eed27de2c3aae987d83aefbb6c5fa7c51d4f4380f18c9194cce4a33d93c7432fc92d8d297dd38e8cc31db99a0d862ac0412
-  data.tar.gz: b40dbcdc590f93623e1836cd2de2aa0caa3f8ad0bc383e1a5c24f0023af75f20b6ff18d69f3f278bffc96f9d54a2a08fc79c77a403515f100084937b92a2ab7c
+  metadata.gz: 5061aa292b318ed81e38ae9897ed4f25f6edab8a6a84d0667a50e1940269e0739000091884fa953d6948978397bd63c23695ae49d11f14fecc63c6c2c0fe1362
+  data.tar.gz: c794897c6484d2ebcc254a870e5456064a01e3538695ece896f2c926eff0f3928b942b9732eb0abf513d5f218310628088bc1019fbae0fb117fefe59fc462604

data/lib/genealogy/alter_methods.rb

@@ -175,7 +175,15 @@ module Genealogy
     # @return [Boolean]
     def add_siblings(*args)
       options = args.extract_options!
-      check_incompatible_relationship(:sibling, *args)
+      case options[:half]
+      when :father
+        check_incompatible_relationship(:paternal_half_sibling, *args)
+      when :mother
+        check_incompatible_relationship(:maternal_half_sibling, *args)
+      when nil
+        check_incompatible_relationship(:sibling, *args)
+      end
+
       transaction do
         args.inject(true) do |res,sib|
           res &= case options[:half]

data/lib/genealogy/constants.rb

@@ -31,6 +31,7 @@ module Genealogy
 
     PARENT2LINEAGE = ActiveSupport::HashWithIndifferentAccess.new({ father: :paternal, mother: :maternal })
     LINEAGE2PARENT = ActiveSupport::HashWithIndifferentAccess.new({ paternal: :father, maternal: :mother })
+    OPPOSITELINEAGE = ActiveSupport::HashWithIndifferentAccess.new({ paternal: :maternal, maternal: :paternal })
     PARENT2SEX = ActiveSupport::HashWithIndifferentAccess.new({ father: :male, mother: :female })
     SEX2PARENT = ActiveSupport::HashWithIndifferentAccess.new({ male: :father, female: :mother })
     OPPOSITESEX = ActiveSupport::HashWithIndifferentAccess.new({male: :female, female: :male})
@@ -38,18 +39,18 @@ module Genealogy
     AKA = ActiveSupport::HashWithIndifferentAccess.new({
       father: "F",
       mother: "M",
-      paternal_grandfather: "PGF", 
-      paternal_grandmother: "PGM", 
-      maternal_grandfather: "MGF", 
-      maternal_grandmother: "MGM", 
+      paternal_grandfather: "PGF",
+      paternal_grandmother: "PGM",
+      maternal_grandfather: "MGF",
+      maternal_grandmother: "MGM",
       children: "C",
-      siblings: "S", 
+      siblings: "S",
       half_siblings: "HS",
       paternal_half_siblings: "PHS",
-      maternal_half_siblings: "MHS", 
-      grandchildren: "GC", 
-      uncles_and_aunts: "U&A", 
+      maternal_half_siblings: "MHS",
+      grandchildren: "GC",
+      uncles_and_aunts: "U&A",
       nieces_and_nephews: "N&N"
     })
   end
-end
+end

data/lib/genealogy/ineligible_methods.rb

@@ -14,7 +14,7 @@ module Genealogy
     #   @return [Array, NilClass] Return nil if $1 already assigned
     def self.generate_method_ineligibles_parent_with_docs(parent_role,unexpected_sex)
       define_method "ineligible_#{parent_role}s" do
-        unless self.send(parent_role) 
+        unless self.send(parent_role)
           ineligibles = []
           ineligibles |= descendants | [self] | gclass.send("#{unexpected_sex}s") if gclass.ineligibility_level >= PEDIGREE
           if gclass.ineligibility_level >= PEDIGREE_AND_DATES  and birth_range
@@ -32,7 +32,7 @@ module Genealogy
 
     # @!macro [attach] generate_method_ineligible_grandparent_with_docs
     #   @method ineligible_$1_grand$3s
-    #   list of individual who cannot be $1 grand$3 according to the ineligibility level in use. If `self`'s $2 is known, it returns $2's ineligible $3s. 
+    #   list of individual who cannot be $1 grand$3 according to the ineligibility level in use. If `self`'s $2 is known, it returns $2's ineligible $3s.
     #   Otherwise, at `:pedigree` level it returns `self` along with descendants, full siblings and all $4s.
     #   At `:pedigree_and_dates` level it also includes all individuals who were not fertile during `self`'s $2 estimated birth period.
     #   @return [Array, NilClass] Return nil if $1 grand$3 already assigned
@@ -41,11 +41,11 @@ module Genealogy
       define_method "ineligible_#{relationship}s" do
         unless send(relationship)
           ineligibles = []
-          if parent = send(parent_role)          
+          if parent = send(parent_role)
             ineligibles |= parent.send("ineligible_#{grandparent2parent_role}s")
           elsif gclass.ineligibility_level >= PEDIGREE
             ineligibles |= descendants | siblings | [self] | gclass.send("#{unexpected_sex}s")
-            if gclass.ineligibility_level >= PEDIGREE_AND_DATES              
+            if gclass.ineligibility_level >= PEDIGREE_AND_DATES
               ineligibles |= (gclass.all - ineligibles).find_all do |indiv|
                 !indiv.can_procreate_during?(send("#{parent_role}_birth_range"))
               end
@@ -55,13 +55,13 @@ module Genealogy
         end
       end
     end
-    
+
     generate_method_ineligible_grandparent_with_docs(:paternal,:father,:father, :female)
     generate_method_ineligible_grandparent_with_docs(:paternal,:father,:mother, :male)
     generate_method_ineligible_grandparent_with_docs(:maternal,:mother,:father, :female)
     generate_method_ineligible_grandparent_with_docs(:maternal,:mother,:mother, :male)
 
-    # list of individual who cannot be children according to the ineligibility level in use. 
+    # list of individual who cannot be children according to the ineligibility level in use.
     # At `:pedigree` level it returns `self` along with their ancestors, children, full siblings and all individuals that already have father (if male) or mother (if female).
     # At `:pedigree_and_dates` level it also includes all individuals who was born outside `self`'s fertility range, if estimable.
     # @return [Array]
@@ -74,9 +74,9 @@ module Genealogy
       ineligibles
     end
 
-    # list of individual who cannot be siblings according to the ineligibility level in use. 
+    # list of individual who cannot be siblings according to the ineligibility level in use.
     # At `:pedigree` level it returns `self` along with their full siblings, ancestors, descendants and all individuals with different father or mother.
-    # At `:pedigree_and_dates` level it also includes all individuals who cannot be siblings for age reasons. For each parent, if it is known 
+    # At `:pedigree_and_dates` level it also includes all individuals who cannot be siblings for age reasons. For each parent, if it is known
     # it includes parent's ineligible children, otherwise it tries to estimate parent's fertility period: if it's possible it includes all individuals whose estimated birth period doesn't overlap parent's fertility period.
     # @return [Array]
     def ineligible_siblings
@@ -86,7 +86,7 @@ module Genealogy
         ineligibles |= (father ? gclass.all_with(:father).where("father_id != ?", father) : [])
         ineligibles |= (mother ? gclass.all_with(:mother).where("mother_id != ?", mother) : [])
       end
-      if gclass.ineligibility_level >= PEDIGREE_AND_DATES 
+      if gclass.ineligibility_level >= PEDIGREE_AND_DATES
         [:father,:mother].each do |parent|
           if p = send(parent)
             # if a parent is present ineligible siblings are parent's ineligible children
@@ -104,10 +104,50 @@ module Genealogy
             end
           end
         end
-      else
       end
       ineligibles
     end
 
+    # @!macro [attach] generate_method_ineligibles_half_siblings_with_docs
+    #   @method ineligible_$1_half_siblings
+    #   list of individual who cannot be $1 half_sibling according to the ineligibility level in use.
+    #   At `:pedigree` level it returns `self` along with siblings, other lineage halfsiblngs and all individuals with differnt $2
+    #   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,
+    #   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.
+    #   @return [Array]
+    def self.generate_method_ineligibles_half_siblings_with_docs(lineage,parent_role)
+      define_method "ineligible_#{lineage}_half_siblings" do
+        ineligibles = []
+        parent = LINEAGE2PARENT[lineage]
+        p = send(parent)
+        if gclass.ineligibility_level >= PEDIGREE
+          ineligibles |= siblings | [self,p]
+          ineligibles |= send("#{OPPOSITELINEAGE[lineage]}_half_siblings") # other lineage half siblings would become full siblings so they cannot be current lineage half sibling
+          ineligibles |= gclass.all_with(parent).where("#{parent}_id != ?", p) if p
+        end
+        if gclass.ineligibility_level >= PEDIGREE_AND_DATES
+          if p
+            # if a parent is present ineligible siblings are parent's ineligible children
+            ineligibles |= p.ineligible_children
+          elsif parent_fertility_range = send("#{parent}_fertility_range")
+            # if it's possible to estimate parent's fertility period
+            remainings = gclass.all - ineligibles
+            # includes all individuals whose estimated birth period doesn't overlap parent's fertility period
+            ineligibles |= remainings.find_all do |indiv|
+              if ibr = indiv.birth_range
+                !parent_fertility_range.overlaps? ibr
+              else
+                false
+              end
+            end
+          end
+        end
+        ineligibles
+
+      end
+    end
+    generate_method_ineligibles_half_siblings_with_docs(:paternal, :father)
+    generate_method_ineligibles_half_siblings_with_docs(:maternal, :mother)
+
   end
-end
+end

data/lib/genealogy/version.rb

@@ -1,3 +1,3 @@
 module Genealogy
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord