kredis 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8c81a934c4d3b042045d49c96450e86c681529411fe5de467698d213f66bf21
-  data.tar.gz: b5d81f606b35fa29ebccd67940c4fd8d6f01c59d5957b0f3fb5aabf06c0f3896
+  metadata.gz: 57c373219f474818bb85a7da4ef3a07bd4910cd685704b54549969c364ee5993
+  data.tar.gz: f220ce448caa279514e249bc7c2f744c7276946d5f5af5a9899a9f6e14d3b5be
 SHA512:
-  metadata.gz: 8dff036d7c5dfecb9e755d991419622cc2456a7eb4f79ea7a1a317156fc5ba87525b339f92726a19062c43716c23dce707ab1ec80253852dc79fed7a48cfade3
-  data.tar.gz: 64928a2e0d7c9ada0a51515dc8405339f053b5579f0cd57f109a52a38e23461a9be164db72c5fbb0eb0af8ff8fee3fb813e21c468b0d3e90c4a6a75747d7b777
+  metadata.gz: ef637b80601d21e815317201ab426da35a56926a2d069303cf1244e5a51f4ab0f80f7ef6e47a566d306248bbc2006c8a0dcdfd6990e0abf3057b5474ba7b6fc0
+  data.tar.gz: 99e4587242b125cfc78deff59e410055f9fefbfce726942ce1192e6065a6e08c1cfd0d83d409221c54418803b4405643ce8f873de8fbb0ef0c781ba882625c0e

data/lib/kredis.rb

@@ -4,11 +4,17 @@ require "kredis/connections"
 require "kredis/types"
 require "kredis/attributes"
 require "kredis/namespace"
+require "kredis/logger"
 
 module Kredis
   include Connections
   include Namespace
   include Types
+  include Logger
 
   extend self
+
+  def redis(config: :shared)
+    configured_for(config)
+  end
 end

data/lib/kredis/attributes.rb

@@ -2,38 +2,50 @@ module Kredis::Attributes
   extend ActiveSupport::Concern
 
   class_methods do
-    def kredis_list(name, config: :shared)
+    def kredis_proxy(name, key: nil, config: :shared)
+      ivar_symbol = :"@#{name}_kredis_proxy"
+
+      define_method(name) do
+        if instance_variable_defined?(ivar_symbol)
+          instance_variable_get(ivar_symbol)
+        else
+          instance_variable_set(ivar_symbol, Kredis.proxy(kredis_key_evaluated(key) || kredis_key_for_attribute(name), config: config))
+        end
+      end
+    end
+
+    def kredis_list(name, key: nil, config: :shared)
       ivar_symbol = :"@#{name}_kredis_list"
 
       define_method(name) do
         if instance_variable_defined?(ivar_symbol)
           instance_variable_get(ivar_symbol)
         else
-          instance_variable_set(ivar_symbol, Kredis.list(kredis_key_for_attribute(name), config: config))
+          instance_variable_set(ivar_symbol, Kredis.list(kredis_key_evaluated(key) || kredis_key_for_attribute(name), config: config))
         end
       end
     end
 
-    def kredis_unique_list(name, limit: nil, config: :shared)
+    def kredis_unique_list(name, limit: nil, key: nil, config: :shared)
       ivar_symbol = :"@#{name}_kredis_unique_list"
 
       define_method(name) do
         if instance_variable_defined?(ivar_symbol)
           instance_variable_get(ivar_symbol)
         else
-          instance_variable_set(ivar_symbol, Kredis.unique_list(kredis_key_for_attribute(name), limit: limit, config: config))
+          instance_variable_set(ivar_symbol, Kredis.unique_list(kredis_key_evaluated(key) || kredis_key_for_attribute(name), limit: limit, config: config))
         end
       end
     end
 
-    def kredis_flag(name, config: :shared)
+    def kredis_flag(name, key: nil, config: :shared)
       ivar_symbol = :"@#{name}_kredis_flag"
 
       define_method(name) do
         if instance_variable_defined?(ivar_symbol)
           instance_variable_get(ivar_symbol)
         else
-          instance_variable_set(ivar_symbol, Kredis.flag(kredis_key_for_attribute(name), config: config))
+          instance_variable_set(ivar_symbol, Kredis.flag(kredis_key_evaluated(key) || kredis_key_for_attribute(name), config: config))
         end
       end
 
@@ -41,10 +53,41 @@ module Kredis::Attributes
         instance_variable_defined?(ivar_symbol) && instance_variable_get(ivar_symbol).marked?
       end
     end
+
+    def kredis_string(name, key: nil, config: :shared)
+      ivar_symbol = :"@#{name}_kredis_string"
+
+      define_method(name) do
+        if instance_variable_defined?(ivar_symbol)
+          instance_variable_get(ivar_symbol)
+        else
+          instance_variable_set(ivar_symbol, Kredis.string(kredis_key_evaluated(key) || kredis_key_for_attribute(name), config: config))
+        end
+      end
+    end
+
+    def kredis_integer(name, key: nil, config: :shared)
+      ivar_symbol = :"@#{name}_kredis_integer"
+
+      define_method(name) do
+        if instance_variable_defined?(ivar_symbol)
+          instance_variable_get(ivar_symbol)
+        else
+          instance_variable_set(ivar_symbol, Kredis.integer(kredis_key_evaluated(key) || kredis_key_for_attribute(name), config: config))
+        end
+      end
+    end
   end
 
   private
-    def kredis_key_for_attribute(name)
+    def kredis_key_evaluated(key)
+      case key
+      when String then key
+      when Proc   then key.call(self)
+      end
+    end
+
+    def kredis_key_for_attribute(name, key: nil)
       "#{self.class.name.tableize.gsub("/", ":")}:#{id}:#{name}"
     end
 end

data/lib/kredis/logger.rb

@@ -0,0 +1,5 @@
+require "redis"
+
+module Kredis::Logger
+  mattr_accessor :logger
+end

data/lib/kredis/railtie.rb

@@ -12,6 +12,10 @@ module Kredis
       end
     end
 
+    initializer "kredis.logger" do
+      Kredis.logger = Rails.logger
+    end
+
     initializer "kredis.configurator" do
       Kredis.configurator = Rails.application
     end

data/lib/kredis/types.rb

@@ -1,6 +1,6 @@
 module Kredis::Types
-  def keyed(key, config: :shared)
-    Kredis::Proxy.new configured_for(config), namespaced_key(key)
+  def proxy(key, config: :shared)
+    Kredis::Types::Proxy.new configured_for(config), namespaced_key(key)
   end
 
   def list(key, config: :shared)
@@ -19,14 +19,24 @@ module Kredis::Types
     Flag.new configured_for(config), namespaced_key(key)
   end
 
+  def string(key, config: :shared)
+    Kredis::Types::String.new configured_for(config), namespaced_key(key)
+  end
+
+  def integer(key, config: :shared)
+    Kredis::Types::Integer.new configured_for(config), namespaced_key(key)
+  end
+
   def mutex(key, expires_in: nil, config: :shared)
     Mutex.new configured_for(config), namespaced_key(key), expires_in: expires_in
   end
 end
 
-require "kredis/proxy"
+require "kredis/types/proxy"
 require "kredis/types/list"
 require "kredis/types/unique_list"
 require "kredis/types/counter"
 require "kredis/types/flag"
+require "kredis/types/string"
+require "kredis/types/integer"
 require "kredis/types/mutex"

data/lib/kredis/types/counter.rb

@@ -1,4 +1,4 @@
-class Kredis::Types::Counter < Kredis::Proxy
+class Kredis::Types::Counter < Kredis::Types::Proxy
   def initialize(redis, key, expires_in: nil)
     @expires_in = expires_in
     super redis, key

data/lib/kredis/types/flag.rb

@@ -1,4 +1,4 @@
-class Kredis::Types::Flag < Kredis::Proxy
+class Kredis::Types::Flag < Kredis::Types::Proxy
   def mark
     set 1
   end

data/lib/kredis/types/integer.rb

@@ -0,0 +1,9 @@
+class Kredis::Types::Integer < Kredis::Types::String
+  def value
+    get&.to_i
+  end
+
+  def to_s
+    value.to_s
+  end
+end

data/lib/kredis/types/list.rb

@@ -1,4 +1,4 @@
-class Kredis::Types::List < Kredis::Proxy
+class Kredis::Types::List < Kredis::Types::Proxy
   def elements
     lrange(0, -1) || []
   end

data/lib/kredis/types/mutex.rb

@@ -1,4 +1,4 @@
-class Kredis::Types::Mutex < Kredis::Proxy
+class Kredis::Types::Mutex < Kredis::Types::Proxy
   def initialize(redis, key, expires_in: nil)
     @expires_in = expires_in
     super redis, key

data/lib/kredis/{proxy.rb → types/proxy.rb}

@@ -1,4 +1,4 @@
-class Kredis::Proxy
+class Kredis::Types::Proxy
   def initialize(redis, key)
     @redis, @key = redis, key
   end
@@ -8,6 +8,7 @@ class Kredis::Proxy
   end
 
   def method_missing(method, *args, **kwargs)
+    Kredis.logger&.debug "[Kredis] #{method} #{@key} #{args.inspect if args.compact_blank.any?} #{kwargs.inspect if kwargs.compact_blank.any?}".chomp
     @redis.public_send method, @key, *args, **kwargs
   end
 end

data/lib/kredis/types/string.rb

@@ -0,0 +1,21 @@
+class Kredis::Types::String < Kredis::Types::Proxy
+  def assign=(value)
+    set value
+  end
+
+  def assigned?
+    exists?
+  end
+
+  def value
+    get
+  end
+
+  def to_s
+    value
+  end
+
+  def clear
+    del
+  end
+end

data/lib/kredis/version.rb

@@ -1,3 +1,3 @@
 module Kredis
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kredis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kasper Timm Hansen
@@ -50,14 +50,17 @@ files:
 - lib/kredis.rb
 - lib/kredis/attributes.rb
 - lib/kredis/connections.rb
+- lib/kredis/logger.rb
 - lib/kredis/namespace.rb
-- lib/kredis/proxy.rb
 - lib/kredis/railtie.rb
 - lib/kredis/types.rb
 - lib/kredis/types/counter.rb
 - lib/kredis/types/flag.rb
+- lib/kredis/types/integer.rb
 - lib/kredis/types/list.rb
 - lib/kredis/types/mutex.rb
+- lib/kredis/types/proxy.rb
+- lib/kredis/types/string.rb
 - lib/kredis/types/unique_list.rb
 - lib/kredis/version.rb
 homepage: https://github.com/rails/kredis