genealogy 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDUxMWM3YjI0ZjM3MjU0Y2NhMGQ4Zjc3OTBiNjNiOGEwY2M5YzQ0NQ==
+  data.tar.gz: !binary |-
+    ZDEyYjgxMDE5OWQ5ODQ5ODEyZjg5YWRlMDMwYTkxZmQzMjE4NjIxMw==
+SHA512:
+  metadata.gz: !binary |-
+    OWQ3YzhmZmUxM2RkYjYwZGFjNmNjYWJkMWEwNTBhNjBjNTdjMmFhMDhjNjQ4
+    ZTA3ZGZiMjhjZWQ3Mzk1YzE0YzIwNWZkMGI3ZTcxYTZiNjMyYzU0Y2RjNDc1
+    YTI2MGYxYjMzNzBkMGE2MzQ0ZGZlZDcyYmMxMjZmZjU5YTQyMmI=
+  data.tar.gz: !binary |-
+    MTFmYzc4NTRiMjVkNzkwZjNlNmEyMGMzOTY5Nzk3ZjYyYmMyMWU1MjUyZDU1
+    YmIyYzZmMTkxOTc1Mjk0YzQyMWE5YzlhMjc4OWMzYjM0MmFmYjczNjc5YTA4
+    NjBhMjI4ZjgwYzY1NThkMDVjZGJhNmRlZjlkMGFhOGYyMmU4NDM=

data/lib/genealogy/alter_methods.rb

@@ -13,14 +13,22 @@ module Genealogy
           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
-        self.send("#{parent}=",relative)
-        save!
+        if perform_validation
+          self.send("#{parent}=",relative)
+          save!
+        else
+          self.update_attribute(parent,relative)
+        end
       end
       
       # remove method
       define_method "remove_#{parent}" do
-        self.send("#{parent}=",nil)
-        save!
+        if perform_validation
+          self.send("#{parent}=",nil)
+          save!
+        else
+          self.update_attribute(parent,nil)
+        end
       end
 
     end

data/lib/genealogy/genealogy.rb

@@ -19,17 +19,18 @@ module Genealogy
 
   def has_parents options = {}
 
-    admitted_keys = [:sex_column, :sex_values, :father_column, :mother_column, :current_spouse_column, :current_spouse]
+    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
       end
     end
     
-    class_attribute :genealogy_enabled, :current_spouse_enabled, :genealogy_class
+    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
-    self.genealogy_class = self #keep track of the original extend class to prevent wrong scopes in query method in case of STI
+    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

data/lib/genealogy/spouse_methods.rb

@@ -6,22 +6,38 @@ module Genealogy
     def add_current_spouse(obj)
       raise IncompatibleObjectException, "Linked objects must be instances of the same class" unless obj.is_a? self.genealogy_class
       raise WrongSexException, "Can't add current_spouse with same sex" if self.sex == obj.sex
-      self.current_spouse = obj
-      obj.current_spouse = self
-      transaction do
-        obj.save!
-        save!
+
+      if perform_validation
+        self.current_spouse = obj
+        obj.current_spouse = self
+        transaction do
+          obj.save!
+          save!
+        end
+      else
+        transaction do
+          self.update_attribute(:current_spouse,obj)
+          obj.update_attribute(:current_spouse,self)
+        end
       end
+
     end
 
     # remove method
     def remove_current_spouse
-      transaction do
+      if perform_validation
         ex_current_spouse = current_spouse
         current_spouse.current_spouse = nil
         self.current_spouse = nil
-        ex_current_spouse.save!
-        save!
+        transaction do
+          ex_current_spouse.save!
+          save!
+        end
+      else
+        transaction do
+          current_spouse.update_attribute(:current_spouse,nil)
+          self.update_attribute(:current_spouse,nil)
+        end
       end
     end
 

data/lib/genealogy/version.rb

@@ -1,3 +1,3 @@
 module Genealogy
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,26 +127,25 @@ files:
 homepage: https://github.com/masciugo/genealogy
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.23
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Organise ActiveRecord models into a genealogical tree structure
 test_files: []