ruby-fs-stack 0.4.11 → 0.4.12

data/README.rdoc

@@ -5,10 +5,6 @@ API modules provided by FamilySearch.
 
 == Installation
 
-If you haven't added gemcutter.org to your gem sources, run
-
-  gem sources -a http://gemcutter.org
-
 Install the ruby-fs-stack gem
 
   sudo gem install ruby-fs-stack

data/VERSION

@@ -1 +1 @@
-0.4.11
+0.4.12

data/lib/ruby-fs-stack/familytree.rb

@@ -156,8 +156,6 @@ module FamilytreeV2
       
       relationship_type = get_relationship_type(options)
       with_id = options[relationship_type.to_sym]
-            
-      url = "#{Base}person/#{base_id}/#{relationship_type}/#{with_id}"
 
       # Get the existing person/relationship or create a new person
       unless person = relationship(base_id,options.merge({:events => 'none'}))
@@ -176,6 +174,12 @@ module FamilytreeV2
       familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.new
       familytree.persons = [person]
       
+      # Get the most current related ID for the URI
+      rels = person.relationships.get_relationships_of_type(r_options[:type])
+      rel = rels.find{|r|r.id == r_options[:with] || r.requestedId == r_options[:with]}
+      related_id = rel.id
+      url = "#{Base}person/#{base_id}/#{relationship_type}/#{related_id}"
+      
       # Post the response and return the resulting person/relationship record from response
       response = @fs_communicator.post(url,familytree.to_json)
       res_familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(response.body)
@@ -740,8 +744,7 @@ module Org::Familysearch::Ws::Familytree::V2::Schema
     # ** :event - a hash with values {:type => 'Marriage', :date => '15 Nov 2007', :place => 'Utah, United States'}
     # ** :ordinance - a hash with values {:date => '15 Nov 2007', :temple => 'SLAKE', :place => 'Utah, United States', :type => "Sealing_to_Spouse"}
     def add_relationship(options)
-      g_command = get_command(options[:type])
-      relationship = self.send(g_command.to_sym).find{|r|r.id == options[:with] || r.requestedId == options[:with]}
+      relationship = self.get_relationships_of_type(options[:type]).find{|r|r.id == options[:with] || r.requestedId == options[:with]}
       if relationship.nil?
         relationship = Relationship.new
         relationship.id = options[:with]
@@ -761,6 +764,13 @@ module Org::Familysearch::Ws::Familytree::V2::Schema
       self.send(s_command.to_sym,[relationship])
     end
     
+    # ====Params
+    # * type - should be 'child', 'spouse', or 'parent'
+    def get_relationships_of_type(type)
+      g_command = get_command(type)
+      relationships = self.send(g_command.to_sym)
+    end
+    
     # Overriding the Enunciate code because of a bug (parents, spouses, and children were not pluralized)
     # the json hash for this PersonRelationships
     def to_jaxb_json_hash
@@ -805,7 +815,7 @@ module Org::Familysearch::Ws::Familytree::V2::Schema
     
     private
     def get_command(type)
-      (type == 'child') ? 'children' : "#{type}s"
+      (type.to_s == 'child') ? 'children' : "#{type}s"
     end
      
     def set_command(type)

data/ruby-fs-stack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-fs-stack}
-  s.version = "0.4.11"
+  s.version = "0.4.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jimmy Zimmerman"]
-  s.date = %q{2010-04-30}
+  s.date = %q{2010-05-01}
   s.description = %q{A library that enables you to read and update information with the new.familysearch.org API.}
   s.email = %q{jimmy.zimmerman@gmail.com}
   s.extra_rdoc_files = [
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
      "spec/familytree_v2/note_spec.rb",
      "spec/familytree_v2/pedigree_spec.rb",
      "spec/familytree_v2/person_spec.rb",
+     "spec/familytree_v2/relationships_spec.rb",
      "spec/familytree_v2/search_results_spec.rb",
      "spec/fixtures/fakeweb_response.txt",
      "spec/fs_utils_spec.rb",
@@ -85,6 +86,7 @@ Gem::Specification.new do |s|
      "spec/familytree_v2/note_spec.rb",
      "spec/familytree_v2/pedigree_spec.rb",
      "spec/familytree_v2/person_spec.rb",
+     "spec/familytree_v2/relationships_spec.rb",
      "spec/familytree_v2/search_results_spec.rb",
      "spec/fs_utils_spec.rb",
      "spec/identity_v1/identity_spec.rb",

data/spec/familytree_v2/familytree_communicator_spec.rb

@@ -303,7 +303,8 @@ describe FamilytreeV2::Communicator do
                   
         @person = new_person
         @person2 = new_person
-        Org::Familysearch::Ws::Familytree::V2::Schema::Person.stub!(:new).and_return(@person)
+        @generic_person = new_person
+        Org::Familysearch::Ws::Familytree::V2::Schema::Person.stub!(:new).and_return(@generic_person)
         
       end
       
@@ -315,22 +316,22 @@ describe FamilytreeV2::Communicator do
       it "should create a new person with a relationship since it wasn't yet found" do
         Org::Familysearch::Ws::Familytree::V2::Schema::Person.should_receive(:new).and_return(@person)
         @person.should_receive(:id=).with('KWQS-BBQ')
-        @person.should_receive(:create_relationship).with(:type => 'parent', :with => 'KWQS-BBR', :lineage => 'Biological')
         @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
+        @person.relationships.parents.first.id.should == 'KWQS-BBR'
       end
       
       it "should add a marriage event if sent an event key" do
         Org::Familysearch::Ws::Familytree::V2::Schema::Person.should_receive(:new).and_return(@person)
         @person.should_receive(:id=).with('KWQS-BBQ')
-        @person.should_receive(:create_relationship).with(:type => 'spouse', :with => 'KWQS-BBR', :event => {:type => 'Marriage', :place => 'United States', :date => '1800'})
         @ft_v2_com.write_relationship 'KWQS-BBQ', :spouse => 'KWQS-BBR', :event => {:type => 'Marriage', :place => 'United States', :date => '1800'}
+        @person.relationships.spouses.first.id.should == 'KWQS-BBR'
       end
       
       it "should add an ordinances if sent an ordinance key" do
         Org::Familysearch::Ws::Familytree::V2::Schema::Person.should_receive(:new).and_return(@person)
         @person.should_receive(:id=).with('KWQS-BBQ')
-        @person.should_receive(:create_relationship).with(:type => 'spouse', :with => 'KWQS-BBR', :ordinance => {:type => 'Sealing_to_Spouse', :place => 'United States', :date => '1800', :temple => 'SLAKE'})
         @ft_v2_com.write_relationship 'KWQS-BBQ', :spouse => 'KWQS-BBR', :ordinance => {:type => 'Sealing_to_Spouse', :place => 'United States', :date => '1800', :temple => 'SLAKE'}
+        @person.relationships.spouses.first.assertions.ordinances.first.value.type.should == 'Sealing_to_Spouse'
       end
       
       it "should post a familytree request with the person to the correct endpoint" do
@@ -343,6 +344,25 @@ describe FamilytreeV2::Communicator do
         @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
       end
       
+      it "should post to the correct endpoint even if the related person ID changes" do
+        @person2.create_relationship(:type => 'parent', :with => 'KWQS-BBR', :lineage => 'Biological')
+        # Simulate a changed related ID
+        @person2.relationships.parents.first.id = 'KWQS-JIM'
+        @person2.relationships.parents.first.requestedId = 'KWQS-BBR'
+        @person2.id = 'KWQS-BBQ'
+        
+        # inject this mock person into the write_relationship flow
+        Org::Familysearch::Ws::Familytree::V2::Schema::Person.should_receive(:new).and_return(@person2)
+        @person2.should_receive(:create_relationship)
+        
+        familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.new    
+        familytree.persons = [@person2]
+        
+        @fs_com_mock.should_receive(:post).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-JIM', familytree.to_json).and_return(@post_res)
+        @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
+      end
+      
+      
     end
     
     describe "for relationships that already exist" do

data/spec/familytree_v2/relationships_spec.rb

@@ -0,0 +1,73 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'ruby-fs-stack/familytree'
+
+
+describe Org::Familysearch::Ws::Familytree::V2::Schema::PersonRelationships do
+  FamTreeV2 = Org::Familysearch::Ws::Familytree::V2::Schema
+  
+  describe "add_relationship" do
+    before(:each) do
+      @relationships = FamTreeV2::PersonRelationships.new
+    end
+    
+    describe "for spousal relationships" do
+      it "should create the relationship of the right type" do
+        @relationships.add_relationship :type => 'spouse', :with => 'KWQS-BBZ', :event => {:type => 'Marriage',:place =>"Utah, United States", :date => '15 Nov 2007'}
+        @relationships.spouses.first.id.should == 'KWQS-BBZ'
+        @relationships.spouses.first.assertions.events.first.value.type.should == 'Marriage'
+      end
+    end
+    
+    describe "for parent relationships" do
+      it "should create the relationship of the right type" do
+        @relationships.add_relationship :type => 'parent', :with => 'KWQS-BBZ', :lineage => 'Biological'
+        @relationships.parents.first.id.should == 'KWQS-BBZ'
+        @relationships.parents.first.assertions.characteristics.first.value.type.should == 'Lineage'
+      end
+    end
+    
+    describe "for child relationships" do
+      it "should create the relationship of the right type" do
+        @relationships.add_relationship :type => 'child', :with => 'KWQS-BBZ', :lineage => 'Biological'
+        @relationships.children.first.id.should == 'KWQS-BBZ'
+        @relationships.children.first.assertions.characteristics.first.value.type.should == 'Lineage'
+      end
+    end
+    
+  end
+  
+  describe "get_relationships_of_type" do
+    before(:each) do
+      @relationships = FamTreeV2::PersonRelationships.new
+    end
+    
+    describe "for spousal relationships" do
+      it "should return the relationship of the right type" do
+        @relationships.add_relationship :type => 'spouse', :with => 'KWQS-BBZ', :event => {:type => 'Marriage',:place =>"Utah, United States", :date => '15 Nov 2007'}
+        spouses = @relationships.spouses
+        @relationships.get_relationships_of_type('spouse').should == spouses
+        @relationships.get_relationships_of_type(:spouse).should == spouses
+      end
+    end
+    
+    describe "for parent relationships" do
+      it "should return the relationship of the right type" do
+        @relationships.add_relationship :type => 'parent', :with => 'KWQS-BBZ', :lineage => 'Biological'
+        parents = @relationships.parents
+        @relationships.get_relationships_of_type('parent').should == parents
+        @relationships.get_relationships_of_type(:parent).should == parents
+      end
+    end
+    
+    describe "for child relationships" do
+      it "should return the relationship of the right type" do
+        @relationships.add_relationship :type => 'child', :with => 'KWQS-BBZ', :lineage => 'Biological'
+        children = @relationships.children
+        @relationships.get_relationships_of_type('child').should == children
+        @relationships.get_relationships_of_type(:child).should == children
+      end
+    end
+    
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 11
-  version: 0.4.11
+  - 12
+  version: 0.4.12
 platform: ruby
 authors: 
 - Jimmy Zimmerman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 -06:00
+date: 2010-05-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - spec/familytree_v2/note_spec.rb
 - spec/familytree_v2/pedigree_spec.rb
 - spec/familytree_v2/person_spec.rb
+- spec/familytree_v2/relationships_spec.rb
 - spec/familytree_v2/search_results_spec.rb
 - spec/fixtures/fakeweb_response.txt
 - spec/fs_utils_spec.rb
@@ -142,6 +143,7 @@ test_files:
 - spec/familytree_v2/note_spec.rb
 - spec/familytree_v2/pedigree_spec.rb
 - spec/familytree_v2/person_spec.rb
+- spec/familytree_v2/relationships_spec.rb
 - spec/familytree_v2/search_results_spec.rb
 - spec/fs_utils_spec.rb
 - spec/identity_v1/identity_spec.rb