resterl 0.0.12 → 0.0.13

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTEyZGFhZmRlNTc1ZTQxZmVhODliZTYxNjkzYTExMDA2OGFhYzExNA==
+  data.tar.gz: !binary |-
+    ZTBiY2I0NTJlNzFhZjcxZGMxYTA0Nzc3ODZjYzQ3MTQxNjA3OTNhYg==
+SHA512:
+  metadata.gz: !binary |-
+    MDRiOWMwYTgyNWU2MWUyOTEwZDRjYjgwMjhjNmRkNThhZmMzZTY0MWNlYzE5
+    ZjkwODhhOGRhOTQyMmIwYjU3OTJiYzAzYzgxODE4ZjRkOGM3MzE5ZmRmNmFj
+    Yzg0MTcwNTZlNDBkZmEyZmExMmI0NDMxNzI0YjRlOGIzYTY2OGQ=
+  data.tar.gz: !binary |-
+    ZmYxOTg1NWYwZGY2OGI2MTE4ZGYzNjE4NTNjZmU0ODU1M2YwZGRhYzZkMDA5
+    MTQ2ZGNkM2IwZGEzZTgzZTk4ZjkyZTQ4Nzk5MGQyMDVlNzc5MWNlYTU0MzRm
+    NTBkZGVjMTY1NzBhZDRkNzJlNThiMjE5ZGJkYTBiZDFhYmI0YzQ=

data/lib/resterl/caches/cache_interface.rb

@@ -1,11 +1,17 @@
-class Resterl::Caches::CacheInterface
-  def read key
-    raise 'Not yet implemented!'
-  end
-  def write key, value, expires_in
-    raise 'Not yet implemented!'
-  end
-  def delete key
-    raise 'Not yet implemented!'
+module Resterl
+  module Caches
+    class CacheInterface
+      def read key
+        raise 'Not yet implemented!'
+      end
+
+      def write key, value, expires_in
+        raise 'Not yet implemented!'
+      end
+
+      def delete key
+        raise 'Not yet implemented!'
+      end
+    end
   end
 end

data/lib/resterl/client.rb

@@ -1,120 +1,127 @@
-class Resterl::Client
-  attr_reader :options
-  DEFAULTS = {
-    :max_redirect_depth => 10,
-    :cache => Resterl::Caches::SimpleCache.new,
-    :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE,
-    :expiry_multiplier => 10,
-    :minimum_cache_lifetime => 5 * 60 # 5 Minuten
-  }
-
-  class TooManyRedirects < StandardError; end
-
-  def initialize(options = {})
-    @options = DEFAULTS.merge(options).freeze
-    @cache = @options[:cache]
-  end
+# encoding: UTF-8
+
+module Resterl
+  class Client
+    attr_reader :options
+    DEFAULTS = {
+      max_redirect_depth: 10,
+      cache: Resterl::Caches::SimpleCache.new,
+      ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE,
+      expiry_multiplier: 10,
+      minimum_cache_lifetime: 5 * 60 # 5 Minuten
+    }
+
+    class TooManyRedirects < StandardError; end
+
+    def initialize(options = {})
+      @options = DEFAULTS.merge(options).freeze
+      @cache = @options[:cache]
+    end
 
-  def get url, params, headers
-    url = setup_url(url)
+    def get url, params, headers
+      url = setup_url(url)
 
-    # Cache-Schlüssel aus Pfad hashen
-    cache_key = data_to_cache_key url, params, headers
+      # Cache-Schlüssel aus Pfad hashen
+      cache_key = data_to_cache_key url, params, headers
 
-    # Response aus Cache holen
-    old_response = @cache.read(cache_key)
+      # Response aus Cache holen
+      old_response = @cache.read(cache_key)
 
-    if old_response and not old_response.expired?
-      # Anfrage noch nicht abgelaufen, Ergebnis aus dem Cache verwenden
-      old_response
-    else
-      # Neue Anfrage
-      new_get_request url, cache_key, params, headers, old_response
+      if old_response && !old_response.expired?
+        # Anfrage noch nicht abgelaufen, Ergebnis aus dem Cache verwenden
+        old_response
+      else
+        # Neue Anfrage
+        new_get_request url, cache_key, params, headers, old_response
+      end
     end
-  end
-  
-  def post url, params, data, headers
-    # Caching nicht notwendig
-    url = setup_url url
-    request = Resterl::PostRequest.new(self, url, params, data, headers)
-    response = request.perform.response
-
-    response
-  end
-  
-  def put url, params, data, headers
-    # TODO: Testen, durchdenken, refactoring?
-    url = setup_url url
-    request = Resterl::PutRequest.new(self, url, params, data, headers)
-    request.perform.response
-  end
-
-  def delete url, params, data, headers
-    # TODO: Testen, durchdenken, refactoring?
-    url = setup_url url
-    request = Resterl::DeleteRequest.new(self, url, params, data, headers)
-    request.perform.response
-  end
-
-  private
 
-  def new_get_request url, cache_key, params, headers, old_response
+    def post url, params, data, headers
+      # Caching nicht notwendig
+      url = setup_url url
+      request = Resterl::PostRequest.new(self, url, params, data, headers)
+      response = request.perform.response
 
-    # Ggf. ETag und Last-Modified auslesen
-    if old_response
-      etag = old_response.net_http_response['ETag']
-      headers['If-None-Match'] = etag if etag
-
-      last_modified = old_response.net_http_response['Last-Modified']
-      headers['If-Modified-Since'] = last_modified if last_modified
+      response
     end
 
-    # 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)
-      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)
-      [r, r.expires_at - Time.now]
-    else
-      raise 'unknown response'
+    def put url, params, data, headers
+      # TODO: Testen, durchdenken, refactoring?
+      url = setup_url url
+      request = Resterl::PutRequest.new(self, url, params, data, headers)
+      request.perform.response
     end
 
-    # Cachezeit berechnen
-    expiry = [
-      max_age_seconds.to_i * options[:expiry_multiplier],
-      options[:minimum_cache_lifetime]
-    ].max
+    def delete url, params, data, headers
+      # TODO: Testen, durchdenken, refactoring?
+      url = setup_url url
+      request = Resterl::DeleteRequest.new(self, url, params, data, headers)
+      request.perform.response
+    end
 
-    # Ergebnis im Cache speichern
-    @cache.write cache_key, response, expiry
+    def invalidate url, params, headers
+      @cache.delete data_to_cache_key(url, params, headers)
+    end
 
-    response
-  end
+    private
+
+    def new_get_request url, cache_key, params, headers, old_response
+      # Ggf. ETag und Last-Modified auslesen
+      if old_response
+        etag = old_response.net_http_response['ETag']
+        headers['If-None-Match'] = etag if etag
+
+        last_modified = old_response.net_http_response['Last-Modified']
+        headers['If-Modified-Since'] = last_modified if last_modified
+      end
+
+      # 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)
+                                    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)
+                                    [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
+    end
 
-  def setup_url url
-    if url =~ /^http/
-      url
-    else
-      bu = options[:base_uri]
-      bu ? "#{bu}#{url}" : url
+    def setup_url url
+      if url =~ /^http/
+        url
+      else
+        bu = options[:base_uri]
+        bu ? "#{bu}#{url}" : url
+      end
     end
-  end
 
-  def data_to_cache_key *args
-    args.hash
+    def data_to_cache_key *args
+      args.hash
+    end
   end
 end

data/lib/resterl/version.rb

@@ -1,3 +1,3 @@
 module Resterl
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: resterl
 version: !ruby/object:Gem::Version
-  version: 0.0.12
-  prerelease: 
+  version: 0.0.13
 platform: ruby
 authors:
 - Florian Dütsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,28 +87,26 @@ files:
 - test/test_resterl.rb
 homepage: http://github.com/Nix-wie-weg/resterl
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rudimentary HTTP client with focus on caching
-test_files:
-- test/helper.rb
-- test/test_resterl.rb
+test_files: []
+has_rdoc: