genealogy 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a3789413a0f15b45dca9101f416f34b7b4b47c2e68c236fd83c1d3a8305077
-  data.tar.gz: 2be53f13d7e489235efb232865fa664124b0e37ac3f3a943cee2397b8a1153c1
+  metadata.gz: e3dda0154052e22f243b48bae114dae17b40b405c7968dcd59c2593c62e8862a
+  data.tar.gz: e9d6368fe55759b49a8c67c7e45174cbe0ef94b607886036f8d5593ebe0c4101
 SHA512:
-  metadata.gz: 23c8bec528f25388264d9ec506c04473e3d4970d34298ce0b5a03d9620f9c2373574acadb337543444d7166d96d1428ada1adef560b05ad6df2ff76fe451d5e3
-  data.tar.gz: 4cc61c08bb91e6e58e3aafc3e25a57d765a955936e50d86d081582411bc46d26644800a48fc57f6deda18597fcddcf5703909a89f6ebc703b684ca743b266868
+  metadata.gz: f4bf0b82f01ca8e76631500314b288f50daa16d181c827dca08a8dbc9432f27d92da3b558a01c676b0196c072b02a880ae5aeaf3c99c851de52717759871b83f
+  data.tar.gz: ce491f72110f4c82be25f4a0c881195864aa418891717d5766b437a1a684502b34c9b4ba5ca257c32290f2e4c4a553cf1975517e30ab82638a94bbaf48f4ae29

data/lib/genealogy/alter_methods.rb

@@ -7,10 +7,10 @@ module Genealogy
 
     # @!macro [attach] generate
     #   @method add_$1(parent)
-    #   Add $1 
+    #   Add $1
     #   @param [Object] parent
     #   @raise [Exception] if perform validation is enabled and self is invalid
-    #   @return [Boolean] 
+    #   @return [Boolean]
     def self.generate_method_add_parent(parent)
       define_method "add_#{parent}" do |relative|
         check_incompatible_relationship(parent,relative)
@@ -29,7 +29,7 @@ module Genealogy
     #   @method remove_$1
     #   remove $1. Foreign_key set to nil
     #   @raise [Exception] if perform validation is enabled and self is invalid
-    #   @return [Boolean] 
+    #   @return [Boolean]
     def self.generate_method_remove_parent(parent)
       define_method "remove_#{parent}" do
         if gclass.perform_validation_enabled
@@ -48,7 +48,7 @@ module Genealogy
     # @param [Object] mother
     # @see #add_father
     # @see #add_mother
-    # @return [Boolean] 
+    # @return [Boolean]
     def add_parents(father,mother)
       transaction do
         add_father(father)
@@ -59,7 +59,7 @@ module Genealogy
     # remove both parents calling #remove_father and #remove_mother in a transaction
     # @see #remove_father
     # @see #remove_mother
-    # @return [Boolean] 
+    # @return [Boolean]
     def remove_parents
       transaction do
         remove_father
@@ -69,10 +69,10 @@ module Genealogy
 
     # @!macro [attach] generate
     #   @method add_$1_grand$2(grandparent)
-    #   Add $1 grand$2 
+    #   Add $1 grand$2
     #   @param [Object] gp grandparent
     #   @raise [Exception] if perform validation is enabled and self is invalid
-    #   @return [Boolean] 
+    #   @return [Boolean]
     def self.generate_method_add_grandparent(lineage,grandparent)
       relationship = "#{lineage}_grand#{grandparent}"
       define_method "add_#{relationship}" do |gp|
@@ -89,9 +89,9 @@ module Genealogy
 
     # @!macro [attach] generate
     #   @method remove_$1_grand$2
-    #   remove $1 grand$2 
+    #   remove $1 grand$2
     #   @raise [Exception] if perform validation is enabled and self is invalid
-    #   @return [Boolean] 
+    #   @return [Boolean]
     def self.generate_method_remove_grandparent(lineage,grandparent)
       relationship = "#{lineage}_grand#{grandparent}"
       define_method "remove_#{relationship}" do
@@ -107,11 +107,11 @@ module Genealogy
 
     # @!macro [attach] generate
     #   @method add_$1_grandparents
-    #   Add $1 grandparents 
+    #   Add $1 grandparents
     #   @param [Object] gf grandfather
     #   @param [Object] gm grandmother
     #   @raise [Exception] if perform validation is enabled and self is invalid
-    #   @return [Boolean] 
+    #   @return [Boolean]
     def self.generate_method_add_grandparents_by_lineage(lineage)
       relationship = "#{lineage}_grandparents"
       define_method "add_#{relationship}" do |gf,gm|
@@ -125,12 +125,12 @@ module Genealogy
 
     # @!macro [attach] generate
     #   @method remove_$1_grandparents
-    #   remove $1 grandparents 
+    #   remove $1 grandparents
     #   @raise [Exception] if perform validation is enabled and self is invalid
-    #   @return [Boolean] 
+    #   @return [Boolean]
     def self.generate_method_remove_grandparents_by_lineage(lineage)
       relationship = "#{lineage}_grandparents"
-      define_method "remove_#{relationship}" do 
+      define_method "remove_#{relationship}" do
         parent = LINEAGE2PARENT[lineage]
         raise_if_gap_on(parent)
         send(parent).send("remove_parents")
@@ -147,7 +147,7 @@ module Genealogy
     # @param [Object] mgm maternal grandmother
     # @see #add_paternal_grandparents
     # @see #add_maternal_grandparents
-    # @return [Boolean] 
+    # @return [Boolean]
     def add_grandparents(pgf,pgm,mgf,mgm)
       transaction do
         add_paternal_grandparents(pgf,pgm)
@@ -158,7 +158,7 @@ module Genealogy
     # remove all grandparents calling #remove_paternal_grandparents and #remove_maternal_grandparents in a transaction
     # @see #remove_paternal_grandparents
     # @see #remove_maternal_grandparents
-    # @return [Boolean] 
+    # @return [Boolean]
    def remove_grandparents
       transaction do
         remove_paternal_grandparents
@@ -172,7 +172,7 @@ module Genealogy
     #   @param [Hash] options
     #   @option options [Symbol] half :father for paternal half siblings and :mother for maternal half siblings
     #   @option options [Object] spouse if specified, passed individual will be used as mother in case of half sibling
-    # @return [Boolean] 
+    # @return [Boolean]
     def add_siblings(*args)
       options = args.extract_options!
       check_incompatible_relationship(:sibling, *args)
@@ -203,8 +203,8 @@ module Genealogy
       add_siblings(sibling,options)
     end
 
-    
-    # remove siblings by nullifying parents of passed individuals 
+
+    # remove siblings by nullifying parents of passed individuals
     # @overload remove_siblings(*siblings,options={})
     #   @param [Object] siblings list of siblings
     #   @param [Hash] options
@@ -230,7 +230,7 @@ module Genealogy
             sib.remove_mother
           when nil
             sib.remove_parents
-          end  
+          end
         end
       end
       !resulting_indivs.empty? #returned value must be true if self has at least a siblings to affect
@@ -246,21 +246,21 @@ module Genealogy
     #   @param [Object] children list of children
     #   @param [Hash] options
     #   @option options [Object] spouse if specified, children will have that spouse
-    # @return [Boolean] 
+    # @return [Boolean]
     def add_children(*args)
       options = args.extract_options!
       raise_if_sex_undefined
       check_incompatible_relationship(:children, *args)
       transaction do
         args.inject(true) do |res,child|
-          res &= case sex
+          res &= case sex_before_type_cast
           when gclass.sex_male_value
             child.add_mother(options[:spouse]) if options[:spouse]
             child.add_father(self)
           when gclass.sex_female_value
             child.add_father(options[:spouse]) if options[:spouse]
             child.add_mother(self)
-          else 
+          else
             raise SexError, "Sex value not valid for #{self}"
           end
         end
@@ -294,14 +294,14 @@ module Genealogy
           if options[:remove_other_parent] == true
             child.remove_parents
           else
-            case sex
+            case sex_before_type_cast
             when gclass.sex_male_value
               child.remove_father
             when gclass.sex_female_value
               child.remove_mother
-            else 
+            else
               raise SexError, "Sex value not valid for #{self}"
-            end  
+            end
           end
         end
       end

data/lib/genealogy/query_methods.rb

@@ -5,28 +5,28 @@ module Genealogy
 
     include Constants
 
-    # @return [2-elements Array] father and mother 
+    # @return [2-elements Array] father and mother
     def parents
       [father,mother]
     end
-    # @return [ActiveRecord, NilClass] 
+    # @return [ActiveRecord, NilClass]
     def paternal_grandfather
       father && father.father
     end
-    # @return [ActiveRecord, NilClass] 
+    # @return [ActiveRecord, NilClass]
     def paternal_grandmother
       father && father.mother
     end
-    # @return [ActiveRecord, NilClass] 
+    # @return [ActiveRecord, NilClass]
     def maternal_grandfather
       mother && mother.father
     end
-    # @return [ActiveRecord, NilClass] 
+    # @return [ActiveRecord, NilClass]
     def maternal_grandmother
       mother && mother.mother
     end
 
-    # @return [2-elements Array] paternal_grandfather and paternal_grandmother 
+    # @return [2-elements Array] paternal_grandfather and paternal_grandmother
     def paternal_grandparents
       (father && father.parents) || [nil,nil]
     end
@@ -50,7 +50,7 @@ module Genealogy
     # @option options [Object] spouse to filter children by spouse
     # @return [ActiveRecord::Relation] children
     def children(options = {})
-      raise SexError, "Sex value not valid for #{self}. It's needed to look for children" unless gclass.sex_values.include? sex
+      raise SexError, "Sex value not valid for #{self}. It's needed to look for children" unless gclass.sex_values.include? sex_before_type_cast
       result = gclass.where("#{SEX2PARENT[ssex]}_id" => self)
       if options.keys.include? :spouse
         check_indiv(spouse = options[:spouse],opposite_ssex)
@@ -79,7 +79,7 @@ module Genealogy
         result.all_with(:parents).where(father_id: father, mother_id: mother)
       when :father # common father
         result = result.all_with(:father).where(father_id: father)
-        if spouse 
+        if spouse
           check_indiv(spouse, :female)
           result.where(mother_id: spouse)
         elsif mother
@@ -109,7 +109,7 @@ module Genealogy
     end
 
     # siblings with option half: :only
-    # @see #siblings 
+    # @see #siblings
     def half_siblings(options = {})
       siblings(options.merge(half: :only))
     end
@@ -196,7 +196,7 @@ module Genealogy
     def great_grandchildren
       result = grandchildren.compact.inject([]){|memo,grandchild| memo |= grandchild.children}
     end
-    
+
     # list of uncles and aunts iterating through parents' siblings
     # @param [Hash] options
     # @option options [Symbol] lineage to filter by lineage: :paternal or :maternal
@@ -275,7 +275,7 @@ module Genealogy
     # family hash with roles as keys? :spouse and individuals as values. Defaults roles are :father, :mother, :children, :siblings and current_spouse if enabled
     # @option options [Symbol] half to filter siblings (see #siblings)
     # @option options [Boolean] extended to include roles for grandparents, grandchildren, uncles, aunts, nieces, nephews and cousins
-    # @return [Hash] family hash with roles as keys? :spouse and individuals as values. 
+    # @return [Hash] family hash with roles as keys? :spouse and individuals as values.
     def family_hash(options = {})
       roles = [:father, :mother, :children, :siblings]
       roles += [:current_spouse] if self.class.current_spouse_enabled
@@ -303,7 +303,7 @@ module Genealogy
 
     # family individuals
     # @return [Array]
-    # @see #family_hash 
+    # @see #family_hash
     def family(options = {})
       hash = family_hash(options)
       hash.keys.inject([]){|tot,k| tot << hash[k] }.compact.flatten
@@ -319,17 +319,17 @@ module Genealogy
 
     module ClassMethods
       # all male individuals
-      # @return [ActiveRecord::Relation] 
+      # @return [ActiveRecord::Relation]
       def males
         where(sex: sex_male_value)
       end
       # all female individuals
-      # @return [ActiveRecord::Relation] 
+      # @return [ActiveRecord::Relation]
       def females
         where(sex: sex_female_value)
       end
       # all individuals individuals having relative with specified role
-      # @return [ActiveRecord, ActiveRecord::Relation] 
+      # @return [ActiveRecord, ActiveRecord::Relation]
       def all_with(role)
         case role
         when :father
@@ -344,4 +344,4 @@ module Genealogy
     end
 
   end
-end
+end

data/lib/genealogy/util_methods.rb

@@ -67,7 +67,7 @@ module Genealogy
     end
 
     # It tests whether fertility range overlaps specified period
-    # @param [Range] period 
+    # @param [Range] period
     # @return [Boolean] or nil if cannot be computable (#fertility_range returns nil)
     def can_procreate_during?(period)
       fertility_range.overlaps? period if (period and fertility_range)
@@ -104,9 +104,9 @@ module Genealogy
     generate_method_parent_fertility_range(:mother)
 
     # sex in terms of :male or :female
-    # @return [Symbol] 
+    # @return [Symbol]
     def ssex
-      case sex
+      case sex_before_type_cast
       when gclass.sex_male_value
         :male
       when gclass.sex_female_value
@@ -117,42 +117,42 @@ module Genealogy
     end
 
     # opposite sex in terms of :male or :female
-    # @return [Symbol] 
+    # @return [Symbol]
     def opposite_ssex
       OPPOSITESEX[ssex]
     end
 
-    # @return [Boolean] 
+    # @return [Boolean]
     def is_female?
       return female? if respond_to?(:female?)
-      sex == gclass.sex_female_value
+      sex_before_type_cast == gclass.sex_female_value
     end
 
-    # @return [Boolean] 
+    # @return [Boolean]
     def is_male?
       return male? if respond_to?(:male?)
-      sex == gclass.sex_male_value
+      sex_before_type_cast == gclass.sex_male_value
     end
-    
+
     # max life expectancy in terms of years. It depends on sex
-    # @return [Integer] 
+    # @return [Integer]
     def max_le
       gclass.send("max_#{ssex}_life_expectancy").years
     end
-    
+
     # max fertility procreation age in terms of years. It depends on sex
-    # @return [Integer] 
+    # @return [Integer]
     def max_fpa
       gclass.send("max_#{ssex}_procreation_age").years
     end
-    
+
     # min fertility procreation age in terms of years. It depends on sex
-    # @return [Integer] 
+    # @return [Integer]
     def min_fpa
       gclass.send("min_#{ssex}_procreation_age").years
     end
 
-    private 
+    private
 
     def check_incompatible_relationship(*args)
       relationship = args.shift
@@ -200,4 +200,4 @@ module Genealogy
     end
 
   end
-end
+end

data/lib/genealogy/version.rb

@@ -1,3 +1,3 @@
 module Genealogy
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - masciugo