twingly-url_cache 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b9ed893f285e11aefe16536d0dbff6dd75d2e1e9
-  data.tar.gz: 92fa6a2cfc57232d56e0b89542556a9ce8f484ae
+SHA256:
+  metadata.gz: 24b2b74670becb8febd7328f5282942778233895bba160e82f46d6d9058b3bb5
+  data.tar.gz: 7f357962eaca25d72bae9dda7f85e79f3e3980bb1a203eebfbfa681ac729217d
 SHA512:
-  metadata.gz: 938656877cb25f56db3ccb9b88c8196329fd1b8982bc613c53b1b51be5a08a7f4c55ba52eb2953fe886d8daea8fc85266d7d33f820a677d4bf0d7a2048a720d7
-  data.tar.gz: 21a983f60abfc1a58a3ff76a42ab9f01e53057d734e7ba3d90263a63a2e9156d423f7ffeae5a8246df195ba32a6f0c2747d77efd5d45ce1fd8fbc44bdc4cde88
+  metadata.gz: 3a191f98e4a5362bae8e1cd512021d5b0e8354dc85e8b8b9b233a25b314a8c1c294f54124403087d925b0f1bd4692a5868c1227f748d0ecde99206fa0cf2ec84
+  data.tar.gz: a76d8f8ee36e63685f0469647334245042c0e9ca9ac9d5ffd6113e3f1c1dc1b70bbf244167f37fe06a201ce1425357a544b3b7e59bfe3195bd452efd0e37f2bc

data/README.md

@@ -1,5 +1,7 @@
 # Twingly::UrlCache
 
+[![Build Status](https://travis-ci.org/twingly/twingly-url_cache.svg)](https://travis-ci.org/twingly/twingly-url_cache)
+
 URL cache, remember if an URL been seen before. Uses [Memcached] to cache data, prefers [MemCachier].
 
 [Memcached]: http://memcached.org/
@@ -36,10 +38,10 @@ Initialize an instance, cache an URL with `#cache!` and look if it's cached with
 => false
 ```
 
-Required environment variables:
+Optional environment variables:
 
 ```Shell
-MEMCACHIER_SERVERS
+MEMCACHIER_SERVERS # Defaults to localhost
 MEMCACHIER_PASSWORD
 MEMCACHIER_USERNAME
 ```
@@ -53,4 +55,3 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/twingly/twingly-url_cache.
-

data/lib/twingly/url_cache.rb

@@ -5,26 +5,35 @@ require "retryable"
 
 module Twingly
   class UrlCache
+    class Error < StandardError; end
+    class ServerError < Error; end
+
     attr_reader :ttl
 
     CACHE_VALUE = ""
 
-    def initialize(ttl: 0)
-      @cache = Dalli::Client.new(servers, options)
-      @ttl = ttl
+    def initialize(ttl: 0, cache: default_cache)
+      @ttl   = ttl
+      @cache = cache
     end
 
     def cache!(url)
       key = key_for(url)
-      Retryable.retryable(tries: 3, on: Dalli::RingError) do
-        !!@cache.set(key, CACHE_VALUE, ttl, raw: true)
+
+      retry_transient_exceptions do
+        with_exception_class_conversion do
+          !!@cache.set(key, CACHE_VALUE, ttl, raw: true)
+        end
       end
     end
 
     def cached?(url)
       key = key_for(url)
-      Retryable.retryable(tries: 3, on: Dalli::RingError) do
-        @cache.get(key, raw: true) == CACHE_VALUE
+
+      retry_transient_exceptions do
+        with_exception_class_conversion do
+          @cache.get(key, raw: true) == CACHE_VALUE
+        end
       end
     end
 
@@ -34,6 +43,14 @@ module Twingly
       Digest::MD5.digest(url)
     end
 
+    def default_cache
+      retry_transient_exceptions do
+        with_exception_class_conversion do
+          Dalli::Client.new(servers, options)
+        end
+      end
+    end
+
     def options
       {
         username: ENV.fetch("MEMCACHIER_USERNAME") { },
@@ -45,8 +62,19 @@ module Twingly
     end
 
     def servers
-      ENV.fetch("MEMCACHIER_SERVERS").split(",")
+      ENV.fetch("MEMCACHIER_SERVERS") { "localhost" }.split(",")
+    end
+
+    def with_exception_class_conversion
+      yield
+    rescue Dalli::RingError => error
+      raise ServerError, error.message
+    rescue Dalli::DalliError => error
+      raise Error, error.message
+    end
+
+    def retry_transient_exceptions(&block)
+      Retryable.retryable(tries: 3, on: ServerError, &block)
     end
   end
 end
-

data/lib/twingly/url_cache/version.rb

@@ -1,5 +1,5 @@
 module Twingly
   class UrlCache
-    VERSION = "1.0.1"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-url_cache
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli
@@ -122,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: URL cache, remember if an URL been seen before