jakimowicz-longurl 0.0.2 → 0.0.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 0
 :minor: 0

data/lib/longurl/expand.rb

@@ -6,7 +6,7 @@ module LongURL
     # First, expand will try to expand url using longurl.org service.
     # Then, it will try to direct follow redirections on the given url and returns final one.
     # === Options
-    # * <tt>:cache</tt> : cache object to use, must implement get and set functions. See LongURL::Cache.
+    # * <tt>:cache</tt> : cache object to use, must implement [] and []= functions.
     # === Types
     # <tt>url</tt> is expected to be a String and returns a String with the url.
     # === Examples

data/lib/longurl/expander.rb

@@ -29,9 +29,9 @@ module LongURL
   class Expander
     # Initialize a new Expander.
     # === Options
-    # * <tt>:cache</tt>: define a cache which Expander can use. It must implements set and get methods like LongURL::Cache.
+    # * <tt>:cache</tt>: define a cache which Expander can use. It must implements [] and []= methods.
     def initialize(options = {})
-      @@cache = options[:cache] || LongURL::Cache.new
+      @@cache = options[:cache] || Hash.new
       @@service = Service.new(:cache => @@cache)
     end
     
@@ -45,7 +45,7 @@ module LongURL
     # Try to directly resolve url using LongURL::Direct to get final redirection.
     # This call is cached.
     def direct_resolution(url)
-      @@cache.get(url) || @@cache.set(url, Direct.follow_redirections(url))
+      @@cache[url] ||= Direct.follow_redirections(url)
     end
     
     # Expand given url using LongURL::Service only. If given url is not a expandable url, it will still be given to Service.

data/lib/longurl/service.rb

@@ -11,10 +11,8 @@ module LongURL
   class Service
     
     def initialize(params = {})
-      @@cache = params[:cache]
-
-      @@supported_services = @@cache.get('supported_services')
-      @@supported_services ||= @@cache.set('supported_services', fetch_supported_services)
+      @@cache = params[:cache] || Hash.new
+      @@supported_services = cached_or_fetch_supported_services
     end
     
     def query_supported_service_only(url)
@@ -46,6 +44,10 @@ module LongURL
 
     protected
     
+    def cached_or_fetch_supported_services
+      @@cache['supported_services'] ||= fetch_supported_services
+    end
+    
     def check_and_escape(url)
       check url
       CGI.escape url

data/lib/longurl.rb

@@ -6,6 +6,5 @@ require 'longurl/constants'
 require 'longurl/exceptions'
 require 'longurl/service'
 require 'longurl/direct'
-require 'longurl/cache'
 require 'longurl/expander'
 require 'longurl/expand'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jakimowicz-longurl
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Fabien Jakimowicz