ruby-fs-stack 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

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

@@ -3,7 +3,7 @@ require 'net/https'
 require 'uri'
 
 class FsCommunicator
-  attr_accessor :domain, :key, :user_agent, :session, :handle_throttling, :logger
+  attr_accessor :domain, :key, :user_agent, :session, :handle_throttling, :logger, :timeout
   include RubyFsStack
   # ====Params
   # <tt>options</tt> - a hash with the following options
@@ -29,7 +29,8 @@ class FsCommunicator
       :user_agent => 'FsCommunicator/0.1 (Ruby)', # should be overridden by options user_agent
       :session => nil,
       :handle_throttling => false,
-      :logger => nil
+      :logger => nil,
+      :timeout => nil
     }.merge(options)
     @domain = o[:domain]
     @key = o[:key]
@@ -37,6 +38,7 @@ class FsCommunicator
     @session = o[:session]
     @handle_throttling = o[:handle_throttling]
     @logger = o[:logger]
+    @timeout = o[:timeout]
   end
   
   def post(url,payload)
@@ -49,6 +51,7 @@ class FsCommunicator
     
     http = Net::HTTP.new(uri.host, uri.port)
     set_ssl(http) if uri.scheme == 'https'
+    http.read_timeout = @timeout unless @timeout.nil?
     
     log_request('POST',full_url,request) if logger
     res = http.start do |ht|
@@ -76,6 +79,7 @@ class FsCommunicator
     
     http = Net::HTTP.new(uri.host, uri.port)
     set_ssl(http) if uri.scheme == 'https'
+    http.read_timeout = @timeout unless @timeout.nil?
     
     log_request('GET',full_url,request) if logger
     res = http.start do |ht|

data/ruby-fs-stack.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-fs-stack}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jimmy Zimmerman"]
-  s.date = %q{2010-01-27}
+  s.date = %q{2010-02-19}
   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 = [
@@ -101,3 +101,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<fakeweb>, [">= 0"])
   end
 end
+

data/spec/communicator_spec.rb

@@ -446,4 +446,39 @@ describe FsCommunicator do
     
   end
   
+  describe "timeout" do
+    before(:each) do
+      options = {
+        :domain => 'https://api.familysearch.org', 
+        :key => '1111-1111', 
+        :user_agent => "FsCommunicator/0.1",
+        :session => 'SESSID',
+        :timeout => 300
+      }
+      @com = FsCommunicator.new options
+      
+      stub_net_objects #found in the spec helper
+      @url = '/familytree/v1/person/KWQS-BBQ'
+      @session_url = @url + "?sessionId=#{@com.session}&dataFormat=application/json"
+      @res = mock('HTTP::Response')
+      @res.stub!(:code).and_return('200')
+      @http.stub!(:start).and_return(@res)
+    end
+    
+    it "should set timeout attr" do
+      @com.domain.should == 'https://api.familysearch.org'
+      @com.timeout.should == 300
+    end
+    
+    it "should set the http's read_timeout inside of the get method" do
+      @http.should_receive(:read_timeout=).with(300)
+      @com.get(@url)
+    end
+    
+    it "should set the http's read_timeout inside of the post method" do
+      @http.should_receive(:read_timeout=).with(300)
+      @com.post(@url,'payload')
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-fs-stack
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Jimmy Zimmerman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -07:00
+date: 2010-02-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency