canonicurl 0.0.6 → 0.0.7

data/lib/canonicurl/cache.rb

@@ -6,7 +6,6 @@ module Canonicurl
   class Cache
     CANONICAL  = 'C'
     ERROR      = 'E'
-    LOCKED     = 'L'
     RESOLVING  = 'R'
 
     TTL = 60 * 60 * 24 * 90 # 90 days ~ 3 months
@@ -38,21 +37,19 @@ module Canonicurl
 
     def fetch(url, resolver)
       k = key(url)
-      @db.setnx(k, LOCKED) #  lock it if key doesn't exist
+
+      # New URL resolve it
+      if @db.setnx(k, RESOLVING) #  lock it if key doesn't exist
+        return resolve(url, k, resolver)
+      end
 
       result = @db.get(k)
       if !result.nil? && result.size > 1
-        return result
+        return result # Found old noncanonical URL mapping
       end
 
-      case result
-      when CANONICAL
-        url
-      when LOCKED
-        resolve(url, k, resolver)
-      else
-        result
-      end
+      # CANONICAL, ERROR or RESOLVING
+      result == CANONICAL ? url : result
     end
 
 

data/lib/canonicurl/version.rb

@@ -1,3 +1,3 @@
 module Canonicurl
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: canonicurl
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - David Dai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 Z
+date: 2011-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis