genealogy 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f135505bdbf0d836cdac669c1ee684c8959cedce
-  data.tar.gz: d90f6befee994c37e2a900d7c85e37e0c7f3229c
+  metadata.gz: f8bcecb22a6962bc6220672801e068737865d783
+  data.tar.gz: 015a4ab711a4010f541370fcd90c57bd491210a5
 SHA512:
-  metadata.gz: f1efa40c2b50b47caad8d4608157195d0a0d68f1659c08c1eb44d31381d61ec8bb738c61ada1369de74baad8f4c693aa3f0d54dd624c354897b7349eb2d0f081
-  data.tar.gz: 443d273ad5240f9a5ecad5c902f8535a421f7c3f46e5d37b5a8c363c42713c582ca498dc582748f13fd89cb64c26ee7fd616d3de332d5f0c790528706ee95554
+  metadata.gz: f32db53259941b8f7583249892d27edf49144e741b03765f21d0b2effd521098d94b4377cad02433e39e2de6643dedbefb048f36c30e9ed4302b7cc6202d2721
+  data.tar.gz: 6b4727c0a01fa9d61a63901bc40cbcf55b2134150636dc8570b16f83b9cf9eae5bda53e643442c5c934c81ecb603c2f91b8b9ee46dbdab1fe8c22b50ccecb4f0

data/lib/genealogy/genealogy.rb

@@ -21,7 +21,13 @@ module Genealogy
     # @return [void] 
     def has_parents options = {}
 
-      check_options(options)
+      include Genealogy::UtilMethods
+      include Genealogy::QueryMethods
+      include Genealogy::IneligibleMethods
+      include Genealogy::AlterMethods
+      include Genealogy::CurrentSpouseMethods
+
+      check_has_parents_options(options)
 
       # keep track of the original extend class to prevent wrong scopes in query method in case of STI
       class_attribute :gclass, instance_writer: false
@@ -85,33 +91,6 @@ module Genealogy
       has_many :children_as_father, class_name: self, foreign_key: self.father_id_column, dependent: :nullify
       has_many :children_as_mother, class_name: self, foreign_key: self.mother_id_column, dependent: :nullify
 
-      include Genealogy::UtilMethods
-      include Genealogy::QueryMethods
-      include Genealogy::IneligibleMethods
-      include Genealogy::AlterMethods
-      include Genealogy::CurrentSpouseMethods
-
-    end
-
-    private
-
-    def check_options(options)
-
-      raise ArgumentError, "Hash expected, #{options.class} given." unless options.is_a? Hash
-
-      # column names
-      options[:column_names] ||= {}
-      raise ArgumentError, "Hash expected for :column_names option, #{options[:column_names].class} given." unless options[:column_names].is_a? Hash
-
-      # sex
-      if array = options[:sex_values]
-        raise ArgumentError, ":sex_values option must be an array of length 2: [:male_value, :female_value]" unless array.is_a?(Array) and array.size == 2
-      end
-
-      # booleans
-      options.slice(:perform_validation, :current_spouse).each do |k,v|
-        raise ArgumentError, "Boolean expected for #{k} option, #{v.class} given." unless !!v == v
-      end
     end
 
   end

data/lib/genealogy/ineligible_methods.rb

@@ -87,8 +87,8 @@ module Genealogy
       ineligibles = []
       if gclass.ineligibility_level >= PEDIGREE
         ineligibles |= ancestors | descendants | siblings | [self]
-        ineligibles |= (father ? gclass.all_with(:father).where.not(father_id: father) : [])
-        ineligibles |= (mother ? gclass.all_with(:mother).where.not(mother_id: mother) : [])
+        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 a parent is present ineligible siblings are parent's ineligible children, otherwise try to estimate parent birth range.

data/lib/genealogy/query_methods.rb

@@ -28,12 +28,12 @@ module Genealogy
 
     # @return [2-elements Array] paternal_grandfather and paternal_grandmother 
     def paternal_grandparents
-      father && father.parents
+      (father && father.parents) || [nil,nil]
     end
 
     # @return [2-elements Array] maternal_grandfather and maternal_grandmother
     def maternal_grandparents
-      mother && mother.parents
+      (mother && mother.parents) || [nil,nil]
     end
 
     # @return [4-elements Array] paternal_grandfather, paternal_grandmother, maternal_grandfather, maternal_grandmother
@@ -51,10 +51,10 @@ 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
-      result = gclass.where(SEX2PARENT[ssex] => self)
+      result = gclass.where("#{SEX2PARENT[ssex]}_id" => self)
       if options.keys.include? :spouse
         check_indiv(spouse = options[:spouse],opposite_ssex)
-        result = result.where(SEX2PARENT[opposite_ssex] => spouse ) if spouse
+        result = result.where("#{SEX2PARENT[opposite_ssex]}_id" => spouse ) if spouse
       end
       result
     end
@@ -73,8 +73,7 @@ module Genealogy
     # @return [ActiveRecord::Relation] list of fullsiblings and/or halfsiblings
     def siblings(options = {})
       spouse = options[:spouse]
-
-      result = gclass.where.not(id: id)
+      result = gclass.where("id != ?",id)
       case options[:half]
       when nil # only full siblings
         result.all_with(:parents).where(father_id: father, mother_id: mother)
@@ -84,7 +83,7 @@ module Genealogy
           check_indiv(spouse, :female)
           result.where(mother_id: spouse)
         elsif mother
-          result.where("#{gclass.mother_id_column} != ? or #{gclass.mother_id_column} is ?", mother_id, nil)
+          result.where("mother_id != ? or mother_id is ?", mother_id, nil)
         else
           result
         end
@@ -94,7 +93,7 @@ module Genealogy
           check_indiv(spouse, :male)
           result.where(father_id: spouse)
         elsif father
-          result.where("#{gclass.father_id_column} != ? or #{gclass.father_id_column} is ?", father_id, nil)
+          result.where("father_id != ? or father_id is ?", father_id, nil)
         else
           result
         end
@@ -102,7 +101,7 @@ module Genealogy
         ids = siblings(half: :father).pluck(:id) | siblings(half: :mother).pluck(:id)
         result.where(id: ids)
       when :include # including half siblings
-        result.where("#{gclass.father_id_column} == ? or #{gclass.mother_id_column} == ?", father_id, mother_id)
+        result.where("father_id == ? or mother_id == ?", father_id, mother_id)
       else
         raise ArgumentError, "Admitted values for :half options are: :father, :mother, false, true or nil"
       end
@@ -300,11 +299,11 @@ module Genealogy
       def all_with(role)
         case role
         when :father
-          where.not(father_id: nil)
+          where('father_id is not ?',nil)
         when :mother
-          where.not(mother_id: nil)
+          where('mother_id is not ?',nil)
         when :parents
-          where.not(mother_id: nil,father_id: nil)
+          where('father_id is not ? and mother_id is not ?',nil,nil)
         end
       end
 

data/lib/genealogy/util_methods.rb

@@ -172,9 +172,32 @@ module Genealogy
     end
 
     def check_indiv(arg, arg_sex=nil)
-      raise ArgumentError, "Expected #{self.gclass} object. Got #{arg.class}" unless arg.class.equal? self.gclass
+      raise ArgumentError, "Expected #{self.gclass} object. Got #{arg.class}" unless arg.is_a? self.gclass
       raise SexError, "Expected a #{arg_sex} as argument. Got a #{arg.ssex}" if arg_sex and arg.ssex != arg_sex
     end
 
+    module ClassMethods
+
+      def check_has_parents_options(options)
+
+        raise ArgumentError, "Hash expected, #{options.class} given." unless options.is_a? Hash
+
+        # column names
+        options[:column_names] ||= {}
+        raise ArgumentError, "Hash expected for :column_names option, #{options[:column_names].class} given." unless options[:column_names].is_a? Hash
+
+        # sex
+        if array = options[:sex_values]
+          raise ArgumentError, ":sex_values option must be an array of length 2: [:male_value, :female_value]" unless array.is_a?(Array) and array.size == 2
+        end
+
+        # booleans
+        options.slice(:perform_validation, :current_spouse).each do |k,v|
+          raise ArgumentError, "Boolean expected for #{k} option, #{v.class} given." unless !!v == v
+        end
+      end
+
+    end
+
   end
 end

data/lib/genealogy/version.rb

@@ -1,3 +1,3 @@
 module Genealogy
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Make ActiveRecord model act as a pedigree