relax 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 0.2.0 – Unreleased
+## 0.2.1 – May 30, 2012
+
+* Add a timeout configuration option and use it on the resource connection
+
+## 0.2.0 – May 23, 2012
 
 * Rewrote from scratch to be a smaller, simpler library
 

data/lib/relax/client.rb

@@ -3,11 +3,13 @@ require 'faraday'
 module Relax
   module Client
     USER_AGENT = "Relax Ruby Gem Client #{Relax::VERSION}"
+    TIMEOUT = 60
 
     def config
       @config ||= Config.new.configure do |config|
         config.adapter = Faraday.default_adapter
         config.user_agent = USER_AGENT
+        config.timeout = TIMEOUT
       end
     end
 

data/lib/relax/config.rb

@@ -2,6 +2,7 @@ module Relax
   class Config
     attr :adapter, true
     attr :base_uri, true
+    attr :timeout, true
     attr :user_agent, true
 
     def configure

data/lib/relax/resource.rb

@@ -14,8 +14,8 @@ module Relax
 
     def connection(options={})
       options[:url] ||= config.base_uri
-      options[:headers] ||= {}
-      options[:headers][:user_agent] ||= config.user_agent
+      (options[:headers] ||= {})[:user_agent] ||= config.user_agent
+      (options[:request] ||= {})[:timeout] ||= config.timeout
 
       Faraday.new(options) do |builder|
         yield(builder) if block_given?

data/lib/relax/version.rb

@@ -1,3 +1,3 @@
 module Relax
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/relax/client_spec.rb

@@ -19,6 +19,7 @@ describe Relax::Client do
 
       its(:adapter) { should == Faraday.default_adapter }
       its(:base_uri) { should be_nil }
+      its(:timeout) { should == 60 }
       its(:user_agent) { should == "Relax Ruby Gem Client #{Relax::VERSION}" }
     end
   end

data/spec/relax/resource_spec.rb

@@ -32,6 +32,10 @@ describe Relax::Resource do
       connection.url_prefix.should == URI.parse(client.config.base_uri)
     end
 
+    it 'uses the configured timeout' do
+      connection.options[:timeout].should == client.config.timeout
+    end
+
     it 'accepts an options hash to be passed to Faraday::Connection' do
       headers = { user_agent: "#{described_class} Test" }
       connection = subject.send(:connection, headers: headers)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relax
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday