resterl 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52b59fae88efaf01ddef720766197e661101b766
-  data.tar.gz: 0c4fb0c9858c1b39068e293cf25e53a7eacb2427
+  metadata.gz: eefda67e9d4b1b634f09e64d6744a43a6733dfd4
+  data.tar.gz: 302093e3f36f08d49d1918759047255aa9c28867
 SHA512:
-  metadata.gz: b2763c61b9b1ef3e9fe64e78648f1fc67748d16040e9c28163853ba6779f4e7bc03442c865c452106aba58a7b8510b0c44267aee0fbe7f6db40df928b9c2f671
-  data.tar.gz: ac3bb5ab0e309aa16461b9c62e5fa42ff7ab8748b20203a0fae4b1e78241d831f313730fd0a1e20b4bc9dbb4f7facb4152e07b07d7a57f8589e45e5efcae2f6d
+  metadata.gz: 1ccf4876bf18424c64528b8a257d651b531ce92979f52ebbc9cf54e51a4372f881b5e7072accf557b56f5b0385b47c553f52d9df5ef6b07429a348639815f473
+  data.tar.gz: 654b12d576e911c072d58426edb17b37cbd97ce3626b179cebb7a837536d32c93867387e93cdaca8a6e5acefe4a1d15ce9976968bfcbfb2ff2bea1e14d3a98be

data/lib/resterl/client.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 module Resterl
   class Client
@@ -8,6 +8,8 @@ module Resterl
       cache: Resterl::Caches::SimpleCache.new,
       ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE,
       expiry_multiplier: 10,
+      open_timeout: 15,
+      read_timeout: 60,
       minimum_cache_lifetime: 5 * 60 # 5 Minuten
     }
 
@@ -70,39 +72,8 @@ module Resterl
 
       # Anfrage stellen, ggf. ETag mit übergeben
       request = Resterl::GetRequest.new(self, url, params, headers)
-      new_response = request.perform.response
-
-      response, max_age_seconds =
-        case new_response
-        when Net::HTTPClientError,
-             Net::HTTPServerError
-          # Aus dem Cache muss nichts entfernt werden,
-          # weil ja auch kein Eintrag (mehr) drin ist.
-          new_response.error!
-        when Net::HTTPNotModified
-          # Wenn "304 Not Modified", dann altes
-          # Ergebnis als neues Ergebnis verwenden
-          r_temp = Resterl::Response.new(new_response,
-                                         options[:minimum_cache_lifetime])
-          old_response.update_expires_at(
-            r_temp.expires_at)
-          [old_response, r_temp.expires_at - Time.now]
-        when Net::HTTPSuccess
-          r = Resterl::Response.new(new_response,
-                                    options[:minimum_cache_lifetime])
-          [r, r.expires_at - Time.now]
-        else
-          raise 'unknown response'
-        end
-
-      # Cachezeit berechnen
-      expiry = [
-        max_age_seconds.to_i * options[:expiry_multiplier],
-        options[:minimum_cache_lifetime]
-      ].max
-
-      # Ergebnis im Cache speichern
-      @cache.write cache_key, response, expiry
+      response, max_age_seconds = get_response(request, old_response)
+      cache_response(response, max_age_seconds, cache_key)
 
       response
     end
@@ -129,5 +100,46 @@ module Resterl
     def data_to_cache_key *args
       args.hash
     end
+
+    def get_response(request, old_response)
+      # Anfrage stellen, ggf. ETag mit übergeben
+      new_response = request.perform.response
+
+      case new_response
+      when Net::HTTPClientError,
+           Net::HTTPServerError
+        # Aus dem Cache muss nichts entfernt werden,
+        # weil ja auch kein Eintrag (mehr) drin ist.
+        new_response.error!
+      when Net::HTTPNotModified
+        reuse_old_response(new_response, old_response)
+      when Net::HTTPSuccess
+        r = Resterl::Response.new(new_response,
+                                  options[:minimum_cache_lifetime])
+        [r, r.expires_at - Time.now]
+      else
+        raise 'unknown response'
+      end
+    end
+
+    def cache_response(response, max_age_seconds, cache_key)
+      # Cachezeit berechnen
+      expiry = [
+        max_age_seconds.to_i * options[:expiry_multiplier],
+        options[:minimum_cache_lifetime]
+      ].max
+
+      # Ergebnis im Cache speichern
+      @cache.write cache_key, response, expiry
+    end
+
+    def reuse_old_response(new_response, old_response)
+      # Wenn "304 Not Modified", dann altes
+      # Ergebnis als neues Ergebnis verwenden
+      r_temp = Resterl::Response.new(new_response,
+                                     options[:minimum_cache_lifetime])
+      old_response.update_expires_at(r_temp.expires_at)
+      [old_response, r_temp.expires_at - Time.now]
+    end
   end
 end

data/lib/resterl/generic_request.rb

@@ -17,6 +17,7 @@ module Resterl
     def http_object_and_query_path
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
+      apply_timeout_settings http
       apply_ssl http, uri
 
       path_with_query = uri.path
@@ -46,6 +47,11 @@ module Resterl
       http.verify_mode = rest_client.options[:ssl_verify_mode]
     end
 
+    def apply_timeout_settings http
+      http.open_timeout = rest_client.options[:open_timeout]
+      http.read_timeout = rest_client.options[:read_timeout]
+    end
+
     def redirect_url
       response['location'] || response.body.match(/<a href=\"([^>]+)\">/i)[1]
     end

data/lib/resterl/version.rb

@@ -1,3 +1,3 @@
 module Resterl
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/spec/lib/resterl/{client.rb → client_spec.rb}

@@ -4,9 +4,7 @@ require 'webmock/rspec'
 require 'timecop'
 
 describe Resterl::Client do
-
   describe 'minimum cache lifetime' do
-
     before do
       Timecop.freeze(Time.parse('2015-01-01 01:00'))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resterl
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Florian Dütsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -139,7 +139,7 @@ files:
 - lib/resterl/response.rb
 - lib/resterl/version.rb
 - resterl.gemspec
-- spec/lib/resterl/client.rb
+- spec/lib/resterl/client_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/Nix-wie-weg/resterl
 licenses: []
@@ -165,6 +165,6 @@ signing_key:
 specification_version: 4
 summary: Rudimentary HTTP client with focus on caching
 test_files:
-- spec/lib/resterl/client.rb
+- spec/lib/resterl/client_spec.rb
 - spec/spec_helper.rb
 has_rdoc: