genealogy 1.2.1 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDA5NTljZWI2Zjk0MjY1Yzk3YTBhZjc4OWIwZGNkM2FiYmJmMDkxOA==
+    NjI4ZDczNzRkODlkNzBhM2JmYTMwMjEzZmU4ODQ4NTA1MTRhMDRjOQ==
   data.tar.gz: !binary |-
-    OWI1OTIzYzMwODUxNjRhYWZiMWY5MTEyYzI5NDAzMzQzNDNiNTQ0Mw==
+    MmQyMGQ1NGE3NGI4M2I1OGQyYTM1ZGUyN2E1OGMxYWZlZWMyMTQ5Mw==
 SHA512:
   metadata.gz: !binary |-
-    YTY2YmY2OTIxZGNhNDRkOTUxOGM4MDc3N2I4NDJiNTk1MDJhYTZmZDc0M2Uz
-    Nzg0OGQ3NTQ5MzdhMjMyMGIwMWNjOWIzYzJiMjMwMjk1OWUzMTBhYzI0NTRk
-    OGQ3NTA0MjM1ZjZkMWFhOWI2MzNhZTFkNDk1ZDg5ZmE3Njc0NmY=
+    MGY5NWYwZGJkMDQ1YmM4YzU2ZTc0YmYyN2RmMTQ1ZGZmYmUwMDNiMDEzOGQ3
+    YjQ4YmU1YjU0MzdiMTliMTE5NjA5ODQ0MWZhYjY4ODA1ZGU3MjIzYTg3MjBk
+    NDc3NGIzNDkyMTZhNThiNTY5NWI4ZDhmM2E3NmFiZGU5ZjE2NGU=
   data.tar.gz: !binary |-
-    NDc4OTM3NjVhYTdkYzBkODYwYWRjNDRmZmY2NTIyNzQ5MTNhMjI3YTA1Mjgz
-    ODgxOGYwZDFkM2RlMDBjM2E1ZGQ3NTMxMjA0YmQ5ZTc1YjlhNTIzOGQ2MjY1
-    MGVjOTE4NWQ2ZDVjN2RlYjMzZTliODZlMDlmZjFiNjU1M2RlNDg=
+    MmFhOWI1OTk5YjU3NWRhNGNiNjIwMGFmNDVkMzFkYzM0YzkxOGFkOWU3YTg5
+    MjQ0MzQ4NzhjZWU2MWRkNmI3ZDAyYWVmOTQ2YTEzMWEzMzVkNWNiZmE1MmRh
+    NWI2YWMxNDI2YjRiZGNmOWQ1OTBkNzYzN2UwN2Q1YTg0YzYzNDY=

data/lib/genealogy/alter_methods.rb

@@ -9,7 +9,7 @@ module Genealogy
       define_method "add_#{parent}" do |relative|
         unless relative.nil?
           raise IncompatibleObjectException, "Both linked objects must be instances of class with genealogy enabled. Got classes #{relative.class} and #{self.genealogy_class}" unless relative.class.respond_to?(:genealogy_enabled)
-          incompatible_parents = self.offspring | self.siblings.to_a | [self] 
+          incompatible_parents = self.offspring | self.siblings | [self] 
           raise IncompatibleRelationshipException, "#{relative} can't be #{parent} of #{self}" if incompatible_parents.include? relative
           raise WrongSexException, "Can't add a #{relative.sex} #{parent}" unless (parent == :father and relative.is_male?) or (parent == :mother and relative.is_female?)
         end
@@ -208,6 +208,8 @@ module Genealogy
           when sex_female_value
             child.add_father(options[:spouse]) if options[:spouse]
             child.add_mother(self)
+          else 
+            raise WrongSexException, "Sex value not valid for #{self}"
           end
         end
       end
@@ -238,6 +240,8 @@ module Genealogy
               child.remove_father
             when sex_female_value
               child.remove_mother
+            else 
+              raise WrongSexException, "Sex value not valid for #{self}"
             end  
           end
         end

data/lib/genealogy/genealogy.rb

@@ -22,7 +22,7 @@ module Genealogy
     admitted_keys = [:sex_column, :sex_values, :father_column, :mother_column, :current_spouse_column, :current_spouse, :perform_validation]
     check_options(options, admitted_keys) do |key, value|
       if key == :sex_values
-        raise WrongOptionException, ":sex_values option must be an array with two char: first for male sex symbol an last for female" unless value.is_a?(Array) and value.size == 2 and value.first.to_s.size == 1 and value.last.to_s.size == 1
+        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
     
@@ -38,12 +38,12 @@ module Genealogy
     ## sex
     # class attributes
     class_attribute :sex_column, :sex_values, :sex_male_value, :sex_female_value
-    self.sex_column = options[:sex_column] || :sex
-    self.sex_values = (options[:sex_values] and options[:sex_values].to_a.map(&:to_s)) || ['M','F']
+    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
     # instance attribute
-    alias_attribute :sex, sex_column if self.sex_column != :sex
+    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}]/ 

data/lib/genealogy/query_methods.rb

@@ -61,7 +61,7 @@ module Genealogy
       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 
       end
-      case sex
+      result = case sex
       when sex_male_value
         if options.keys.include?(:spouse)
           children_as_father.with(spouse.try(:id))
@@ -74,32 +74,13 @@ module Genealogy
         else
           children_as_mother
         end
+      else
+        raise WrongSexException, "Sex value not valid for #{self}"
       end
+      result.to_a
     end
     alias_method :children, :offspring
 
-    # # 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 
-    #   end
-    #   case sex
-    #   when sex_male_value
-    #     if options.keys.include?(:spouse)
-    #       self.genealogy_class.where(father_id: id, mother_id: spouse.try(:id))
-    #     else
-    #       self.genealogy_class.where(father_id: id)
-    #     end
-    #   when sex_female_value
-    #     if options.keys.include?(:spouse)
-    #       self.genealogy_class.where(mother_id: id, father_id: spouse.try(:id))
-    #     else
-    #       self.genealogy_class.where(mother_id: id)
-    #     end
-    #   end
-    # end
-    # alias_method :children, :offspring
-
     def eligible_offspring
       self.genealogy_class.all - ancestors - offspring - siblings - [self]
     end
@@ -162,10 +143,10 @@ module Genealogy
     # ancestors
     def ancestors
       result = []
-      remaining = parents.to_a.compact
+      remaining = parents.compact
       until remaining.empty?
         result << remaining.shift
-        remaining += result.last.parents.to_a.compact
+        remaining += result.last.parents.compact
       end
       result.uniq
     end
@@ -252,15 +233,17 @@ module Genealogy
       when sex_female_value
         'female'
       else 
-        raise "undefined sex for #{self}"
+        raise WrongSexException, "Sex value not valid for #{self}"
       end
     end
 
     def is_female?
+      return female? if respond_to?(:female?)
       sex == sex_female_value
     end
 
     def is_male?
+      return male? if respond_to?(:male?)
       sex == sex_male_value  
     end
 

data/lib/genealogy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.99.0
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -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