ruby-fs-stack 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

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

@@ -28,7 +28,7 @@ module FamilytreeV2
     end
     
     # ===params
-    # <tt>id</tt> should be a string of the persons identifier. For the 'me' person, use :me or 'me'
+    # <tt>id_or_ids</tt> should be a string of the persons identifier. For the 'me' person, use :me or 'me'. Can also accept an array of ID strings.
     # <tt>options</tt> accepts a hash of parameters as documented by the API.
     # For full parameter documentation, see DevNet[https://devnet.familysearch.org/docs/api-manual-reference-system/familytree-v2/r_api_family_tree_person_read_v2.html]
     #
@@ -39,19 +39,29 @@ module FamilytreeV2
     #   
     #   p.version # => '90194378772'
     #   p.id # => 'KW3B-NNM'
-    def person(id, options = {})
-      id = id.to_s
-      if id == 'me'
-        url = Base + 'person'
+    def person(id_or_ids, options = {})
+      if id_or_ids.kind_of? Array
+        multiple_ids = true
+        url = Base + 'person/' + id_or_ids.join(',')
       else
-        url = Base + 'person/' + id
+        multiple_ids = false
+        id = id_or_ids.to_s
+        if id == 'me'
+          url = Base + 'person'
+        else
+          url = Base + 'person/' + id
+        end
       end
       url += "?"+FsUtils.querystring_from_hash(options) unless options.empty?
       response = @fs_communicator.get(url)
       familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(response.body)
-      person = familytree.persons.find{|p| p.requestedId == id }
-      person ||= familytree.persons.first if id == 'me'
-      person
+      if multiple_ids
+        return familytree.persons
+      else
+        person = familytree.persons.find{|p| p.requestedId == id }
+        person ||= familytree.persons.first if id == 'me'
+        return person
+      end
     end
     
     def save_person(person)
@@ -189,6 +199,22 @@ module FamilytreeV2
       end
     end
     
+    # Combines person into a new person
+    #  
+    # ====Params
+    # * <tt>person_array</tt> - an array of person IDs.
+    def combine(person_array)
+      url = Base + 'person'
+      version_persons = self.person person_array, :genders => 'none', :events => 'none', :names => 'none'
+      combine_person = Org::Familysearch::Ws::Familytree::V2::Schema::Person.new
+      combine_person.create_combine(version_persons)
+      familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.new
+      familytree.persons = [combine_person]
+      res = @fs_communicator.post(url,familytree.to_json)
+      familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(res.body)
+      return familytree.persons[0]
+    end
+    
     private
     #options will either have a :parent, :child, or :spouse key. We need to find which one
     def get_relationship_type(options)
@@ -785,6 +811,20 @@ module Org::Familysearch::Ws::Familytree::V2::Schema
       add_relationships!
       self.relationships.add_relationship(options)
     end
+    
+    # This method should only be called from FamilytreeV2::Communicator#combine
+    # 
+    # ====Params
+    # * <tt>persons</tt> - an array of person objects. All persons must have an id and version
+    def create_combine(persons)
+      self.personas = Org::Familysearch::Ws::Familytree::V2::Schema::PersonPersonas.new
+      self.personas.personas = persons.map do |person|
+        persona = Org::Familysearch::Ws::Familytree::V2::Schema::PersonPersona.new
+        persona.id = person.id
+        persona.version = person.version
+        persona
+      end
+    end
   
     private
     

data/ruby-fs-stack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-fs-stack}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jimmy Zimmerman"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2009-12-14}
   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 = [
@@ -39,9 +39,12 @@ Gem::Specification.new do |s|
      "ruby-fs-stack.gemspec",
      "spec/communicator_spec.rb",
      "spec/familytree_v2/familytree_communicator_spec.rb",
+     "spec/familytree_v2/json/combine_request.js",
+     "spec/familytree_v2/json/combine_response.js",
      "spec/familytree_v2/json/match_KW3B-NNM.js",
      "spec/familytree_v2/json/person/KJ86-3VD_all.js",
      "spec/familytree_v2/json/person/KJ86-3VD_version.js",
+     "spec/familytree_v2/json/person/multiple_version_read.js",
      "spec/familytree_v2/json/person/post_response.js",
      "spec/familytree_v2/json/person/relationship_not_found.js",
      "spec/familytree_v2/json/person/relationship_read.js",

data/spec/familytree_v2/familytree_communicator_spec.rb

@@ -1,11 +1,23 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe FamilytreeV2::Communicator do
+  FamilyTreeV2 = Org::Familysearch::Ws::Familytree::V2::Schema
+  
   def read_file(filename)
     fname = File.join(File.dirname(__FILE__),'json','person',filename)
     File.read(fname)
   end
   
+  def new_person
+    Org::Familysearch::Ws::Familytree::V2::Schema::Person.new
+  end
+  
+  def existing_person
+    person_json  = read_file('KJ86-3VD_version.js')
+    ft = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(person_json)
+    ft.persons.first
+  end
+  
   describe "fs_familytree_v1 call on the FsCommunicator" do
     before(:each) do
       @com = FsCommunicator.new
@@ -64,24 +76,31 @@ describe FamilytreeV2::Communicator do
     
   end
   
-  describe "save_person" do
+  describe "person read w/ multiple IDs" do
     before(:each) do
       @fs_com_mock = mock("FsCommunicator")
       @res = mock("HTTP::Response")
-      @json = read_file('post_response.js')
+      @json = read_file('multiple_version_read.js')
       @res.stub!(:body).and_return(@json)
-      @fs_com_mock.stub!(:post).and_return(@res)
+      @fs_com_mock.stub!(:get).and_return(@res)
       @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
     end
     
-    def new_person
-      Org::Familysearch::Ws::Familytree::V2::Schema::Person.new
+    it "should accept an array of person IDs" do
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCY,KW3B-VCB,KW3B-VC1?names=none').and_return(@res)
+      results = @ft_v2_com.person ["KW3B-VCY", "KW3B-VCB", "KW3B-VC1"], :names => 'none'
+      results.should be_a_kind_of(Array)
     end
-    
-    def existing_person
-      person_json  = read_file('KJ86-3VD_version.js')
-      ft = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(person_json)
-      ft.persons.first
+  end
+  
+  describe "save_person" do
+    before(:each) do
+      @fs_com_mock = mock("FsCommunicator")
+      @res = mock("HTTP::Response")
+      @json = read_file('post_response.js')
+      @res.stub!(:body).and_return(@json)
+      @fs_com_mock.stub!(:post).and_return(@res)
+      @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
     end
     
     describe "saving new persons" do
@@ -122,229 +141,279 @@ describe FamilytreeV2::Communicator do
       end
       
     end
+  end
+  
+  describe "search" do
+    
+    before(:each) do
+      @fs_com_mock = mock("FsCommunicator")
+      @res = mock("HTTP::Response")
+      @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
+      
+      @json = read_file('../search.js') 
+      @res.stub!(:body).and_return(@json)
+      @res.stub!(:code).and_return('200')
+      @fs_com_mock.stub!(:get).and_return(@res)
+    end
+    
+    it "should call the search endpoint" do
+      @fs_com_mock.should_receive(:get).with("/familytree/v2/search?name=John")
+      @ft_v2_com.search :name => "John"
+    end
+    
+    it "should return the SearchResult element" do
+      search_results = @ft_v2_com.search :name => "John"
+      search_results.class.should == Org::Familysearch::Ws::Familytree::V2::Schema::SearchResults
+      search_results.partial.should == 246
+      search_results.close.should == 100
+      search_results.count.should == 40
+    end
+    
+    it "should serialize embedded parent parameters" do
+      @fs_com_mock.should_receive(:get).with("/familytree/v2/search?father.name=John")
+      @ft_v2_com.search :father => {:name => "John"}
+    end
+    
+  end
+  
+  describe "match" do
     
-    describe "search" do
+    before(:each) do
+      @fs_com_mock = mock("FsCommunicator")
+      @res = mock("HTTP::Response")
+      @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
       
+      @json = read_file('../match_KW3B-NNM.js') 
+      @res.stub!(:body).and_return(@json)
+      @res.stub!(:code).and_return('200')
+      @fs_com_mock.stub!(:get).and_return(@res)
+    end
+    
+    it "should call the match endpoint" do
+      @fs_com_mock.should_receive(:get).with("/familytree/v2/match?name=John")
+      @ft_v2_com.match :name => "John"
+    end
+    
+    it "should return the MatchResults element" do
+      search_results = @ft_v2_com.match :name => "John"
+      search_results.class.should == Org::Familysearch::Ws::Familytree::V2::Schema::MatchResults
+      search_results.count.should == 4
+    end
+    
+    it "should serialize embedded parent parameters" do
+      @fs_com_mock.should_receive(:get).with("/familytree/v2/match?father.name=John")
+      @ft_v2_com.match :father => {:name => "John"}
+    end
+    
+    it "should accept an id as the first parameter" do
+      @fs_com_mock.should_receive(:get).with("/familytree/v2/match/KWQS-BBQ")
+      @ft_v2_com.match 'KWQS-BBQ'
+    end
+    
+    it "should accept an id AND hash if passed" do
+      @fs_com_mock.should_receive(:get).with("/familytree/v2/match/KWQS-BBQ?maxResults=5")
+      @ft_v2_com.match 'KWQS-BBQ', :maxResults => 5
+    end
+    
+  end
+  
+  describe "reading relationships" do
+    before(:each) do
+      @fs_com_mock = mock("FsCommunicator")
+      @res = mock("HTTP::Response")
+      @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
+    end
+    
+    
+    describe "for relationships that already exist" do
       before(:each) do
-        @fs_com_mock = mock("FsCommunicator")
-        @res = mock("HTTP::Response")
-        @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
+        @json = read_file('relationship_read.js') 
         
-        @json = read_file('../search.js') 
         @res.stub!(:body).and_return(@json)
         @res.stub!(:code).and_return('200')
-        @fs_com_mock.stub!(:get).and_return(@res)
-      end
-      
-      it "should call the search endpoint" do
-        @fs_com_mock.should_receive(:get).with("/familytree/v2/search?name=John")
-        @ft_v2_com.search :name => "John"
+        @fs_com_mock.stub!(:get).and_return(@res)              
+        
       end
       
-      it "should return the SearchResult element" do
-        search_results = @ft_v2_com.search :name => "John"
-        search_results.class.should == Org::Familysearch::Ws::Familytree::V2::Schema::SearchResults
-        search_results.partial.should == 246
-        search_results.close.should == 100
-        search_results.count.should == 40
+      it "should read the relationship" do
+        @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR').and_return(@res)
+        @ft_v2_com.relationship 'KWQS-BBQ', :parent => 'KWQS-BBR'
       end
       
-      it "should serialize embedded parent parameters" do
-        @fs_com_mock.should_receive(:get).with("/familytree/v2/search?father.name=John")
-        @ft_v2_com.search :father => {:name => "John"}
+      it "should return a person" do
+        @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR').and_return(@res)
+        person = @ft_v2_com.relationship 'KWQS-BBQ', :parent => 'KWQS-BBR'
+        person.id.should == 'KWQS-BBQ'
+        person.relationships.parents[0].id.should == 'KWQS-BBR'
       end
       
     end
     
-    describe "match" do
-      
+  end
+  
+  describe "writing relationships" do
+    before(:each) do
+      @fs_com_mock = mock("FsCommunicator")
+      @res = mock("HTTP::Response")
+      @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
+    end
+    
+    describe "for relationships that don't yet exist" do
       before(:each) do
-        @fs_com_mock = mock("FsCommunicator")
-        @res = mock("HTTP::Response")
-        @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
-        
-        @json = read_file('../match_KW3B-NNM.js') 
+        @json = read_file('relationship_not_found.js') 
         @res.stub!(:body).and_return(@json)
-        @res.stub!(:code).and_return('200')
+        @res.stub!(:code).and_return('404')
         @fs_com_mock.stub!(:get).and_return(@res)
+        
+        @post_json = read_file('relationship_update.js')
+        @post_res = mock("HTTP::Response")
+        @post_res.stub!(:body).and_return(@post_json)
+        @fs_com_mock.stub!(:post).and_return(@post_res)
+                  
+        @person = new_person
+        @person2 = new_person
+        Org::Familysearch::Ws::Familytree::V2::Schema::Person.stub!(:new).and_return(@person)
+        
       end
       
-      it "should call the match endpoint" do
-        @fs_com_mock.should_receive(:get).with("/familytree/v2/match?name=John")
-        @ft_v2_com.match :name => "John"
+      it "should first try to read the relationship" do
+        @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR').and_return(@res)
+        @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
       end
       
-      it "should return the MatchResults element" do
-        search_results = @ft_v2_com.match :name => "John"
-        search_results.class.should == Org::Familysearch::Ws::Familytree::V2::Schema::MatchResults
-        search_results.count.should == 4
+      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'
       end
       
-      it "should serialize embedded parent parameters" do
-        @fs_com_mock.should_receive(:get).with("/familytree/v2/match?father.name=John")
-        @ft_v2_com.match :father => {:name => "John"}
+      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'}
       end
       
-      it "should accept an id as the first parameter" do
-        @fs_com_mock.should_receive(:get).with("/familytree/v2/match/KWQS-BBQ")
-        @ft_v2_com.match 'KWQS-BBQ'
+      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'}
       end
       
-      it "should accept an id AND hash if passed" do
-        @fs_com_mock.should_receive(:get).with("/familytree/v2/match/KWQS-BBQ?maxResults=5")
-        @ft_v2_com.match 'KWQS-BBQ', :maxResults => 5
+      it "should post a familytree request with the person to the correct endpoint" do
+        @person2.create_relationship(:type => 'parent', :with => 'KWQS-BBR', :lineage => 'Biological')
+        @person2.id = 'KWQS-BBQ'
+        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-BBR', familytree.to_json).and_return(@post_res)
+        @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
       end
       
     end
     
-    describe "reading relationships" do
-      
-      describe "for relationships that already exist" do
-        before(:each) do
-          @json = read_file('relationship_read.js') 
-          
-          @res.stub!(:body).and_return(@json)
-          @res.stub!(:code).and_return('200')
-          @fs_com_mock.stub!(:get).and_return(@res)              
-          
-        end
+    describe "for relationships that already exist" do
+      before(:each) do
+        @json = read_file('relationship_read.js') 
         
-        it "should read the relationship" do
-          @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR').and_return(@res)
-          @ft_v2_com.relationship 'KWQS-BBQ', :parent => 'KWQS-BBR'
-        end
+        @res.stub!(:body).and_return(@json)
+        @res.stub!(:code).and_return('200')
+        @fs_com_mock.stub!(:get).and_return(@res)
+        
+        @post_json = read_file('relationship_update.js')
+        @post_res = mock("HTTP::Response")
+        @post_res.stub!(:body).and_return(@post_json)
+        @fs_com_mock.stub!(:post).and_return(@post_res)
         
-        it "should return a person" do
-          @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR').and_return(@res)
-          person = @ft_v2_com.relationship 'KWQS-BBQ', :parent => 'KWQS-BBR'
-          person.id.should == 'KWQS-BBQ'
-          person.relationships.parents[0].id.should == 'KWQS-BBR'
-        end
+        # Create a payload to compare against
+        ft = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(@json)
+        person = ft.persons.find{|p|p.id=='KWQS-BBQ'}
+        person.create_relationship :type => 'parent', :with => 'KWQS-BBR', :lineage => 'Biological'
+        familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.new
+        familytree.persons = [person]
+        @req_payload = familytree.to_json          
+                  
+        @familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(@json)
+        Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.stub!(:from_json).and_return(@familytree)
         
+        @person = @familytree.persons.find{|p|p.id=='KWQS-BBQ'}
       end
       
-    end
-    
-    describe "writing relationships" do
-      before(:each) do
-        @fs_com_mock = mock("FsCommunicator")
-        @res = mock("HTTP::Response")
-        @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
+      it "should first try to read the relationship" do
+        @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR').and_return(@res)
+        @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
       end
       
-      describe "for relationships that don't yet exist" do
-        before(:each) do
-          @json = read_file('relationship_not_found.js') 
-          @res.stub!(:body).and_return(@json)
-          @res.stub!(:code).and_return('404')
-          @fs_com_mock.stub!(:get).and_return(@res)
-          
-          @post_json = read_file('relationship_update.js')
-          @post_res = mock("HTTP::Response")
-          @post_res.stub!(:body).and_return(@post_json)
-          @fs_com_mock.stub!(:post).and_return(@post_res)
-                    
-          @person = new_person
-          @person2 = new_person
-          Org::Familysearch::Ws::Familytree::V2::Schema::Person.stub!(:new).and_return(@person)
-          
-        end
-        
-        it "should first try to read the relationship" do
-          @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR').and_return(@res)
-          @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
-        end
-        
-        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'
-        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'}
-        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'}
-        end
-        
-        it "should post a familytree request with the person to the correct endpoint" do
-          @person2.create_relationship(:type => 'parent', :with => 'KWQS-BBR', :lineage => 'Biological')
-          @person2.id = 'KWQS-BBQ'
-          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-BBR', familytree.to_json).and_return(@post_res)
-          @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
-        end
-        
+      it "should create a new person with a relationship since it wasn't yet found" do
+        @person.should_not_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'
       end
       
-      describe "for relationships that already exist" do
-        before(:each) do
-          @json = read_file('relationship_read.js') 
-          
-          @res.stub!(:body).and_return(@json)
-          @res.stub!(:code).and_return('200')
-          @fs_com_mock.stub!(:get).and_return(@res)
-          
-          @post_json = read_file('relationship_update.js')
-          @post_res = mock("HTTP::Response")
-          @post_res.stub!(:body).and_return(@post_json)
-          @fs_com_mock.stub!(:post).and_return(@post_res)
-          
-          # Create a payload to compare against
-          ft = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(@json)
-          person = ft.persons.find{|p|p.id=='KWQS-BBQ'}
-          person.create_relationship :type => 'parent', :with => 'KWQS-BBR', :lineage => 'Biological'
-          familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.new
-          familytree.persons = [person]
-          @req_payload = familytree.to_json          
-                    
-          @familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(@json)
-          Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.stub!(:from_json).and_return(@familytree)
-          
-          @person = @familytree.persons.find{|p|p.id=='KWQS-BBQ'}
-        end
-        
-        it "should first try to read the relationship" do
-          @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR').and_return(@res)
-          @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
-        end
-        
-        it "should create a new person with a relationship since it wasn't yet found" do
-          @person.should_not_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'
-        end
-        
-        it "should add a marriage event if sent an event key" do
-          @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'}
-        end
-        
-        it "should add an ordinances if sent an ordinance key" do
-          @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'}
-        end
-        
-        it "should post a familytree request with the person to the correct endpoint" do
-          
-          @fs_com_mock.should_receive(:post).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR', @req_payload).and_return(@post_res)
-          @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
-        end
+      it "should add a marriage event if sent an event key" do
+        @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'}
+      end
+      
+      it "should add an ordinances if sent an ordinance key" do
+        @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'}
+      end
+      
+      it "should post a familytree request with the person to the correct endpoint" do
         
+        @fs_com_mock.should_receive(:post).with('/familytree/v2/person/KWQS-BBQ/parent/KWQS-BBR', @req_payload).and_return(@post_res)
+        @ft_v2_com.write_relationship 'KWQS-BBQ', :parent => 'KWQS-BBR', :lineage => 'Biological'
       end
+      
+    end
+  end
+  
+  describe "combining persons" do
+    def new_person(id,version)
+      p = FamilyTreeV2::Person.new
+      p.id = id
+      p.version = version
+      p
+    end
+    
+    before(:each) do
+      @fs_com_mock = mock("FsCommunicator")
+      @post_res = mock("HTTP::Response")
+      @post_res.stub!(:body).and_return(read_file('../combine_response.js'))
+      
+      @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
+      
+      @persons = [new_person('KWQS-BBQ','1'),new_person('KWQS-BBR','2'),new_person('KWQS-BBB','3')]
+      @ft_v2_com.stub!(:person).and_return(@persons)
+      @fs_com_mock.stub!(:post).and_return(@post_res)
+    end
+    
+    it "should accept an array of IDs and return the response person" do
+      new_person = @ft_v2_com.combine ['KWQS-BBQ','KWQS-BBR','KWQS-BBB']
+      new_person.should be_instance_of(FamilyTreeV2::Person)
+    end
+    
+    it "should perform a person (version) read on all of the IDs passed" do
+      @ft_v2_com.should_receive(:person).with(['KWQS-BBQ','KWQS-BBR','KWQS-BBB'],{:genders => 'none', :events => 'none', :names => 'none'}).and_return(@persons)
+      result = @ft_v2_com.combine ['KWQS-BBQ','KWQS-BBR','KWQS-BBB']
+    end
+    
+    it "should call post on /familytree/v2/person" do
+      familytree = FamilyTreeV2::FamilyTree.new
+      FamilyTreeV2::FamilyTree.should_receive(:new).and_return(familytree,familytree)
+      familytree.should_receive(:to_json).and_return('ftjson')
+      @fs_com_mock.should_receive(:post).with('/familytree/v2/person','ftjson').and_return(@post_res)
+      result = @ft_v2_com.combine ['KWQS-BBQ','KWQS-BBR','KWQS-BBB']
     end
     
+    it "should result in a new person record with an id and version" do
+      result = @ft_v2_com.combine ['KWQS-BBQ','KWQS-BBR','KWQS-BBB']
+      result.id.should == "KW3B-VZC"
+      result.version.should == "65537"
+    end
   end
   
 end

data/spec/familytree_v2/json/combine_request.js

@@ -0,0 +1 @@
+{"persons":[{"personas":{"persona":[{"id":"KW3B-VCY","version":"65537"},{"id":"KW3B-VCB","version":"65537"},{"id":"KW3B-VC1","version":"65537"}]}}]}

data/spec/familytree_v2/json/combine_response.js

@@ -0,0 +1 @@
+{"persons":[{"id":"KW3B-VZC","version":"65537"}],"version":"2.0.20091103.5176","statusCode":200,"statusMessage":"OK"}

data/spec/familytree_v2/json/person/multiple_version_read.js

@@ -0,0 +1 @@
+{"persons":[{"id":"KW3B-VCY","version":"65537","requestedId":"KW3B-VCY"},{"id":"KW3B-VCB","version":"65537","requestedId":"KW3B-VCB"},{"id":"KW3B-VC1","version":"65537","requestedId":"KW3B-VC1"}],"version":"2.0.20091103.5176","statusCode":200,"statusMessage":"OK"}

data/spec/familytree_v2/person_spec.rb

@@ -576,4 +576,29 @@ describe Org::Familysearch::Ws::Familytree::V2::Schema::Person do
     
   end
   
+  describe "create_combine" do
+    def new_combine_person(id,version)
+      person = new_person
+      person.id = id
+      person.version = version
+      person
+    end
+    
+    before(:each) do
+      @person = new_person
+      @persons = [new_combine_person('KWQS-BBR','1'),new_combine_person('KWQS-BBQ','2'),new_combine_person('KWQS-BBZ','3')]
+    end
+    
+    it "should accept an array of person objects" do
+      @person.create_combine(@persons)
+      @person.personas.personas[0].id.should == 'KWQS-BBR'
+      @person.personas.personas[0].version.should == '1'
+      @person.personas.personas[1].id.should == 'KWQS-BBQ'
+      @person.personas.personas[1].version.should == '2'
+      @person.personas.personas[2].id.should == 'KWQS-BBZ'
+      @person.personas.personas[2].version.should == '3'
+    end
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-fs-stack
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jimmy Zimmerman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -07:00
+date: 2009-12-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,9 +64,12 @@ files:
 - ruby-fs-stack.gemspec
 - spec/communicator_spec.rb
 - spec/familytree_v2/familytree_communicator_spec.rb
+- spec/familytree_v2/json/combine_request.js
+- spec/familytree_v2/json/combine_response.js
 - spec/familytree_v2/json/match_KW3B-NNM.js
 - spec/familytree_v2/json/person/KJ86-3VD_all.js
 - spec/familytree_v2/json/person/KJ86-3VD_version.js
+- spec/familytree_v2/json/person/multiple_version_read.js
 - spec/familytree_v2/json/person/post_response.js
 - spec/familytree_v2/json/person/relationship_not_found.js
 - spec/familytree_v2/json/person/relationship_read.js