ruby-fs-stack 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

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

@@ -186,16 +186,16 @@ module FamilytreeV2
     #    communicator.familytree_v2.relationship 'KWQS-BBQ', :parent => 'KWQS-BBT'
     #    communicator.familytree_v2.relationship 'KWQS-BBQ', :parent => 'KWQS-BBT'
     def relationship(base_id,options)
-      r_type = get_relationship_type(options)
-      with_id = options[r_type.to_sym]
-      url = "#{Base}person/#{base_id}/#{r_type}/#{with_id}"
-      res = @fs_communicator.get(url)
-      if res.code == '404'
-        return nil
-      else
+      begin
+        r_type = get_relationship_type(options)
+        with_id = options[r_type.to_sym]
+        url = "#{Base}person/#{base_id}/#{r_type}/#{with_id}"
+        res = @fs_communicator.get(url)
         familytree = Org::Familysearch::Ws::Familytree::V2::Schema::FamilyTree.from_json JSON.parse(res.body)
         person = familytree.persons.find{|p|p.id == base_id}
         return person
+      rescue RubyFsStack::NotFound
+        return nil
       end
     end
     
@@ -334,6 +334,22 @@ module Org::Familysearch::Ws::Familytree::V2::Schema
     end
   end
   
+  class OrdinanceType
+
+    #  Born in Covenant -> Possibly needs to be changed to no underscores 
+    # Born_in_Covenant = "Born_in_Covenant"
+    
+    # Override the incorrect constants in the enunciate library
+    with_warnings_suppressed do
+      #  Sealing to parents.
+      Sealing_to_Parents = "Sealing to Parents"
+
+      #  Sealing to spouse.
+      Sealing_to_Spouse = "Sealing to Spouse"
+    end
+  end
+  
+  
   class OrdinanceValue
     
     def add_date(value)

data/ruby-fs-stack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-fs-stack}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jimmy Zimmerman"]
-  s.date = %q{2009-12-16}
+  s.date = %q{2009-12-17}
   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 = [

data/spec/familytree_v2/familytree_communicator_spec.rb

@@ -260,10 +260,7 @@ describe FamilytreeV2::Communicator do
     
     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)
+        @fs_com_mock.stub!(:get).and_raise(RubyFsStack::NotFound)
         
         @post_json = read_file('relationship_update.js')
         @post_res = mock("HTTP::Response")

data/spec/familytree_v2/person_spec.rb

@@ -535,13 +535,13 @@ describe Org::Familysearch::Ws::Familytree::V2::Schema::Person do
       @person.sealing_to_parents.first.value.parents.size.should == 2
       @person.sealing_to_parents.first.value.parents.find{|p|p.gender == 'Male'}.id.should == 'KWQS-BBQ'
       @person.sealing_to_parents.first.value.parents.find{|p|p.gender == 'Female'}.id.should == 'KWQS-BBR'
-      @person.sealing_to_parents.first.value.type.should == "Sealing_to_Parents"
+      @person.sealing_to_parents.first.value.type.should == "Sealing to Parents"
       
       #sealing_to_spouse
-      @person.create_relationship :type => 'spouse', :with => 'KWQS-BBR', :ordinance => {:date => date, :temple => temple, :place => place, :type => "Sealing_to_Spouse"}
+      @person.create_relationship :type => 'spouse', :with => 'KWQS-BBR', :ordinance => {:date => date, :temple => temple, :place => place, :type => "Sealing to Spouse"}
       @person.sealing_to_spouses('KWQS-BBR').size.should == 1
       sts = @person.sealing_to_spouses('KWQS-BBR')
-      sts.first.value.type.should == "Sealing_to_Spouse"
+      sts.first.value.type.should == "Sealing to Spouse"
       sts.first.value.date.original.should == date
       sts.first.value.temple.should == temple
       sts.first.value.place.original.should == place

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-fs-stack
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Jimmy Zimmerman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 -07:00
+date: 2009-12-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency