genealogy 1.4.0 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWNhZWM3Y2ZkOTg2ZTYwNzNjOTAyODQ5ODk3NTA1ZTk3NWU4Y2JlMA==
+    N2JhNjJiMTU0MmE0MGMwMmI1YTI2NjAyZWRhOGZhODRjMDlkMzUyMw==
   data.tar.gz: !binary |-
-    YTljMTlmNDMzN2ZlNWFhNThmN2MzMmRiZWRlZGNmMGNlNGNiZWQ5YQ==
+    ZTU5ZWM1OWI2NWE5MDc1MmNlOTM1MDhlMzg3YTFmN2YxZjJkNTIyZA==
 SHA512:
   metadata.gz: !binary |-
-    NjRmZjYwMjI2MTAxMzY4ODc3YjY2ZWZiZjRlNWYxMTdiMDJhMGVlNzlkYjY1
-    Y2I2YjE3NjU3OGEwMGI2YzU5ODBlZmYxNGI1Mjc4YjQxZjU5NjIzZjAwNjRl
-    YmM0NjlhZmQ3NzM0Y2E3MTNjZmI0Mzk4MWNlNWMyMGRmYmNlMTc=
+    MGIxNGE2YzUxNTA1ZmU4NzE3NGIwMTMxNzBkYjcxMWFmOGZmZGMzMGViNzg3
+    MGI5NmYwZGE1OTNlY2JhNDU0YzM2ZGUzMjNhMmU3YWFkODZjMzcwZmQwNWMz
+    YTM4MmEwN2ZmZDJmNmQ5OGMxMGFlMmJhYmMzYTM5YjMwNzIxNWU=
   data.tar.gz: !binary |-
-    NGEyMzdmM2U0ODIzNzJlMzYyM2I1NjY4YjdhZGIxMjM4MjNhZjU4YjEwZTM3
-    YzRmZjM1MTFkZWI2YWQyZjM5NDBlZDdhNGI5MzU4ZWFkZDI2ZTU4MzJkNDEw
-    YzZlMzUwNTU5OGU2YzlmMjgyMGNlNTI1OWZhY2M1MjhlNTAyYjk=
+    NDljNjIxODUzMDBmZjgxNzk5Y2RlMTk0ZWI3NTMxYTM3MDcxNjMwMjQxY2Qx
+    M2IxZDNiNzg5MDJlMDFhZWEzYjY2ZWY2MDc3ZmJmZWM4MjZjODU3YTkxYTJm
+    ZGU5ZDNmM2MwOWExY2E5YzgxZWYwMTlhM2M4OTllYjlmMTdkNGU=

data/lib/genealogy.rb

@@ -7,4 +7,3 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'genealogy/genealogy
 
 ActiveRecord::Base.send :extend, Genealogy
 
-

data/lib/genealogy/alter_methods.rb

@@ -20,7 +20,7 @@ module Genealogy
           self.update_attribute(parent,relative)
         end
       end
-      
+
       # remove method
       define_method "remove_#{parent}" do
         if perform_validation
@@ -127,7 +127,7 @@ module Genealogy
 
     def remove_siblings(*args)
       options = args.extract_options!
-      
+
       raise WrongOptionException.new("Unknown option value: :half => #{options[:half]}.") if (options[:half] and ![:father,:mother].include?(options[:half]))
 
       resulting_indivs = if args.blank?
@@ -162,7 +162,7 @@ module Genealogy
     end
 
     [:father, :mother].each do |parent|
-      
+
       # add paternal/maternal half_siblings
       define_method "add_#{Genealogy::PARENT2LINEAGE[parent]}_half_siblings" do | *args |
         options = args.extract_options!
@@ -170,7 +170,7 @@ module Genealogy
         args << options
         send("add_siblings",*args)
       end
-      
+
       # add paternal/maternal half_sibling
       define_method "add_#{Genealogy::PARENT2LINEAGE[parent]}_half_sibling" do | sib,options={} |
         options[:half] = parent
@@ -192,11 +192,10 @@ module Genealogy
       end
     end
 
-
     # offspring
     def add_offspring(*args)
       options = args.extract_options!
-      
+
       raise_if_sex_undefined
 
       transaction do
@@ -221,7 +220,7 @@ module Genealogy
 
     def remove_offspring(*args)
       options = args.extract_options!
-      
+
       raise_if_sex_undefined
 
       resulting_indivs = if args.blank?

data/lib/genealogy/genealogy.rb

@@ -16,37 +16,38 @@ module Genealogy
 
   end
 
-
   def has_parents options = {}
 
-    admitted_keys = [:sex_column, :sex_values, :father_column, :mother_column, :current_spouse_column, :current_spouse, :perform_validation]
+    admitted_keys = [:sex_column, :sex_values, :father_column, :mother_column, :current_spouse_column, :current_spouse, :birth_date_column, :death_date_column, :perform_validation]
     check_options(options, admitted_keys) do |key, value|
       if key == :sex_values
         raise WrongOptionException, ":sex_values option must be an array of length 2: first for male sex symbol an last for female" unless value.is_a?(Array) and value.size == 2
       end
     end
-    
+
     class_attribute :genealogy_enabled, :current_spouse_enabled, :genealogy_class, :perform_validation
     self.genealogy_enabled = true
     self.current_spouse_enabled = options[:current_spouse].try(:==,true) || false           # default false
     self.genealogy_class = self                                                             # keep track of the original extend class to prevent wrong scopes in query method in case of STI
     self.perform_validation = options[:perform_validation].try(:==,false) ? false : true    # default true
-    
+
     tracked_relatives = [:father, :mother]
     tracked_relatives << :current_spouse if current_spouse_enabled
 
     ## sex
     # class attributes
-    class_attribute :sex_column, :sex_values, :sex_male_value, :sex_female_value
+    class_attribute :sex_column, :sex_values, :sex_male_value, :sex_female_value, :birth_date_column, :death_date_column
     self.sex_column = options[:sex_column] || 'sex'
     self.sex_values = options[:sex_values] || ['M','F']
     self.sex_male_value = self.sex_values.first
     self.sex_female_value = self.sex_values.last
+    self.birth_date_column = options[:birth_date_column] || 'birth_date'
+    self.death_date_column = options[:death_date_column] || 'death_date'
     # instance attribute
     alias_attribute :sex, sex_column if self.sex_column != 'sex'
     # validation
     validates_presence_of sex_column
-    validates_format_of sex_column, :with => /[#{sex_values.join}]/ 
+    validates_format_of sex_column, :with => /[#{sex_values.join}]/
 
     tracked_relatives.each do |key|
       # class attribute where is stored the correspondig foreign_key column name
@@ -67,7 +68,7 @@ module Genealogy
     include Genealogy::SpouseMethods if current_spouse_enabled
 
   end
-  
+
   module MotherAssociationExtension
     def with(father_id)
       where(father_id: father_id)

data/lib/genealogy/query_methods.rb

@@ -28,7 +28,7 @@ module Genealogy
         end
 
         # eligible
-        define_method "eligible_#{Genealogy::PARENT2LINEAGE[parent]}_grand#{grandparent}s" do 
+        define_method "eligible_#{Genealogy::PARENT2LINEAGE[parent]}_grand#{grandparent}s" do
           if send(parent) and send("#{Genealogy::PARENT2LINEAGE[parent]}_grand#{grandparent}").nil?
             send(parent).send("eligible_#{grandparent}s") - [self]
           else
@@ -63,7 +63,7 @@ module Genealogy
     # offspring
     def offspring(options = {})
       if spouse = options[:spouse]
-        raise WrongSexException, "Problems while looking for #{self}'s offspring made with spouse #{spouse} who should not be a #{spouse.sex}." if spouse.sex == sex 
+        raise WrongSexException, "Problems while looking for #{self}'s offspring made with spouse #{spouse} who should not be a #{spouse.sex}." if spouse.sex == sex
       end
       result = case sex
       when sex_male_value
@@ -129,7 +129,7 @@ module Genealogy
 
     def half_siblings
       siblings(:half => :only)
-      # todo: inprove with option :father and :mother 
+      # todo: inprove with option :father and :mother
     end
 
     def paternal_half_siblings
@@ -242,7 +242,7 @@ module Genealogy
       nieces_and_nephews(options.merge({sex: :female}), sibling_options)
     end
 
-    def family(options = {}) 
+    def family(options = {})
       res = [self] | siblings | parents | offspring
       res |= [current_spouse] if self.class.current_spouse_enabled
       res |= case options[:half]
@@ -258,13 +258,13 @@ module Genealogy
           raise WrongOptionValueException, "Admitted values for :half options are: :father, :mother, :include, nil"
       end
       res = offspring.inject(res){|memo,child| memo |= child.parents} #add spouses
-      
+
       res += [grandparents + grandchildren + uncles_and_aunts + nieces_and_nephews].flatten if options[:extended]
 
       res.compact
     end
 
-    def family_hash(options = {}) 
+    def family_hash(options = {})
       roles = [:father, :mother, :children, :siblings]
       roles += [:current_spouse] if self.class.current_spouse_enabled
       roles += case options[:half]
@@ -285,11 +285,11 @@ module Genealogy
       h
     end
 
-    def extended_family(options = {}) 
+    def extended_family(options = {})
       family(options.merge(:extended => true))
     end
 
-    def extended_family_hash(options = {}) 
+    def extended_family_hash(options = {})
       family_hash(options.merge(:extended => true))
     end
 
@@ -299,7 +299,7 @@ module Genealogy
         'male'
       when sex_female_value
         'female'
-      else 
+      else
         raise WrongSexException, "Sex value not valid for #{self}"
       end
     end
@@ -311,7 +311,36 @@ module Genealogy
 
     def is_male?
       return male? if respond_to?(:male?)
-      sex == sex_male_value  
+      sex == sex_male_value
+    end
+
+    def birth
+      self.send("#{genealogy_class.birth_date_column}")
+    end
+
+    def death
+      self.send("#{genealogy_class.death_date_column}")
+    end
+
+    def age(options={})
+      birth_date = birth
+      death_date = death
+      return if birth_date.nil?
+
+      current = options[:end_date] ? DateTime.parse(options[:end_date]) : death_date || Time.zone.now
+      years = current.year - birth_date.year
+
+      if options[:measurement] == :years || !options[:measurement]
+        return  options[:string] ? "#{years} years" : years
+      end
+
+      months = current.month - birth_date.month
+      months += 12 if months < 0
+
+      if options[:measurement] == :months
+        return options[:string] ? "#{years} years and #{months} months" : (years * 12) + months
+      end
+      return years
     end
 
     module ClassMethods

data/lib/genealogy/version.rb

@@ -1,3 +1,3 @@
 module Genealogy
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 2.3.0
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Organise ActiveRecord models into a genealogical tree structure