ruby-fs-stack 0.4.12 → 0.5.0

data/spec/{familytree_v2/familytree_communicator_spec.rb → ruby-fs-stack/familytree/communicator_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe FamilytreeV2::Communicator do
   FamilyTreeV2 = Org::Familysearch::Ws::Familytree::V2::Schema
@@ -74,6 +74,22 @@ describe FamilytreeV2::Communicator do
       @ft_v2_com.person(:me, :names => 'none')
     end
     
+    describe "passing a block" do
+      it "should execute the block given" do
+        mock = mock('FixNum')
+        mock.should_receive(:call!).once.and_return(nil)
+        @ft_v2_com.person :me do |person|
+          mock.call!
+        end
+      end
+      
+      it "should pass the person to the block" do
+        @ft_v2_com.person :me do |person|
+          person.id.should == 'KJ86-3VD'
+        end
+      end
+    end
+    
   end
   
   describe "person read w/ multiple IDs" do
@@ -125,6 +141,80 @@ describe FamilytreeV2::Communicator do
       results = @com.familytree_v2.person ['KWCZ-1WL','KWCH-DGY','KWZR-RPD','KWCH-DPM','KWCH-DP9','KN1H-HBK','KLYL-KPZ','2794-46L','279W-NDV','KWJJ-5Y3','26KN-QTT','KWCV-7F7','2NQ9-FGV','K2WM-SHZ','KCR4-MBW','KWZR-RPX']
       results.should have(16).things
     end
+    
+    describe "sending a block callback" do
+      before(:each) do
+        @ids = ['KWCZ-1WL','KWCH-DGY','KWZR-RPD','KWCH-DPM','KWCH-DP9','KN1H-HBK','KLYL-KPZ','2794-46L','279W-NDV','KWJJ-5Y3','26KN-QTT','KWCV-7F7','2NQ9-FGV','K2WM-SHZ','KCR4-MBW','KWZR-RPX']
+      end
+      
+      it "should call the block for each slice of the persons requested" do
+        mock = mock('FixNum')
+        mock.should_receive(:call!).exactly(2).times.and_return(nil)
+        @com.familytree_v2.person @ids do |persons|
+          mock.call!
+        end
+      end
+      
+      it "should pass the person or persons to the block" do
+        count = 0
+        @com.familytree_v2.person @ids do |persons|
+          count += persons.size
+        end
+        count.should == 16
+      end
+    end
+  end
+  
+  describe "reading multiple persons when 500 errors are returned" do
+    before(:each) do
+      @fs_com_mock = mock("FsCommunicator")
+      @res = mock("HTTP::Response")
+      @json = read_file('multiple_version_read.js')
+      @res.stub!(:body).and_return(@json)
+      @fs_com_mock.stub!(:get).and_return(@res)
+      @ft_v2_com = FamilytreeV2::Communicator.new @fs_com_mock
+      @props = {'person.max.ids' => 10}
+      @ft_v2_com.stub!(:properties).and_return(@props)
+      
+      @single_response = mock('HTTP::Response')
+      single_json = read_file('KJ86-3VD_all.js')
+      @single_response.stub!(:body).and_return(single_json)
+    end
+    
+    it "should read each person separately" do
+      error = RubyFsStack::ServerError.new "Nullpointer Exception", @res
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCY,KW3B-VCB,KW3B-VC1?names=none').and_raise(error)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCY?names=none').and_return(@single_response)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCB?names=none').and_return(@single_response)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VC1?names=none').and_return(@single_response)
+      results = @ft_v2_com.person ["KW3B-VCY", "KW3B-VCB", "KW3B-VC1"], :names => 'none'
+      results.should be_a_kind_of(Array)
+      results.size.should == 3
+    end
+    
+    it "should ignore a single failure and return an empty person record (with only an ID)" do
+      error = RubyFsStack::ServerError.new "Nullpointer Exception", @res
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCY,KW3B-VCB,KW3B-VC1?names=none').and_raise(error)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCY?names=none').and_return(@single_response)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCB?names=none').and_raise(error)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VC1?names=none').and_return(@single_response)
+      results = @ft_v2_com.person ["KW3B-VCY", "KW3B-VCB", "KW3B-VC1"], :names => 'none'
+      results.size.should == 3
+      results[1].requestedId.should == 'KW3B-VCB'
+      results[1].full_name.should be_nil
+    end
+    
+    it "should always pass an array of persons to the block" do
+      error = RubyFsStack::ServerError.new "Nullpointer Exception", @res
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCY,KW3B-VCB,KW3B-VC1?names=none').and_raise(error)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCY?names=none').and_return(@single_response)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VCB?names=none').and_raise(error)
+      @fs_com_mock.should_receive(:get).with('/familytree/v2/person/KW3B-VC1?names=none').and_return(@single_response)
+      results = @ft_v2_com.person ["KW3B-VCY", "KW3B-VCB", "KW3B-VC1"], :names => 'none' do |persons|
+        persons.should be_instance_of(Array)
+        persons.size.should == 3
+      end
+    end
   end
   
   describe "save_person" do

data/spec/{familytree_v2/match_results_spec.rb → ruby-fs-stack/familytree/match_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 require 'ruby-fs-stack/familytree'
 
 describe Org::Familysearch::Ws::Familytree::V2::Schema::MatchResults, "parsing match results" do

data/spec/{familytree_v2 → ruby-fs-stack/familytree}/note_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 require 'ruby-fs-stack/familytree'
 
 describe Org::Familysearch::Ws::Familytree::V2::Schema::Note do

data/spec/{familytree_v2 → ruby-fs-stack/familytree}/pedigree_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 require 'ruby-fs-stack/familytree'
 
 describe Org::Familysearch::Ws::Familytree::V2::Schema::Pedigree do

data/spec/{familytree_v2 → ruby-fs-stack/familytree}/person_spec.rb

@@ -1,9 +1,7 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 require 'ruby-fs-stack/familytree'
 
-
 describe Org::Familysearch::Ws::Familytree::V2::Schema::Person do
-  FamTreeV2 = Org::Familysearch::Ws::Familytree::V2::Schema
   
   def new_person
     Org::Familysearch::Ws::Familytree::V2::Schema::Person.new

data/spec/{familytree_v2/relationships_spec.rb → ruby-fs-stack/familytree/relationship_spec.rb}

@@ -1,9 +1,7 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+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

data/spec/{familytree_v2/search_results_spec.rb → ruby-fs-stack/familytree/search_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 require 'ruby-fs-stack/familytree'
 
 

data/spec/ruby-fs-stack/familytree/spec_helper.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+FamTreeV2 = Org::Familysearch::Ws::Familytree::V2::Schema

data/spec/{communicator_spec.rb → ruby-fs-stack/fs_communicator_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'ruby-fs-stack/fs_communicator'
 require 'fakeweb'
 require 'logger'
@@ -94,7 +94,7 @@ describe FsCommunicator do
     end
     
     it "should set the ca file to the entrust certificate (for FamilySearch systems)" do
-      @http.should_receive(:ca_file=).with(File.join(File.dirname(__FILE__),'..','lib','ruby-fs-stack','assets','entrust-ca.crt'))
+      @http.should_receive(:ca_file=).with(/entrust-ca\.crt/)      
       do_get(@url)
     end
     
@@ -191,7 +191,7 @@ describe FsCommunicator do
     end
     
     it "should set the ca file to the entrust certificate (for FamilySearch systems)" do
-      @http.should_receive(:ca_file=).with(File.join(File.dirname(__FILE__),'..','lib','ruby-fs-stack','assets','entrust-ca.crt'))
+      @http.should_receive(:ca_file=).with(/entrust-ca\.crt/)
       do_post(@url)
     end
         
@@ -403,7 +403,7 @@ describe FsCommunicator do
     end
     
     it "should log each GET request URL and headers" do
-      response = File.join(File.dirname(__FILE__),'fixtures','fakeweb_response.txt')
+      response = File.join(File.dirname(__FILE__),'..','fixtures','fakeweb_response.txt')
       FakeWeb.register_uri(:get, "https://api.familysearch.org/familytree/v2/person/KWQS-BBQ?sessionId=SESSID&dataFormat=application/json", 
                           :response => response)
       @com.logger.should_receive(:info).with(/GET \/familytree\/v2\/person/)
@@ -423,7 +423,7 @@ describe FsCommunicator do
     end
     
     it "should log each POST request URL and headers" do
-      response = File.join(File.dirname(__FILE__),'fixtures','fakeweb_response.txt')
+      response = File.join(File.dirname(__FILE__),'..','fixtures','fakeweb_response.txt')
       FakeWeb.register_uri(:post, "https://api.familysearch.org/familytree/v2/person/KWQS-BBQ?sessionId=SESSID&dataFormat=application/json", 
                           :response => response)
       @com.logger.should_receive(:info).with(/POST \/familytree\/v2\/person/)

data/spec/{fs_utils_spec.rb → ruby-fs-stack/fs_utils_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'ruby-fs-stack/fs_utils'
 
 describe FsUtils do

data/spec/ruby-fs-stack/identity/communicator_spec.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'ruby-fs-stack/identity'
+
+describe IdentityV1::Communicator do
+  include HttpCommunicatorHelper # found in the spec_helper
+  
+  def do_get(url, credentials = {})
+    @com.get(url, credentials)
+  end
+  
+  before(:each) do
+    stub_net_objects
+    @com = FsCommunicator.new :domain => 'http://www.dev.usys.org', :key => 'KEY'
+  end
+  
+  it "should have an extended identity_v1 method on the communicator" do
+    @com.identity_v1.should be_instance_of(IdentityV1::Communicator)
+  end
+  
+  describe "authenticate" do
+    before(:each) do
+      filename = File.join(File.dirname(__FILE__),'json','login.js')
+      @body = File.read(filename)
+      @mock_response = mock('HTTP::Response', :body => @body, :code => '200')
+      @http.should_receive(:start).and_return(@mock_response)
+      @request.should_receive(:basic_auth).with('user','pass')
+      @request.should_receive(:[]=).with('User-Agent',@com.user_agent)
+    end
+    
+    it "should make a call to /identity/v1/login" do
+      url = "/identity/v1/login?key=KEY"
+      Net::HTTP::Get.should_receive(:new).with(url+"&dataFormat=application/json").and_return(@request)
+      response = @com.identity_v1.authenticate(:username => 'user', :password => 'pass')
+    end
+    
+    it "should return true if successful" do
+      success = @com.identity_v1.authenticate(:username => 'user', :password => 'pass')
+      success.should == true
+    end
+    
+    it "should set the communicator's session to the logged in session" do
+      @com.identity_v1.authenticate(:username => 'user', :password => 'pass')
+      @com.session.should == 'USYS6325F49E7E47C181EA7E73E897F9A8ED.ptap009-034'
+    end
+    
+    it "should raise RubyFsStack::Unauthorized if the login was not successful" do
+      @mock_response.stub!(:code).and_return('401')
+      @mock_response.stub!(:message).and_return('Invalid name or password.')
+      lambda{
+        @com.identity_v1.authenticate(:username => 'user', :password => 'pass')
+      }.should raise_error(RubyFsStack::Unauthorized)
+    end
+    
+    describe "login" do
+      it "should accept the login method and behave the same way" do
+        url = "/identity/v1/login?key=KEY"
+        Net::HTTP::Get.should_receive(:new).with(url+"&dataFormat=application/json").and_return(@request)
+        response = @com.identity_v1.login(:username => 'user', :password => 'pass')
+      end
+      
+      it "should return true if successful" do
+        success = @com.identity_v1.login(:username => 'user', :password => 'pass')
+        success.should == true
+      end
+
+      it "should set the communicator's session to the logged in session" do
+        @com.identity_v1.login(:username => 'user', :password => 'pass')
+        @com.session.should == 'USYS6325F49E7E47C181EA7E73E897F9A8ED.ptap009-034'
+      end
+
+      it "should raise RubyFsStack::Unauthorized if the login was not successful" do
+        @mock_response.stub!(:code).and_return('401')
+        @mock_response.stub!(:message).and_return('Invalid name or password.')
+        lambda{
+          @com.identity_v1.login(:username => 'user', :password => 'pass')
+        }.should raise_error(RubyFsStack::Unauthorized)
+      end
+      
+    end
+  end
+  
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 12
-  version: 0.4.12
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jimmy Zimmerman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 -06:00
+date: 2010-05-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,43 +67,58 @@ files:
 - lib/ruby-fs-stack/enunciate/identity.rb
 - lib/ruby-fs-stack/errors.rb
 - lib/ruby-fs-stack/familytree.rb
+- lib/ruby-fs-stack/familytree/characteristic.rb
+- lib/ruby-fs-stack/familytree/communicator.rb
+- lib/ruby-fs-stack/familytree/event.rb
+- lib/ruby-fs-stack/familytree/exist.rb
+- lib/ruby-fs-stack/familytree/gender.rb
+- lib/ruby-fs-stack/familytree/match.rb
+- lib/ruby-fs-stack/familytree/name.rb
+- lib/ruby-fs-stack/familytree/note.rb
+- lib/ruby-fs-stack/familytree/ordinance.rb
+- lib/ruby-fs-stack/familytree/pedigree.rb
+- lib/ruby-fs-stack/familytree/person.rb
+- lib/ruby-fs-stack/familytree/relationship.rb
+- lib/ruby-fs-stack/familytree/search.rb
 - lib/ruby-fs-stack/fs_communicator.rb
 - lib/ruby-fs-stack/fs_utils.rb
 - lib/ruby-fs-stack/identity.rb
+- lib/ruby-fs-stack/identity/communicator.rb
 - lib/ruby-fs-stack/warning_suppressor.rb
 - 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/fakeweb_contributor.txt
-- spec/familytree_v2/json/fakeweb_pedigree.txt
-- spec/familytree_v2/json/fakeweb_pedigree2.txt
-- spec/familytree_v2/json/fakeweb_properties.txt
-- spec/familytree_v2/json/match_KW3B-NNM.js
-- spec/familytree_v2/json/note_create_response.js
-- spec/familytree_v2/json/person/KJ86-3VD_all.js
-- spec/familytree_v2/json/person/KJ86-3VD_parents_families.js
-- spec/familytree_v2/json/person/KJ86-3VD_version.js
-- spec/familytree_v2/json/person/fakeweb_10_batch.txt
-- spec/familytree_v2/json/person/fakeweb_6_batch.txt
-- 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
-- spec/familytree_v2/json/person/relationship_update.js
-- spec/familytree_v2/json/person/spouse_read.js
-- spec/familytree_v2/json/search.js
-- spec/familytree_v2/match_results_spec.rb
-- 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
-- spec/identity_v1/identity_spec.rb
-- spec/identity_v1/json/login.js
+- spec/ruby-fs-stack/familytree/communicator_spec.rb
+- spec/ruby-fs-stack/familytree/json/combine_request.js
+- spec/ruby-fs-stack/familytree/json/combine_response.js
+- spec/ruby-fs-stack/familytree/json/fakeweb_contributor.txt
+- spec/ruby-fs-stack/familytree/json/fakeweb_pedigree.txt
+- spec/ruby-fs-stack/familytree/json/fakeweb_pedigree2.txt
+- spec/ruby-fs-stack/familytree/json/fakeweb_properties.txt
+- spec/ruby-fs-stack/familytree/json/match_KW3B-NNM.js
+- spec/ruby-fs-stack/familytree/json/note_create_response.js
+- spec/ruby-fs-stack/familytree/json/person/KJ86-3VD_all.js
+- spec/ruby-fs-stack/familytree/json/person/KJ86-3VD_parents_families.js
+- spec/ruby-fs-stack/familytree/json/person/KJ86-3VD_version.js
+- spec/ruby-fs-stack/familytree/json/person/fakeweb_10_batch.txt
+- spec/ruby-fs-stack/familytree/json/person/fakeweb_6_batch.txt
+- spec/ruby-fs-stack/familytree/json/person/multiple_version_read.js
+- spec/ruby-fs-stack/familytree/json/person/post_response.js
+- spec/ruby-fs-stack/familytree/json/person/relationship_not_found.js
+- spec/ruby-fs-stack/familytree/json/person/relationship_read.js
+- spec/ruby-fs-stack/familytree/json/person/relationship_update.js
+- spec/ruby-fs-stack/familytree/json/person/spouse_read.js
+- spec/ruby-fs-stack/familytree/json/search.js
+- spec/ruby-fs-stack/familytree/match_spec.rb
+- spec/ruby-fs-stack/familytree/note_spec.rb
+- spec/ruby-fs-stack/familytree/pedigree_spec.rb
+- spec/ruby-fs-stack/familytree/person_spec.rb
+- spec/ruby-fs-stack/familytree/relationship_spec.rb
+- spec/ruby-fs-stack/familytree/search_spec.rb
+- spec/ruby-fs-stack/familytree/spec_helper.rb
+- spec/ruby-fs-stack/fs_communicator_spec.rb
+- spec/ruby-fs-stack/fs_utils_spec.rb
+- spec/ruby-fs-stack/identity/communicator_spec.rb
+- spec/ruby-fs-stack/identity/json/login.js
 - spec/ruby-fs-stack_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -137,16 +152,17 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper for all FamilySearch APIs.
 test_files: 
-- spec/communicator_spec.rb
-- spec/familytree_v2/familytree_communicator_spec.rb
-- spec/familytree_v2/match_results_spec.rb
-- 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
+- spec/ruby-fs-stack/familytree/communicator_spec.rb
+- spec/ruby-fs-stack/familytree/match_spec.rb
+- spec/ruby-fs-stack/familytree/note_spec.rb
+- spec/ruby-fs-stack/familytree/pedigree_spec.rb
+- spec/ruby-fs-stack/familytree/person_spec.rb
+- spec/ruby-fs-stack/familytree/relationship_spec.rb
+- spec/ruby-fs-stack/familytree/search_spec.rb
+- spec/ruby-fs-stack/familytree/spec_helper.rb
+- spec/ruby-fs-stack/fs_communicator_spec.rb
+- spec/ruby-fs-stack/fs_utils_spec.rb
+- spec/ruby-fs-stack/identity/communicator_spec.rb
 - spec/ruby-fs-stack_spec.rb
 - spec/spec_helper.rb
 - examples/familytree_example.rb