frivol 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a24e083670901a1e0114ec42a4da90f666ef23f
-  data.tar.gz: ce84cd346fde8137c233c18feb0e13858c1c5f41
+  metadata.gz: fb5b81ba6e03198c9bd7e33e3ce843dd3a0d48df
+  data.tar.gz: 1e2456b6e27f97eec9309fc7e638c498bc166f5a
 SHA512:
-  metadata.gz: d5bfd4d1406e56a839615cca1577f31fc900d4a8f23e2ca788bbcf0d2b5ea6507fc63f635a8db9de734a8a81083973ec0d8c1670338e0b66fd6c62805765b27e
-  data.tar.gz: f641d253e43ae8fe48ddb2bde13940289423bf877302c61d72b6d8b490feedbb1d84b2e3dc794dd03bcc0f85046979c3ee54e362cbb92390cb6c457bad5244fd
+  metadata.gz: 741f725ccee1f4fd43e5edde0d2de85500511c84c547dbc1af85baa2a8eff8cbc9498809d38a7c60e28d6d22eb86a43bfe42e0db74bd8e6087c1cfa8f7f4e3da
+  data.tar.gz: 0d1cc7ddeaffc023ccb1449a28e1ce9b9f536667d2fea6c3f7f2e5ed96663162905dc009114adef5dcb7ea38cb2cc8a2b8594f1e95ba37261efc7e0383397a73

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/frivol.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: frivol 0.3.0 ruby lib
+# stub: frivol 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "frivol"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/frivol/config.rb

@@ -13,6 +13,7 @@ module Frivol
     #   Frivol::Config.redis_config = REDIS_CONFIG
     def self.redis_config=(config)
       @@redis_config = config
+      @@redis_version = nil
       Thread.current[:frivol_redis] = nil
     end
 
@@ -21,6 +22,14 @@ module Frivol
       Thread.current[:frivol_redis] ||= Redis.new(@@redis_config)
     end
 
+    def self.redis_version
+      redis.info('server')['redis_version'].to_f
+    end
+
+    def self.requires_expiry_reset?
+      redis_version < 2.2
+    end
+
     def self.allow_json_create
       @@allow_json_create ||= []
     end

data/lib/frivol/helpers.rb

@@ -39,13 +39,19 @@ module Frivol
       time = instance.class.storage_expiry(bucket)
       if time == Frivol::NEVER_EXPIRE
         Frivol::Config.redis[key] = value
-      else
+      elsif Frivol::Config.requires_expiry_reset?
+        time = redis.ttl(key).to_i unless is_new
         Frivol::Config.redis.multi do |redis|
-          # TODO: write test for the to_i bug fix
-          time = redis.ttl(key).to_i unless is_new
           redis[key] = value
           redis.expire(key, time)
         end
+      elsif is_new
+        Frivol::Config.redis.multi do |redis|
+          redis[key] = value
+          redis.expire(key, time)
+        end
+      else
+        Frivol::Config.redis[key] = value
       end
     end
 

data/lib/frivol/time_extensions.rb

@@ -5,12 +5,17 @@ require 'time'
 # serialized by <tt>MultiJson#dump</tt> and deserialized by
 # <tt>MultiJson#load</tt>.
 class Time
-  # Serialize to JSON
-  def to_json(*a)
-    MultiJson.dump(
+  # Rails support
+  def as_json(*a)
+    {
       'json_class'   => self.class.name,
       'data'         => self.to_s
-    )
+    }
+  end
+
+  # Serialize to JSON
+  def to_json(*a)
+    MultiJson.dump(as_json(*a))
   end
 
   # Deserialize from JSON
@@ -27,12 +32,17 @@ begin
   # instances to be serialized by <tt>MultiJson#dump</tt> and deserialized by
   # <tt>MultiJson#load</tt>.
   class ActiveSupport::TimeWithZone
-    # Serialize to JSON
-    def to_json(*a)
-      MultiJson.dump(
+    # Rails support
+    def as_json(*a)
+      {
         'json_class'   => self.class.name,
         'data'         => self.to_s
-      )
+      }
+    end
+
+    # Serialize to JSON
+    def to_json(*a)
+      MultiJson.dump(as_json(*a))
     end
 
     # Deserialize from JSON

data/test/fake_redis.rb

@@ -4,6 +4,7 @@ class Redis
   def initialize(config)
     @storage = {}
     @expires = Hash.new(nil)
+    @version = config[:version] || "2.2.0"
   end
 
   def [](key)
@@ -18,6 +19,10 @@ class Redis
     @expires.delete key
   end
 
+  def info(key)
+    { 'redis_version' => @version }
+  end
+
   def del(key)
     # puts "del #{key}"
     @storage.delete key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frivol
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Marc Heiligers