genealogy 2.6.4 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4018c3163fa6f6597b2c34e1b03c0f9fb489bd924f2005aaf4dd220809869deb
-  data.tar.gz: 6577a730fe4448def2c650746a3bd582f8622b5f28a8f15a6d442729612f1afd
+  metadata.gz: b8c2e921b1de225c52799f37886d08b19eaa9b22c43b035df462aa6dc88853a5
+  data.tar.gz: b98bfe7b146347013cff7af6a6018b26c4590744d68fa38dc2a42ce0351ab3fa
 SHA512:
-  metadata.gz: 53a20632af604fbc079e787d73f00d9f12f4c78d4df34fd5e6b80fb3ea0624c97c9cff1fabcd2e5eb2a0302ea59a493c7451b136ad0aefab2a7f607662100829
-  data.tar.gz: 81b4228b4dc6b7ededc5caf5fd350b028a68519fdb98ac318fbd66354a8f89f290ce947b30418bfde2ceafd15318fe5da54c3d87488d599662e7486d53695389
+  metadata.gz: 25540e3f4f05a3cc7cd27d8e3566fa783ac645beab2c270d241f9faf7ef5022cd8585ce82ea8675dc7814df20734719d1ca06fbb5f880bc89997a59277b640a9
+  data.tar.gz: bba098769a2904dadf4cc48fac99e09529a8643916595f2415b48468a1c3256d98b90f1e87117251744fbbcdcb0ed902943fbf4d337ee2a4f237fb12c8516e00

data/lib/genealogy/alter_methods.rb

@@ -3,8 +3,6 @@ module Genealogy
   module AlterMethods
     extend ActiveSupport::Concern
 
-    include Constants
-
     # @!macro [attach] generate
     #   @method add_$1(parent)
     #   Add $1
@@ -76,7 +74,7 @@ module Genealogy
     def self.generate_method_add_grandparent(lineage,grandparent)
       relationship = "#{lineage}_grand#{grandparent}"
       define_method "add_#{relationship}" do |gp|
-        parent = LINEAGE2PARENT[lineage]
+        parent = gclass::LINEAGE2PARENT[lineage]
         raise_if_gap_on(parent)
         check_incompatible_relationship(relationship,gp)
         send(parent).send("add_#{grandparent}",gp)
@@ -95,7 +93,7 @@ module Genealogy
     def self.generate_method_remove_grandparent(lineage,grandparent)
       relationship = "#{lineage}_grand#{grandparent}"
       define_method "remove_#{relationship}" do
-        parent = LINEAGE2PARENT[lineage]
+        parent = gclass::LINEAGE2PARENT[lineage]
         raise_if_gap_on(parent)
         send(parent).send("remove_#{grandparent}")
       end
@@ -115,7 +113,7 @@ module Genealogy
     def self.generate_method_add_grandparents_by_lineage(lineage)
       relationship = "#{lineage}_grandparents"
       define_method "add_#{relationship}" do |gf,gm|
-        parent = LINEAGE2PARENT[lineage]
+        parent = gclass::LINEAGE2PARENT[lineage]
         raise_if_gap_on(parent)
         send(parent).send("add_parents",gf,gm)
       end
@@ -131,7 +129,7 @@ module Genealogy
     def self.generate_method_remove_grandparents_by_lineage(lineage)
       relationship = "#{lineage}_grandparents"
       define_method "remove_#{relationship}" do
-        parent = LINEAGE2PARENT[lineage]
+        parent = gclass::LINEAGE2PARENT[lineage]
         raise_if_gap_on(parent)
         send(parent).send("remove_parents")
       end

data/lib/genealogy/complex_query_methods.rb

@@ -1,7 +1,6 @@
 module Genealogy
   module ComplexQueryMethods
     extend ActiveSupport::Concern
-    include Constants
 
     module ClassMethods
 

data/lib/genealogy/current_spouse_methods.rb

@@ -3,8 +3,6 @@ module Genealogy
   module CurrentSpouseMethods
     extend ActiveSupport::Concern
 
-    include Constants
-
     # add current spouse updating receiver and argument individuals foreign_key in a transaction
     # @param [Object] spouse
     # @return [Boolean]

data/lib/genealogy/genealogy.rb

@@ -2,9 +2,7 @@ module Genealogy
 
   extend ActiveSupport::Concern
 
-  module ClassMethods
-
-    include Genealogy::Constants
+  class_methods do
 
     # gives to ActiveRecord model geneaogy capabilities. Modules UtilMethods QueryMethods IneligibleMethods AlterMethods and SpouseMethods are included
     # @param [Hash] options
@@ -22,16 +20,19 @@ module Genealogy
 
     def has_parents options = {}
 
-      include Genealogy::UtilMethods
-      include Genealogy::QueryMethods
-      include Genealogy::ComplexQueryMethods
-      include Genealogy::IneligibleMethods
-      include Genealogy::AlterMethods
-      include Genealogy::CurrentSpouseMethods
-
+      include Constants
+      include UtilMethods
+      include QueryMethods
+      include ComplexQueryMethods
+      include IneligibleMethods
+      include AlterMethods
+      include CurrentSpouseMethods
 
       check_has_parents_options(options)
 
+      # instance_variable_set(:@role_as_relative, nil)
+      attr_accessor :role_as_relative
+
       # keep track of the original extend class to prevent wrong scopes in query method in case of STI
       class_attribute :gclass, instance_writer: false
       self.gclass = self
@@ -43,22 +44,22 @@ module Genealogy
       class_attribute :ineligibility_level, instance_accessor: false
       self.ineligibility_level = case options[:ineligibility]
       when :pedigree
-        PEDIGREE
+        gclass::PEDIGREE
       when true
-        PEDIGREE
+        gclass::PEDIGREE
       when :pedigree_and_dates
-        PEDIGREE_AND_DATES
+        gclass::PEDIGREE_AND_DATES
       when false
-        OFF
+        gclass::OFF
       when nil
-        PEDIGREE
+        gclass::PEDIGREE
       else
         raise ArgumentError, "ineligibility option must be one among :pedigree, :pedigree_and_dates or false"
       end
 
       ## limit_ages
-      if ineligibility_level >= PEDIGREE_AND_DATES
-        DEFAULTS[:limit_ages].each do |age,v|
+      if ineligibility_level >= gclass::PEDIGREE_AND_DATES
+        gclass::DEFAULTS[:limit_ages].each do |age,v|
           class_attribute age, instance_accessor: false
           self.send("#{age}=", options[:limit_ages].try(:[],age) || v)
         end
@@ -67,12 +68,12 @@ module Genealogy
       [:current_spouse, :perform_validation].each do |opt|
         ca = "#{opt}_enabled"
         class_attribute ca, instance_accessor: false
-        self.send "#{ca}=", options.key?(opt) ? options[opt] : DEFAULTS[opt]
+        self.send "#{ca}=", options.key?(opt) ? options[opt] : gclass::DEFAULTS[opt]
       end
 
 
       # column names class attributes
-      DEFAULTS[:column_names].merge(options[:column_names]).each do |k,v|
+      gclass::DEFAULTS[:column_names].merge(options[:column_names]).each do |k,v|
         class_attribute_name = "#{k}_column"
         class_attribute class_attribute_name, instance_accessor: false
         self.send("#{class_attribute_name}=", v)
@@ -81,7 +82,7 @@ module Genealogy
 
       ## sex
       class_attribute :sex_values, :sex_male_value, :sex_female_value, instance_accessor: false
-      self.sex_values = options[:sex_values] || DEFAULTS[:sex_values]
+      self.sex_values = options[:sex_values] || gclass::DEFAULTS[:sex_values]
       self.sex_male_value = self.sex_values.first
       self.sex_female_value = self.sex_values.last
 
@@ -95,7 +96,7 @@ module Genealogy
       belongs_to_options = {class_name: self.name}
       belongs_to_options[:optional] = true if Gem::Specification.find_by_name('activerecord').version >= Gem::Version.new("5")
       tracked_relatives.each do |k|
-        belongs_to k, belongs_to_options.merge(foreign_key: self.send("#{k}_id_column"))
+        belongs_to k, **belongs_to_options.merge(foreign_key: self.send("#{k}_id_column"))
       end
 
       has_many :children_as_father, class_name: self.name, foreign_key: self.father_id_column, dependent: :nullify

data/lib/genealogy/ineligible_methods.rb

@@ -4,8 +4,6 @@ module Genealogy
   module IneligibleMethods
     extend ActiveSupport::Concern
 
-    include Constants
-
     # @!macro [attach] generate_method_ineligibles_parent_with_docs
     #   @method ineligible_$1s
     #   list of individual who cannot be $1 according to the ineligibility level in use.
@@ -16,8 +14,8 @@ module Genealogy
       define_method "ineligible_#{parent_role}s" do
         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
+          ineligibles |= descendants | [self] | gclass.send("#{unexpected_sex}s") if gclass.ineligibility_level >= gclass::PEDIGREE
+          if gclass.ineligibility_level >= gclass::PEDIGREE_AND_DATES  and birth_range
             ineligibles |= (gclass.all - ineligibles).find_all do |indiv|
               !indiv.can_procreate_during?(birth_range)
             end
@@ -43,9 +41,9 @@ module Genealogy
           ineligibles = []
           if parent = send(parent_role)
             ineligibles |= parent.send("ineligible_#{grandparent2parent_role}s")
-          elsif gclass.ineligibility_level >= PEDIGREE
+          elsif gclass.ineligibility_level >= gclass::PEDIGREE
             ineligibles |= descendants | siblings | [self] | gclass.send("#{unexpected_sex}s")
-            if gclass.ineligibility_level >= PEDIGREE_AND_DATES
+            if gclass.ineligibility_level >= gclass::PEDIGREE_AND_DATES
               ineligibles |= (gclass.all - ineligibles).find_all do |indiv|
                 !indiv.can_procreate_during?(send("#{parent_role}_birth_range"))
               end
@@ -67,8 +65,8 @@ module Genealogy
     # @return [Array]
     def ineligible_children
       ineligibles = []
-      ineligibles |= ancestors | children | siblings | [self] | gclass.all_with(SEX2PARENT[ssex]) if gclass.ineligibility_level >= PEDIGREE
-      if gclass.ineligibility_level >= PEDIGREE_AND_DATES and fertility_range
+      ineligibles |= ancestors | children | siblings | [self] | gclass.all_with(gclass::SEX2PARENT[ssex]) if gclass.ineligibility_level >= gclass::PEDIGREE
+      if gclass.ineligibility_level >= gclass::PEDIGREE_AND_DATES and fertility_range
         ineligibles |= (gclass.all - ineligibles).find_all{ |indiv| !can_procreate_during?(indiv.birth_range)}
       end
       ineligibles
@@ -81,12 +79,12 @@ module Genealogy
     # @return [Array]
     def ineligible_siblings
       ineligibles = []
-      if gclass.ineligibility_level >= PEDIGREE
+      if gclass.ineligibility_level >= gclass::PEDIGREE
         ineligibles |= ancestors | descendants | siblings | [self]
         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 >= gclass::PEDIGREE_AND_DATES
         [:father,:mother].each do |parent|
           if p = send(parent)
             # if a parent is present ineligible siblings are parent's ineligible children
@@ -118,14 +116,14 @@ module Genealogy
     def self.generate_method_ineligibles_half_siblings_with_docs(lineage,parent_role)
       define_method "ineligible_#{lineage}_half_siblings" do
         ineligibles = []
-        parent = LINEAGE2PARENT[lineage]
+        parent = gclass::LINEAGE2PARENT[lineage]
         p = send(parent)
-        if gclass.ineligibility_level >= PEDIGREE
+        if gclass.ineligibility_level >= gclass::PEDIGREE
           ineligibles |= p.ineligible_children
-          ineligibles |= send("#{OPPOSITELINEAGE[lineage]}_half_siblings") # other lineage half siblings would become full siblings so they cannot be current lineage half sibling
+          ineligibles |= send("#{gclass::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)
         end
-        if gclass.ineligibility_level >= PEDIGREE_AND_DATES
+        if gclass.ineligibility_level >= gclass::PEDIGREE_AND_DATES
           if p
             # if a parent is present ineligible siblings are parent's ineligible children
             ineligibles |= p.ineligible_children

data/lib/genealogy/query_methods.rb

@@ -3,8 +3,6 @@ module Genealogy
   module QueryMethods
     extend ActiveSupport::Concern
 
-    include Constants
-
     # @return [2-elements Array] father and mother
     def parents
       [father,mother]
@@ -51,17 +49,17 @@ module Genealogy
     # @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_before_type_cast
-      result = gclass.where("#{SEX2PARENT[ssex]}_id" => self)
+      result = gclass.where("#{gclass::SEX2PARENT[ssex]}_id" => self)
       if options.keys.include? :spouse
         check_indiv(spouse = options[:spouse],opposite_ssex)
-        result = result.where("#{SEX2PARENT[opposite_ssex]}_id" => spouse ) if spouse
+        result = result.where("#{gclass::SEX2PARENT[opposite_ssex]}_id" => spouse ) if spouse
       end
       result
     end
 
     # @return [ActiveRecord::Relation] list of individuals with whom has had children
     def spouses
-      gclass.where(id: children.pluck("#{SEX2PARENT[opposite_ssex]}_id".to_sym).compact.uniq) | (self.class.current_spouse_enabled ? [] : [current_spouse])
+      gclass.where(id: children.pluck("#{gclass::SEX2PARENT[opposite_ssex]}_id".to_sym).compact.uniq) | (self.class.current_spouse_enabled ? [] : [current_spouse])
     end
 
     # @param [Hash] options
@@ -275,6 +273,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
+    # @option options [Boolean] singular_role to use singularized role as keys
     # @return [Hash] family hash with roles as keys? :spouse and individuals as values.
     def family_hash(options = {})
       roles = [:father, :mother, :children, :siblings]
@@ -294,7 +293,42 @@ module Genealogy
           raise ArgumentError, "Admitted values for :half options are: :father, :mother, :include, :include_separately, nil"
       end
       roles += [:paternal_grandfather, :paternal_grandmother, :maternal_grandfather, :maternal_grandmother, :grandchildren, :uncles_and_aunts, :nieces_and_nephews, :cousins] if options[:extended] == true
-      roles.inject({}){|res,role| res.merge!({role => self.send(role)})}
+      res = roles.inject({}){|res,role| res.merge!({role => self.send(role)})}
+      if options[:singular_role] == true
+        res2 = {
+          father: res[:father],
+          mother: res[:mother],
+          daughter: res[:children].females,
+          son: res[:children].males,
+          sister: res[:siblings].females,
+          brother: res[:siblings].males
+        }
+
+        res2[:current_spouse] = res[:current_spouse] if res.has_key? :current_spouse
+
+        res2.merge!({
+          paternal_grandfather: res[:paternal_grandfather],
+          paternal_grandmother: res[:paternal_grandmother],
+          maternal_grandfather: res[:maternal_grandfather],
+          maternal_grandmother: res[:maternal_grandmother],
+          grandchild: res[:grandchildren],
+          uncle: res[:uncles_and_aunts].males,
+          aunts: res[:uncles_and_aunts].females,
+          nephew: res[:nieces_and_nephews].males,
+          niece: res[:nieces_and_nephews].females,
+          cousin: res[:cousins]
+        }) if options[:extended] == true
+
+        res2.merge!({
+          paternal_half_brother: res[:paternal_half_siblings].males,
+          paternal_half_sister: res[:paternal_half_siblings].females,
+          maternal_half_brother: res[:maternal_half_siblings].males,
+          maternal_half_sister: res[:maternal_half_siblings].females,
+        }) if options[:half] == :include_separately
+
+        res = res2
+      end
+      res
     end
 
     # family_hash with option extended: :true
@@ -307,8 +341,13 @@ module Genealogy
     # @return [Array]
     # @see #family_hash
     def family(options = {})
-      hash = family_hash(options)
-      hash.keys.inject([]){|tot,k| tot << hash[k] }.compact.flatten
+      family_hash(options).inject([]) do |memo, r|
+        [r.last].compact.flatten.each do |relative|
+          relative.role_as_relative = r.first.to_s.singularize.to_sym
+          memo << relative
+        end
+        memo
+      end
     end
 
     # family with option extended: :true

data/lib/genealogy/util_methods.rb

@@ -3,8 +3,6 @@ module Genealogy
   module UtilMethods
     extend ActiveSupport::Concern
 
-    include Constants
-
     # Genealogy thinks time in term of Date, not DateTime
     # @return [Date]
     def birth
@@ -80,9 +78,9 @@ module Genealogy
     def self.generate_method_parent_birth_range(parent)
       define_method "#{parent}_birth_range" do
         if birth
-          (birth - gclass.send("max_#{PARENT2SEX[parent]}_procreation_age").years)..(birth - gclass.send("min_#{PARENT2SEX[parent]}_procreation_age").years)
+          (birth - gclass.send("max_#{gclass::PARENT2SEX[parent]}_procreation_age").years)..(birth - gclass.send("min_#{gclass::PARENT2SEX[parent]}_procreation_age").years)
         elsif life_range
-          (life_range.begin - gclass.send("max_#{PARENT2SEX[parent]}_procreation_age").years)..(life_range.end - gclass.send("min_#{PARENT2SEX[parent]}_procreation_age").years)
+          (life_range.begin - gclass.send("max_#{gclass::PARENT2SEX[parent]}_procreation_age").years)..(life_range.end - gclass.send("min_#{gclass::PARENT2SEX[parent]}_procreation_age").years)
         end
       end
     end
@@ -96,7 +94,7 @@ module Genealogy
     def self.generate_method_parent_fertility_range(parent)
       define_method "#{parent}_fertility_range" do
         if parent_birth_range = send("#{parent}_birth_range")
-          (parent_birth_range.begin + gclass.send("min_#{PARENT2SEX[parent]}_procreation_age").years)..(parent_birth_range.end + gclass.send("max_#{PARENT2SEX[parent]}_procreation_age").years)
+          (parent_birth_range.begin + gclass.send("min_#{gclass::PARENT2SEX[parent]}_procreation_age").years)..(parent_birth_range.end + gclass.send("max_#{gclass::PARENT2SEX[parent]}_procreation_age").years)
         end
       end
     end
@@ -119,7 +117,7 @@ module Genealogy
     # opposite sex in terms of :male or :female
     # @return [Symbol]
     def opposite_ssex
-      OPPOSITESEX[ssex]
+      gclass::OPPOSITESEX[ssex]
     end
 
     # @return [Boolean]
@@ -160,7 +158,7 @@ module Genealogy
         # puts "[#{__method__}]: #{arg} class: #{arg.class}, #{self} class: #{self.class}"
         next if relative.nil?
         check_indiv(relative)
-        if gclass.ineligibility_level >= PEDIGREE
+        if gclass.ineligibility_level >= gclass::PEDIGREE
           if ineligibles = self.send("ineligible_#{relationship.to_s.pluralize}")
             # puts "[#{__method__}]: checking if #{relative} can be #{relationship} of #{self}"
             raise IncompatibleRelationshipException, "#{relative} can't be #{relationship} of #{self}" if ineligibles.include? relative

data/lib/genealogy/version.rb

@@ -1,3 +1,3 @@
 module Genealogy
-  VERSION = "2.6.4"
+  VERSION = "2.7.2"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.7.2
 platform: ruby
 authors:
 - masciugo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ homepage: https://github.com/masciugo/genealogy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,8 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Make ActiveRecord model act as a pedigree
 test_files: []