valkey-objects 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a876de8020a0d8f8c5830d9d632c23b488ae935a27e286af7b186ef181f4ef
-  data.tar.gz: 7ee8daf5fe4ec9f04319eca9056ab384684faf004160b0a66c397ae006e322c6
+  metadata.gz: 1c9ee2ffcc565ef127499ebbca13af2561bc8cf20b624d951b279f698ecd2363
+  data.tar.gz: 5408e161d38630e5d60eed393a4f053b57bb2bd4d9868fcb45792fb0f33f1683
 SHA512:
-  metadata.gz: 592b2de00bde7253cab8b05b9336babe2d097ef5397f152d93d5dc240d3830726e444bf0e798519dbe6849f9723a5b6ad17f0215ec782167061523922c1f7a11
-  data.tar.gz: 16063b655a6074001129db77e12a00fc18eccc6a74b1af01a60a1644eb9eccf36a4adea2be97a12defaa4c4882c131f75cc0cda78c23c10dece597e0ee719cef
+  metadata.gz: 503fa253eb7d383b88d8aa4a9efca028f1a181e9c6aa14925ea4eefc99938538073a964c164e70832962a6b136294258abc8482029c04c1b9d9b4650047191fb
+  data.tar.gz: 7eebd37730a11425a5f1b3917492f9c5c437fc40c18f995a83c1d71555a47eee1bd00265a3e8bbeff51999e6b58883ef55e21297b02b32ee119702cc0c1453ef

data/lib/valkey/objects/version.rb

@@ -2,6 +2,6 @@
 
 module Valkey
   module Objects
-    VERSION = "0.2.7"
+    VERSION = "0.3.0"
   end
 end

data/lib/valkey/objects.rb

@@ -2,12 +2,13 @@
 
 require_relative "objects/version"
 
-require 'connection_pool'
+#require 'connection_pool'
 require 'redis-client'
 require 'json'
-require 'ruby-duration'
 require 'amatch'
 require 'ap'
+require 'yaml'
+
 module VK
 
   @@XX = {}
@@ -183,57 +184,30 @@ module VK
     @id
   end
 
-  module AGO
-    class Error < StandardError; end
-    class Clock
-      def initialize t
-        @t = AGO.now
-        @s = @t.to_i - t.to_i
-        @t = Time.new(t.to_i).utc
-        @d = Duration.new(@s.abs)
-      end
-      def to_i
-        @s
-      end
-      def to_s *s
-        if s[0]
-          @d.format(s[0])
-        else
-          @d.format('%w %~w %d %~d %H:%M:%S')
-        end
-      end
-    end
-    def self.now
-      Time.now.utc
-    end
-    def self.[] k
-      Clock.new(k)
-    end
-  end
-
   def self.at epoch
     Time.at epoch
   end
   
   def self.clock *t
     if t[0]
-      AGO[t[0]]
+      Time.now.utc.to_i - t[0].to_i
     else
-      AGO.now
+      Time.now.utc.to_i
     end
   end
   
   def self.redis
-    @redis ||= ConnectionPool::Wrapper.new do
+    #@redis ||= ConnectionPool::Wrapper.new do
       RedisClient.config(host: "127.0.0.1", port: 6379, db: 0).new_client
-    end
+    #end
   end
 
   class O
     attr_reader :key
     def initialize k, h={}
       @key = k
-      @opts = h 
+      @opts = h
+#      puts %[VK #{@key} #{h}]
       if @opts.has_key?(:ttl)
         expire @opts[:ttl]
       end
@@ -244,16 +218,16 @@ module VK
     def expire sec
       VK.redis.call("EXPIRE", key, sec);
     end
-  end
-
-  class TIMESTAMP < O
     def value
       x = VK.redis.call("GET", key);
       if @opts.has_key?(:flush) == true
         delete!
       end
       return x
-    end
+    end    
+  end
+
+  class TIMESTAMP < O
     def value!
       VK.redis.call("SET", key, "#{VK.clock.to_i}");
     end
@@ -270,10 +244,11 @@ module VK
   
   class TOGGLE < O
     def value
-      VK.redis.call("GET", key) == 'true' ? true : false
+      x = VK.redis.call("GET", key) == 'true' ? true : false
       if @opts.has_key?(:flush) == true
         delete!
       end
+      return x
     end
     def exist?                                                                                                                                        
       VK.redis.call("GET", key) ? true : false                                                                                                        
@@ -282,7 +257,7 @@ module VK
        VK.redis.call("SET", key, "#{x.to_s}")
     end
     def value!
-      if self.value
+      if self.value == true || self.value == nil
         self.value = false
       else
         self.value = true
@@ -292,10 +267,11 @@ module VK
   
   class VALUE < O
     def value
-      VK.redis.call("GET", key)
+      x = VK.redis.call("GET", key)
       if @opts.has_key?(:flush) == true
         delete!
       end
+      return x.to_f
     end
     def value= x
       VK.redis.call("SET", key, x)
@@ -340,6 +316,11 @@ module VK
       VK.redis.call("SET", kk, i);
       VK.redis.call("RPUSH", key, kk)
     end
+    def []= k,v
+      kk = %[#{@key}-#{k}]
+	  VK.redis.call("SET", kk, v)
+	  VK.redis.call("RPUSH", key, kk);
+    end
     def nearest p
       h = {}
       value { |i,v|
@@ -361,22 +342,23 @@ module VK
   
   class COUNTER < O
     def incr n
-      VK.redis.call("SET", key, value + n.to_f)
+      VK.redis.call("SET", @key, value + n.to_f)
     end
     def decr n
-      VK.redis.call("SET", key, value + n.to_f)
+      VK.redis.call("SET", @key, value + n.to_f)
     end    
     def value
-      VK.redis.call("GET", key).to_f
+      x = VK.redis.call("GET", @key).to_f
       if @opts.has_key?(:flush) == true                                                                                                               
         delete!                                                                                                                                       
-      end      
+      end
+      return x
     end
     def value= n
-      VK.redis.call("SET", key, n.to_f)
+      VK.redis.call("SET", @key, n.to_f)
     end
     def exist?                                                                                                                                        
-      VK.redis.call("GET", key) ? true : false                                                                                                        
+      VK.redis.call("GET", @key) ? true : false                                                                                                        
     end    
   end
   

data/valkey-objects.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
+  
   spec.add_dependency "redis-client"
   spec.add_dependency "json"
   spec.add_dependency "ruby-duration"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: valkey-objects
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Erik Olson
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -117,7 +116,6 @@ metadata:
   homepage_uri: https://github.com/xorgnak/valkey-client
   source_code_uri: https://github.com/xorgnak/valkey-client
   changelog_uri: https://github.com/xorgnak/valkey-client
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: A ruby valkey client inspired by the redis-objects gem.
 test_files: []