Set default values on type initialization

Author: lewispb

lib/kredis.rb

@@ -8,6 +8,7 @@
 require "kredis/log_subscriber"
 require "kredis/namespace"
 require "kredis/type_casting"
+require "kredis/default_values"
 require "kredis/types"
 require "kredis/attributes"
 

lib/kredis/attributes.rb

@@ -2,8 +2,8 @@ module Kredis::Attributes
   extend ActiveSupport::Concern
 
   class_methods do
-    def kredis_proxy(name, key: nil, default: nil, config: :shared, after_change: nil)
-      kredis_connection_with __method__, name, key, default: default, config: config, after_change: after_change
+    def kredis_proxy(name, key: nil, config: :shared, after_change: nil)
+      kredis_connection_with __method__, name, key, config: config, after_change: after_change
     end
 
     def kredis_string(name, key: nil, default: nil, config: :shared, after_change: nil, expires_in: nil)

lib/kredis/default_values.rb

@@ -0,0 +1,28 @@
+module Kredis::DefaultValues
+  extend ActiveSupport::Concern
+
+  prepended do
+    attr_writer :default
+
+    def default
+      case @default
+      when Proc   then @default.call
+      when Symbol then send(@default)
+      else @default
+      end
+    end
+
+    private
+      def set_default
+        raise NotImplementedError, "Kredis type #{self.class} needs to define #set_default"
+      end
+  end
+
+  def initialize(...)
+    super
+
+    if default.present? && !exists?
+      set_default
+    end
+  end
+end

lib/kredis/types.rb

@@ -1,8 +1,8 @@
 module Kredis::Types
   autoload :CallbacksProxy, "kredis/types/callbacks_proxy"
 
-  def proxy(key, default: nil, config: :shared, after_change: nil)
-    type_from(Proxy, config, key, after_change: after_change, default: default)
+  def proxy(key, config: :shared, after_change: nil)
+    type_from(Proxy, config, key, after_change: after_change)
   end
 
 
@@ -71,8 +71,8 @@ def set(key, default: nil, typed: :string, config: :shared, after_change: nil)
     type_from(Set, config, key, after_change: after_change, default: default, typed: typed)
   end
 
-  def ordered_set(key, typed: :string, limit: nil, config: :shared, after_change: nil)
-    type_from(OrderedSet, config, key, after_change: after_change, typed: typed, limit: limit)
+  def ordered_set(key, default: nil, typed: :string, limit: nil, config: :shared, after_change: nil)
+    type_from(OrderedSet, config, key, after_change: after_change, default: default, typed: typed, limit: limit)
   end
 
   def slot(key, config: :shared, after_change: nil)

lib/kredis/types/counter.rb

@@ -1,30 +1,34 @@
 class Kredis::Types::Counter < Kredis::Types::Proxying
+  prepend Kredis::DefaultValues
+
   proxying :multi, :set, :incrby, :decrby, :get, :del, :exists?
 
   attr_accessor :expires_in
 
   def increment(by: 1)
-    init_default_in_multi { incrby by }
+    multi do
+      set 0, ex: expires_in, nx: true
+      incrby by
+    end[-1]
   end
 
   def decrement(by: 1)
-    init_default_in_multi { decrby by }
+    multi do
+      set 0, ex: expires_in, nx: true
+      decrby by
+    end[-1]
   end
 
   def value
-    (get || default).to_i
+    get.to_i
   end
 
   def reset
     del
   end
 
   private
-    def set_default(value)
-      set value.to_i, ex: expires_in, nx: true
-    end
-
-    def default
-      super.to_i
+    def set_default
+      increment by: default
     end
 end

lib/kredis/types/enum.rb

@@ -1,7 +1,9 @@
 require "active_support/core_ext/object/inclusion"
 
 class Kredis::Types::Enum < Kredis::Types::Proxying
-  proxying :set, :get, :del, :exists?
+  prepend Kredis::DefaultValues
+
+  proxying :set, :get, :del, :exists?, :multi
 
   attr_accessor :values
 
@@ -17,11 +19,14 @@ def value=(value)
   end
 
   def value
-    get || default.presence_in(values)
+    get
   end
 
   def reset
-    del
+    multi do
+      del
+      set_default
+    end
   end
 
   private
@@ -31,4 +36,8 @@ def define_predicates_for_values
         define_singleton_method("#{defined_value}!") { self.value = defined_value }
       end
     end
+
+    def set_default
+      self.value = default
+    end
 end

lib/kredis/types/flag.rb

@@ -1,4 +1,6 @@
 class Kredis::Types::Flag < Kredis::Types::Proxying
+  prepend Kredis::DefaultValues
+
   proxying :set, :exists?, :del
 
   attr_accessor :expires_in
@@ -14,4 +16,9 @@ def marked?
   def remove
     del
   end
+
+  private
+    def set_default
+      mark if default
+    end
 end

lib/kredis/types/hash.rb

@@ -1,37 +1,30 @@
 require "active_support/core_ext/hash"
 
 class Kredis::Types::Hash < Kredis::Types::Proxying
-  ZERO_FIELDS_ADDED = 0
+  prepend Kredis::DefaultValues
 
-  proxying :hset, :hdel, :hgetall, :del, :exists?, :multi, :callnx
+  proxying :hget, :hset, :hmget, :hdel, :hgetall, :hkeys, :hvals, :del, :exists?
 
   attr_accessor :typed
 
   def [](key)
-    string_to_type(entries[key], typed)
+    string_to_type(hget(key), typed)
   end
 
   def []=(key, value)
     update key => value
   end
 
-
   def update(**entries)
-    return ZERO_FIELDS_ADDED if entries.flatten.blank?
-
-    init_default_in_multi do
-      hset entries.transform_values{ |val| type_to_string(val, typed) }
-    end
+    hset entries.transform_values{ |val| type_to_string(val, typed) } if entries.flatten.any?
   end
 
   def values_at(*keys)
-    strings_to_types(entries.values_at(*keys) || [], typed)
+    strings_to_types(hmget(keys) || [], typed)
   end
 
   def delete(*keys)
-    return ZERO_FIELDS_ADDED if keys.flatten.blank?
-
-    init_default_in_multi { hdel keys }
+    hdel keys if keys.flatten.any?
   end
 
   def remove
@@ -40,20 +33,20 @@ def remove
   alias clear remove
 
   def entries
-    (hgetall.presence || default || {}).transform_values { |val| string_to_type(val, typed) }.with_indifferent_access
+    (hgetall || {}).transform_values { |val| string_to_type(val, typed) }.with_indifferent_access
   end
   alias to_h entries
 
   def keys
-    entries.keys || []
+    hkeys || []
   end
 
   def values
-    strings_to_types(entries.values || [], typed)
+    strings_to_types(hvals || [], typed)
   end
 
   private
-    def set_default(entries)
-      callnx(:hset, entries.transform_values{ |val| type_to_string(val, typed) })
+    def set_default
+      update **default
     end
 end

lib/kredis/types/list.rb

@@ -1,45 +1,38 @@
 class Kredis::Types::List < Kredis::Types::Proxying
-  proxying :lrange, :lrem, :lpush, :rpush, :exists?, :del, :callnx
+  prepend Kredis::DefaultValues
+
+  proxying :lrange, :lrem, :lpush, :ltrim, :rpush, :exists?, :del
 
   attr_accessor :typed
 
   def elements
-    values = init_default_in_multi { lrange(0, -1) }
-    strings_to_types(values || [], typed)
+    strings_to_types(lrange(0, -1) || [], typed)
   end
   alias to_a elements
 
   def remove(*elements)
-    return [] if elements.flatten.blank?
-
-    init_default_in_multi do
-      types_to_strings(elements, typed).each { |element| lrem 0, element }
-    end
+    types_to_strings(elements, typed).each { |element| lrem 0, element }
   end
 
   def prepend(*elements)
-    return self.elements.count if elements.flatten.blank?
-
-    init_default_in_multi do
-      lpush types_to_strings(elements, typed)
-    end
+    lpush types_to_strings(elements, typed) if elements.flatten.any?
   end
 
   def append(*elements)
-    return self.elements.count if elements.flatten.blank?
-
-    init_default_in_multi do
-      rpush types_to_strings(elements, typed)
-    end
+    rpush types_to_strings(elements, typed) if elements.flatten.any?
   end
   alias << append
 
   def clear
     del
   end
 
+  def last(n = nil)
+    n ? lrange(-n, -1) : lrange(-1, -1).first
+  end
+
   private
-    def set_default(elements)
-      callnx(:rpush, types_to_strings(Array(elements), typed))
+    def set_default
+      append default
     end
 end

lib/kredis/types/ordered_set.rb

@@ -1,4 +1,6 @@
 class Kredis::Types::OrderedSet < Kredis::Types::Proxying
+  prepend Kredis::DefaultValues
+
   proxying :multi, :zrange, :zrem, :zadd, :zremrangebyrank, :zcard, :exists?, :del
 
   attr_accessor :typed
@@ -72,4 +74,8 @@ def trim(from_beginning:)
         zremrangebyrank(0, -(limit + 1))
       end
     end
+
+    def set_default
+      append default
+    end
 end