localeapp 0.6.5 → 0.6.6

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# Version 0.6.4
+# Version 0.6.6
+
+* Add a timeout configuration setting
+
+# Version 0.6.5
 
 * Build gem with 1.8.7 to fix gemspec errors
 

data/lib/localeapp/api_caller.rb

@@ -56,6 +56,7 @@ module Localeapp
           :url => url,
           :method => method,
           :headers => headers,
+          :timeout => Localeapp.configuration.timeout,
           :verify_ssl => (Localeapp.configuration.ssl_verify ? OpenSSL::SSL::VERIFY_PEER : false)
         }
         parameters[:ca_file] = Localeapp.configuration.ssl_ca_file if Localeapp.configuration.ssl_ca_file

data/lib/localeapp/configuration.rb

@@ -10,6 +10,9 @@ module Localeapp
     # The proxy to connect via
     attr_accessor :proxy
 
+    # The request timeout
+    attr_accessor :timeout
+
     # Whether to use https or not (defaults to true)
     attr_accessor :secure
 
@@ -76,6 +79,7 @@ module Localeapp
     def defaults
       defaults = {
         :host                       => 'api.localeapp.com',
+        :timeout                    => 60,
         :secure                     => true,
         :ssl_verify                 => false,
         :sending_environments       => %w(development),

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/spec/localeapp/api_caller_spec.rb

@@ -96,6 +96,14 @@ describe Localeapp::ApiCaller, "#call(object)" do
     end
   end
 
+  context "Timeout" do
+    it "sets the timeout to the configured timeout" do
+      Localeapp.configuration.timeout = 120
+      RestClient::Request.should_receive(:execute).with(hash_including(:timeout => 120)).and_return(double('response', :code => 200))
+      @api_caller.call(self)
+    end
+  end
+
   context "a GET request" do
     it "makes the call to the api" do
       RestClient::Request.should_receive(:execute).with(hash_including(:url => @url, :method => :get)).and_return(double('response', :code => 200))

data/spec/localeapp/configuration_spec.rb

@@ -19,6 +19,14 @@ describe Localeapp::Configuration do
     expect { configuration.proxy = 'http://localhost:8888' }.to change(configuration, :proxy).to('http://localhost:8888')
   end
 
+  it "sets timeout to 60 by default" do
+    configuration.timeout.should == 60
+  end
+
+  it "allows timeout setting to be overridden" do
+    expect { configuration.timeout = 120 }.to change(configuration, :timeout).to(120)
+  end
+
   it "sets secure to true by default" do
     configuration.secure.should == true
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: localeapp
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Christopher Dell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-26 00:00:00 Z
+date: 2012-11-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n