genealogy 0.1.1.beta1 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2E0ZWFjOGVkNjE5NmI2NGYwOTFkNTBkOThhMWNkN2NiZGI5MGIyYw==
+  data.tar.gz: !binary |-
+    YTYwYTBlMDFlNTQxOTg4MDhjYTlmOTRmNGNhMGRlOWE2Zjg5NjViMA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MjcxZmY0MmZiNmYwNWE3YWYxYzFhMTA0NjdkYjViYjhkZTMyMTBiOTdlMTgz
+    NDY2YmM2NWExMWE4OTZkN2Q3YmRjN2E4ZjYzYTRhOTBiYmFlYzQwODljNTZl
+    MGIzMzI5YzViNzU4MTEzNDdhNTAzNDQwM2U1NzY4ZTZlMjg1NWE=
+  data.tar.gz: !binary |-
+    MDYwMzcwNWFkNWE0M2Q5MmFmZDgzNjFhY2FiZWJmM2UyZjFjNTlhN2EwYWI3
+    ZjhiNDMyNjcwZDJlZDA4NzFmNzY3NDc5YjU1MThmZjNiM2YyODRjZjA3ZTQx
+    M2RiZjc3NDc5MmU0YjQ2M2Q3MzU4NzJjZjgxNGZmYTA2Y2I2NDg=

data/lib/genealogy.rb

@@ -1,7 +1,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), 'genealogy/constants')
 require File.join(File.expand_path(File.dirname(__FILE__)), 'genealogy/exceptions')
 require File.join(File.expand_path(File.dirname(__FILE__)), 'genealogy/query_methods')
-require File.join(File.expand_path(File.dirname(__FILE__)), 'genealogy/linking_methods')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'genealogy/alter_methods')
 require File.join(File.expand_path(File.dirname(__FILE__)), 'genealogy/spouse_methods')
 require File.join(File.expand_path(File.dirname(__FILE__)), 'genealogy/genealogy')
 

data/lib/genealogy/{linking_methods.rb → alter_methods.rb}

@@ -1,5 +1,5 @@
 module Genealogy
-  module LinkingMethods
+  module AlterMethods
     extend ActiveSupport::Concern
 
     # parents 
@@ -189,4 +189,5 @@ module Genealogy
     end
 
   end
-end
+end
+

data/lib/genealogy/genealogy.rb

@@ -60,7 +60,8 @@ module Genealogy
 
     # Include instance methods and class methods
     include Genealogy::QueryMethods
-    include Genealogy::LinkingMethods
+    include Genealogy::AlterMethods
+    include Genealogy::SpouseMethods if spouse_enabled
 
   end
   

data/lib/genealogy/query_methods.rb

@@ -56,27 +56,35 @@ module Genealogy
 
     def siblings(options = {})
       result = case options[:half]
+      when nil # exluding half siblings
+        father.try(:offspring, :spouse => mother ).to_a
       when :father # common father
-        father.try(:offspring, options).to_a
+        father.try(:offspring, :spouse => options[:spouse]).to_a - mother.try(:offspring).to_a
       when :mother # common mother
-        mother.try(:offspring, options).to_a
-      when nil # exluding half siblings
-        siblings(:half => :father) & siblings(:half => :mother)
+        mother.try(:offspring, :spouse => options[:spouse]).to_a - father.try(:offspring).to_a
       when :only # only half siblings
         siblings(:half => :include) - siblings
       when :include # including half siblings
-        siblings(:half => :father) | siblings(:half => :mother)
+        father.try(:offspring).to_a + mother.try(:offspring).to_a
       else
         raise WrongOptionValueException, "Admitted values for :half options are: :father, :mother, false, true or nil"
       end
-      result - [self]
+      result.uniq - [self]
     end
 
-    def half_siblings(options = {})
+    def half_siblings
       siblings(:half => :only)
       # todo: inprove with option :father and :mother 
     end
 
+    def paternal_half_siblings
+      siblings(:half => :father)
+    end
+
+    def maternal_half_siblings
+      siblings(:half => :mother)
+    end
+
     def ancestors
       result = []
       remaining = parents.to_a.compact

data/lib/genealogy/version.rb

@@ -1,3 +1,3 @@
 module Genealogy
-  VERSION = "0.1.1.beta1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: genealogy
 version: !ruby/object:Gem::Version
-  version: 0.1.1.beta1
-  prerelease: 6
+  version: 0.3.0
 platform: ruby
 authors:
 - masciugo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-22 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
@@ -116,36 +103,35 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/genealogy.rb
+- lib/genealogy/alter_methods.rb
 - lib/genealogy/constants.rb
 - lib/genealogy/exceptions.rb
 - lib/genealogy/genealogy.rb
-- lib/genealogy/linking_methods.rb
 - lib/genealogy/query_methods.rb
 - lib/genealogy/spouse_methods.rb
 - lib/genealogy/version.rb
 homepage: https://github.com//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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Organise ActiveRecord models into a genealogical tree structure
 test_files: []