coffee_table 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9188a9c93433bdb8536b896596edddc849ea371
-  data.tar.gz: 5ffe54d715027e0a9f6211f3d4690c77387791d1
+  metadata.gz: 4cb5c9e9f996f2b3eb05c490f33c7354ff26836a
+  data.tar.gz: 9225f27d155e088628f766272b3ab5f664a2b38b
 SHA512:
-  metadata.gz: d2b0db9cc4204fab712e20bbe3033018bf7d952d3d0bd1ab8c51b2b21c8f48b5107185627051f832523d1b93783d6c030cd2be54efca10e1309329b3aa1dcc50
-  data.tar.gz: 8a4af84563f560560566e74e678a517fa7ffad8ee4ae2502e433e8469366d86833e5caa6ef8e82bee1b2ed8706fb1809454a7ff08096c1b8d904dd21cc44d294
+  metadata.gz: 40872384ec30a13e2c964c39e7bd374aa15471db0b2cfdb4649655d52129d4d2629b3e1494fe70863c8f4fb98740a66c44054bb3b4bdc9e3c2e8de52663d9c2e
+  data.tar.gz: c8f33be7b34a580d83298bc9c887511550f7767e0fe18c41053d2898a4451fa1e3eb8980ad670bc46daa9393d45f68db3ad0c48fb1d05fb58d7fcdb6be459073

data/lib/coffee_table.rb

@@ -71,37 +71,39 @@ module CoffeeTable
 
       # if first related_object is integer or fixnum it is used as an expiry time for the cache object
       key = CoffeeTable::Key.new(initial_key, block_key, flags, related_objects)
-
       if @options[:enable_cache]
         if options.has_key?(:expiry)
           expiry = options[:expiry]
         else
           expiry = nil
         end
-
-        @redis.sadd "cache_keys", key unless @redis.sismember "cache_keys", key.to_s
         if @redis.exists(key.to_s)
-          if key.options[:compressed]
-            result = marshal_value(@redis.get(key.to_s).gunzip)
-          else
-            result = marshal_value(@redis.get(key.to_s))
-          end
+          result = marshal_value(@redis.get(key.to_s))
         else
-          result = yield
-
-          compress_result = @options[:compress_content] && result.kind_of?(String) && result.length > @options[:compress_min_size]
-
-          if compress_result
-            key.add_flag(:compressed => true)
-            @redis.set key.to_s, Marshal.dump(result.gzip)
+          key.add_flag(:compressed => true)
+          if @redis.exists(key.to_s)
+            result = marshal_value(@redis.get(key.to_s)).gunzip
           else
-            @redis.set key.to_s, Marshal.dump(result)
-          end
+            key.remove_flag(:compressed)
+            result = yield
+
+            compress_result = @options[:compress_content] && result.kind_of?(String) && result.length > @options[:compress_min_size]
+
+            if compress_result
+              key.add_flag(:compressed => true)
+              @redis.sadd "cache_keys", key.to_s
+              @redis.set(key.to_s, Marshal.dump(result.gzip))
+            else
+              @redis.sadd "cache_keys", key.to_s
+              @redis.set(key.to_s, Marshal.dump(result))
+            end
 
-          unless expiry.nil?
-            @redis.expire key.to_s, expiry
-            @scheduler.in "#{expiry}s" do
-              @redis.srem "cache_keys", key.to_s
+            unless expiry.nil?
+              @redis.expire key.to_s, expiry
+              @scheduler.in "#{expiry}s" do
+                @redis.del(key.to_s)
+                @redis.srem "cache_keys", key.to_s
+              end
             end
           end
         end

data/lib/coffee_table/key.rb

@@ -41,6 +41,9 @@ module CoffeeTable
     def add_flag(options)
       @options.merge!(options)
     end
+    def remove_flag(key)
+      @options.delete key
+    end
 
     def elements
       @elements
@@ -88,4 +91,4 @@ module CoffeeTable
       end
     end
   end
-end
+end

data/lib/coffee_table/version.rb

@@ -1,3 +1,3 @@
 module CoffeeTable
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffee_table
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Stewart McKee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec