genealogy 1.3.0 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjI4ZDczNzRkODlkNzBhM2JmYTMwMjEzZmU4ODQ4NTA1MTRhMDRjOQ==
+    YWNhZWM3Y2ZkOTg2ZTYwNzNjOTAyODQ5ODk3NTA1ZTk3NWU4Y2JlMA==
   data.tar.gz: !binary |-
-    MmQyMGQ1NGE3NGI4M2I1OGQyYTM1ZGUyN2E1OGMxYWZlZWMyMTQ5Mw==
+    YTljMTlmNDMzN2ZlNWFhNThmN2MzMmRiZWRlZGNmMGNlNGNiZWQ5YQ==
 SHA512:
   metadata.gz: !binary |-
-    MGY5NWYwZGJkMDQ1YmM4YzU2ZTc0YmYyN2RmMTQ1ZGZmYmUwMDNiMDEzOGQ3
-    YjQ4YmU1YjU0MzdiMTliMTE5NjA5ODQ0MWZhYjY4ODA1ZGU3MjIzYTg3MjBk
-    NDc3NGIzNDkyMTZhNThiNTY5NWI4ZDhmM2E3NmFiZGU5ZjE2NGU=
+    NjRmZjYwMjI2MTAxMzY4ODc3YjY2ZWZiZjRlNWYxMTdiMDJhMGVlNzlkYjY1
+    Y2I2YjE3NjU3OGEwMGI2YzU5ODBlZmYxNGI1Mjc4YjQxZjU5NjIzZjAwNjRl
+    YmM0NjlhZmQ3NzM0Y2E3MTNjZmI0Mzk4MWNlNWMyMGRmYmNlMTc=
   data.tar.gz: !binary |-
-    MmFhOWI1OTk5YjU3NWRhNGNiNjIwMGFmNDVkMzFkYzM0YzkxOGFkOWU3YTg5
-    MjQ0MzQ4NzhjZWU2MWRkNmI3ZDAyYWVmOTQ2YTEzMWEzMzVkNWNiZmE1MmRh
-    NWI2YWMxNDI2YjRiZGNmOWQ1OTBkNzYzN2UwN2Q1YTg0YzYzNDY=
+    NGEyMzdmM2U0ODIzNzJlMzYyM2I1NjY4YjdhZGIxMjM4MjNhZjU4YjEwZTM3
+    YzRmZjM1MTFkZWI2YWQyZjM5NDBlZDdhNGI5MzU4ZWFkZDI2ZTU4MzJkNDEw
+    YzZlMzUwNTU5OGU2YzlmMjgyMGNlNTI1OWZhY2M1MjhlNTAyYjk=

data/lib/genealogy/query_methods.rb

@@ -56,6 +56,10 @@ module Genealogy
       result
     end
 
+    def great_grandparents
+      parents.compact.inject([]){|memo, parent| memo |= parent.grandparents}
+    end
+
     # offspring
     def offspring(options = {})
       if spouse = options[:spouse]
@@ -167,12 +171,75 @@ module Genealogy
       offspring.inject([]){|memo,child| memo |= child.offspring}
     end
 
-    def uncles_and_aunts
-      parents.compact.inject([]){|memo,parent| memo |= parent.siblings}
+    def great_grandchildren
+      grandchildren.compact.inject([]){|memo,grandchild| memo |= grandchild.offspring}
+    end
+
+    def uncles_and_aunts(options={})
+      relation = case options[:lineage]
+      when :paternal
+        [father]
+      when :maternal
+        [mother]
+      else
+        parents
+      end
+
+      case options[:sex]
+      when :male
+        relation.compact.inject([]){|memo,parent| memo |= parent.siblings(half: options[:half]).select(&:is_male?)}
+      when :female
+        relation.compact.inject([]){|memo,parent| memo |= parent.siblings(half: options[:half]).select(&:is_female?)}
+      else
+        relation.compact.inject([]){|memo,parent| memo |= parent.siblings(half: options[:half])}
+      end
+    end
+
+    def uncles(options = {})
+      uncles_and_aunts(sex: :male, lineage: options[:lineage], half: options[:half])
+    end
+
+    def aunts(options={})
+      uncles_and_aunts(sex: :female, lineage: options[:lineage], half: options[:half])
+    end
+
+    def paternal_uncles(options = {})
+      uncles(sex: :male, lineage: :paternal, half: options[:half])
+    end
+
+    def maternal_uncles(options = {})
+      uncles(sex: :male, lineage: :maternal, half: options[:half])
+    end
+
+    def paternal_aunts(options = {})
+      aunts(lineage: :paternal, half: options[:half])
+    end
+
+    def maternal_aunts(options = {})
+      aunts(sex: :female, lineage: :maternal, half: options[:half])
+    end
+
+    def cousins(options = {}, uncle_aunt_options = {})
+      uncles_and_aunts(uncle_aunt_options).compact.inject([]){|memo,parent_sibling| memo |= parent_sibling.offspring}
+    end
+
+    def nieces_and_nephews(options = {}, sibling_options = {})
+      case options[:sex]
+      when :male
+        siblings(sibling_options).inject([]){|memo,sib| memo |= sib.offspring}.select(&:is_male?)
+      when :female
+        siblings(sibling_options).inject([]){|memo,sib| memo |= sib.offspring}.select(&:is_female?)
+      else
+        siblings(sibling_options).inject([]){|memo,sib| memo |= sib.offspring}
+      end
+    end
+
+    def nephews(options = {}, sibling_options = {})
+      nieces_and_nephews(options.merge({sex: :male}), sibling_options)
     end
 
-    def nieces_and_nephews
-      siblings.inject([]){|memo,sib| memo |= sib.offspring}
+    def nieces(options = {}, sibling_options = {})
+      nieces_and_nephews(options.merge({sex: :female}), sibling_options)
     end
 
     def family(options = {}) 

data/lib/genealogy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-25 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.1.10
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Organise ActiveRecord models into a genealogical tree structure