lite-redis 1.2.0 → 1.3.0

data/lib/lite/redis/sorted_set.rb

@@ -2,10 +2,134 @@
 
 module Lite
   module Redis
-    class SortedSet < Lite::Redis::Base
+    class SortedSet < Base
 
-      extend Lite::Redis::SortedSetHelper
-      include Lite::Redis::SortedSetHelper
+      def find(key, position, opts = {})
+        position -= 1
+        value = client.zrange(key.to_s, position, position, **opts)
+        value.first
+      end
+
+      def find_score(key, position, opts = {})
+        value = client.zrangebyscore(key.to_s, position, position, **opts)
+        value.first
+      end
+
+      def first(key, opts = {})
+        value = client.zrange(key.to_s, 0, 0, **opts)
+        value.first
+      end
+
+      def first_score(key, opts = {})
+        value = client.zrangebyscore(key.to_s, 1, 1, **opts)
+        value.first
+      end
+
+      def last(key, opts = {})
+        value = client.zrevrange(key.to_s, 0, 0, **opts)
+        value.first
+      end
+
+      def last_score(key, opts = {})
+        value = client.zrevrangebyscore(key.to_s, 1, 1, **opts)
+        value.first
+      end
+
+      def between(key, start, finish, opts = {})
+        client.zrange(key.to_s, start - 1, finish - 1, **opts)
+      end
+
+      def between_reverse(key, start, finish, opts = {})
+        client.zrevrange(key.to_s, start - 1, finish - 1, **opts)
+      end
+
+      def between_scores(key, min, max, opts = {})
+        client.zrangebyscore(key.to_s, min, max, **opts)
+      end
+
+      def between_scores_reverse(key, min, max, opts = {})
+        client.zrevrangebyscore(key.to_s, min, max, **opts)
+      end
+
+      def between_lex(key, min, max, opts = {})
+        client.zrangebylex(key.to_s, min, max, **opts)
+      end
+
+      def between_lex_reverse(key, min, max, opts = {})
+        client.zrevrangebylex(key.to_s, min, max, **opts)
+      end
+
+      def all(key, opts = {})
+        client.zrange(key.to_s, 0, -1, **opts)
+      end
+
+      def all_reverse(key, opts = {})
+        client.zrevrange(key.to_s, 0, -1, **opts)
+      end
+
+      def position(key, value)
+        value = client.zrank(key.to_s, value)
+        value += 1 unless value.nil?
+        value
+      end
+
+      def position_reverse(key, value)
+        value = client.zrevrank(key.to_s, value)
+        value += 1 unless value.nil?
+        value
+      end
+
+      def score(key, value)
+        client.zscore(key.to_s, value)
+      end
+
+      def count(key)
+        client.zcard(key.to_s)
+      end
+
+      def count_between(key, min, max)
+        client.zcount(key.to_s, min, max)
+      end
+
+      def create(key, *args)
+        client.zadd(key.to_s, args)
+      end
+
+      def create_intersection(key, keys, opts = {})
+        client.zinterstore(key.to_s, keys, **opts)
+      end
+
+      def create_combination(key, keys, opts = {})
+        client.zunionstore(key.to_s, keys, **opts)
+      end
+
+      def increment(key, value, count)
+        client.zincrby(key.to_s, count, value)
+      end
+
+      def decrement(key, value, count)
+        client.zincrby(key.to_s, -count.abs, value)
+      end
+
+      def destroy(key, at)
+        client.zrem(key.to_s, at)
+      end
+
+      def destroy_between(key, start, finish)
+        client.zremrangebyrank(key.to_s, start - 1, finish - 1)
+      end
+
+      def destroy_scores(key, min, max)
+        client.zremrangebyscore(key.to_s, min, max)
+      end
+
+      def destroy_lex(key, min, max, opts = {})
+        client.zrevrangebylex(key.to_s, max, min, **opts)
+      end
+
+      def scan(key, cursor, opts = {})
+        client.zscan(key.to_s, cursor, **opts)
+      end
 
     end
   end

data/lib/lite/redis/string.rb

@@ -2,10 +2,94 @@
 
 module Lite
   module Redis
-    class String < Lite::Redis::Base
+    class String < Base
 
-      extend Lite::Redis::StringHelper
-      include Lite::Redis::StringHelper
+      def find(key)
+        client.get(key.to_s)
+      end
+
+      def find_each(*args)
+        args = stringify_keys(*args)
+        client.mget(args)
+      end
+
+      def length(key)
+        client.strlen(key.to_s)
+      end
+
+      def split(key, start, finish)
+        client.getrange(key.to_s, start, finish)
+      end
+
+      def create(key, value, opts = {})
+        client.set(key.to_s, value, **opts)
+      end
+
+      def create!(key, value)
+        client.setnx(key.to_s, value)
+      end
+
+      def create_each(*args)
+        args = stringify_keys(*args)
+        client.mset(args)
+      end
+
+      def create_each!(*args)
+        args = stringify_keys(*args)
+        client.msetnx(args)
+      end
+
+      def create_until(key, value, seconds, format = :seconds)
+        if seconds?(format)
+          client.setex(key.to_s, seconds, value)
+        else
+          client.psetex(key.to_s, seconds, value)
+        end
+      end
+
+      def append(key, value)
+        client.append(key.to_s, value)
+      end
+
+      def replace(key, value, offset)
+        client.setrange(key.to_s, offset, value)
+      end
+
+      def decrement(key, value = 1)
+        if value == 1
+          client.decr(key.to_s)
+        else
+          client.decrby(key.to_s, value)
+        end
+      end
+
+      def increment(key, value = 1)
+        case value
+        when Float then client.incrbyfloat(key.to_s, value)
+        when 1 then client.incr(key.to_s)
+        else client.incrby(key.to_s, value)
+        end
+      end
+
+      def reset(key, value = 0)
+        client.getset(key.to_s, value)
+      end
+
+      def bit_count(key, start = 0, finish = -1)
+        client.bitcount(key.to_s, start, finish)
+      end
+
+      def bit_where(operation, key, *keys)
+        client.bitop(operation, key, *keys)
+      end
+
+      def get_bit(key, offset)
+        client.getbit(key.to_s, offset)
+      end
+
+      def set_bit(key, offset, bit)
+        client.setbit(key.to_s, offset, bit)
+      end
 
     end
   end

data/lib/lite/redis/transaction.rb

@@ -2,10 +2,27 @@
 
 module Lite
   module Redis
-    class Transaction < Lite::Redis::Base
+    class Transaction < Base
 
-      extend Lite::Redis::TransactionHelper
-      include Lite::Redis::TransactionHelper
+      def discard
+        client.discard
+      end
+
+      def exec
+        client.exec
+      end
+
+      def multi(&block)
+        client.multi(&block)
+      end
+
+      def watch(*args)
+        client.watch(*args)
+      end
+
+      def unwatch
+        client.unwatch
+      end
 
     end
   end

data/lib/lite/redis/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Redis
 
-    VERSION = '1.2.0'
+    VERSION = "1.3.0"
 
   end
 end

data/lib/lite/redis.rb

@@ -1,35 +1,20 @@
 # frozen_string_literal: true
 
-require 'redis' unless defined?(Redis)
+require "generators/lite/redis/install_generator" if defined?(Rails::Generators)
 
-require 'generators/lite/redis/install_generator' if defined?(Rails::Generators)
-
-require 'lite/redis/railtie' if defined?(Rails::Railtie)
-require 'lite/redis/version'
-require 'lite/redis/configuration'
-require 'lite/redis/helpers/base_helper'
-require 'lite/redis/helpers/connection_helper'
-require 'lite/redis/helpers/geo_helper'
-require 'lite/redis/helpers/hash_helper'
-require 'lite/redis/helpers/hyper_log_log_helper'
-require 'lite/redis/helpers/key_helper'
-require 'lite/redis/helpers/list_helper'
-require 'lite/redis/helpers/pub_sub_helper'
-require 'lite/redis/helpers/script_helper'
-require 'lite/redis/helpers/set_helper'
-require 'lite/redis/helpers/sorted_set_helper'
-require 'lite/redis/helpers/string_helper'
-require 'lite/redis/helpers/transaction_helper'
-require 'lite/redis/base'
-require 'lite/redis/connection'
-require 'lite/redis/geo'
-require 'lite/redis/hash'
-require 'lite/redis/hyper_log_log'
-require 'lite/redis/key'
-require 'lite/redis/list'
-require 'lite/redis/pub_sub'
-require 'lite/redis/script'
-require 'lite/redis/set'
-require 'lite/redis/sorted_set'
-require 'lite/redis/string'
-require 'lite/redis/transaction'
+require "lite/redis/railtie" if defined?(Rails::Railtie)
+require "lite/redis/version"
+require "lite/redis/configuration"
+require "lite/redis/base"
+require "lite/redis/connection"
+require "lite/redis/geo"
+require "lite/redis/hash"
+require "lite/redis/hyper_log_log"
+require "lite/redis/key"
+require "lite/redis/list"
+require "lite/redis/pub_sub"
+require "lite/redis/script"
+require "lite/redis/set"
+require "lite/redis/sorted_set"
+require "lite/redis/string"
+require "lite/redis/transaction"

data/lib/tasks/redis.rake

@@ -2,30 +2,30 @@
 
 namespace :db do
   namespace :redis do
-    desc 'Reset Redis database'
+    desc "Reset Redis database"
     task reset: :environment do
-      puts '== Reset: reseting Redis '.ljust(80, '=')
+      puts "== Reset: reseting Redis ".ljust(80, "=")
       total_task_start_time = Time.current
 
-      puts '  -> Resetting'
+      puts "  -> Resetting"
       Lite::Redis::Connection.flush
 
       total_task_elapsed_time = (Time.current - total_task_start_time).round(5)
-      puts "== Reset: reset Redis (#{total_task_elapsed_time}s) ".ljust(80, '=')
-      puts ''
+      puts "== Reset: reset Redis (#{total_task_elapsed_time}s) ".ljust(80, "=")
+      puts ""
     end
 
-    desc 'Reset all Redis databases'
+    desc "Reset all Redis databases"
     task reset_all: :environment do
-      puts '== Reset: reseting all Redis '.ljust(80, '=')
+      puts "== Reset: reseting all Redis ".ljust(80, "=")
       total_task_start_time = Time.current
 
-      puts '  -> Resetting'
+      puts "  -> Resetting"
       Lite::Redis::Connection.flush_all
 
       total_task_elapsed_time = (Time.current - total_task_start_time).round(5)
-      puts "== Reset: reset all Redis (#{total_task_elapsed_time}s) ".ljust(80, '=')
-      puts ''
+      puts "== Reset: reset all Redis (#{total_task_elapsed_time}s) ".ljust(80, "=")
+      puts ""
     end
   end
 end

data/lite-redis.gemspec

@@ -1,55 +1,48 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'lite/redis/version'
+require "lite/redis/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'lite-redis'
+  spec.name = "lite-redis"
   spec.version = Lite::Redis::VERSION
-  spec.authors = ['Juan Gomez']
+  spec.authors = ["Juan Gomez"]
   spec.email = %w[j.gomez@drexed.com]
 
-  spec.summary = 'Access Redis with an ActiveRecord like ORM interface'
-  spec.homepage = 'http://drexed.github.io/lite-redis'
-  spec.license = 'MIT'
+  spec.summary = "Access Redis with an ActiveRecord like ORM interface"
+  spec.homepage = "http://drexed.github.io/lite-redis"
+  spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata.merge(
-      'allowed_push_host' => 'https://rubygems.org',
-      'changelog_uri' => 'https://github.com/drexed/lite-redis/blob/master/CHANGELOG.md',
-      'homepage_uri' => spec.homepage,
-      'source_code_uri' => 'https://github.com/drexed/lite-redis'
-    )
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-          'public gem pushes.'
-  end
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"] = "https://github.com/drexed/lite-redis/blob/master/CHANGELOG.md"
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["rubygems_mfa_required"] = "true"
+  spec.metadata["source_code_uri"] = "https://github.com/drexed/lite-redis"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir = 'exe'
+  spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_runtime_dependency 'redis'
+  spec.add_runtime_dependency "redis"
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'connection_pool'
-  spec.add_development_dependency 'fakeredis'
-  spec.add_development_dependency 'fasterer'
-  spec.add_development_dependency 'generator_spec'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "connection_pool"
+  spec.add_development_dependency "fakeredis"
+  spec.add_development_dependency "fasterer"
+  spec.add_development_dependency "generator_spec"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-rake"
+  spec.add_development_dependency "rubocop-rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-redis
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -234,19 +234,6 @@ files:
 - lib/lite/redis/connection.rb
 - lib/lite/redis/geo.rb
 - lib/lite/redis/hash.rb
-- lib/lite/redis/helpers/base_helper.rb
-- lib/lite/redis/helpers/connection_helper.rb
-- lib/lite/redis/helpers/geo_helper.rb
-- lib/lite/redis/helpers/hash_helper.rb
-- lib/lite/redis/helpers/hyper_log_log_helper.rb
-- lib/lite/redis/helpers/key_helper.rb
-- lib/lite/redis/helpers/list_helper.rb
-- lib/lite/redis/helpers/pub_sub_helper.rb
-- lib/lite/redis/helpers/script_helper.rb
-- lib/lite/redis/helpers/set_helper.rb
-- lib/lite/redis/helpers/sorted_set_helper.rb
-- lib/lite/redis/helpers/string_helper.rb
-- lib/lite/redis/helpers/transaction_helper.rb
 - lib/lite/redis/hyper_log_log.rb
 - lib/lite/redis/key.rb
 - lib/lite/redis/list.rb
@@ -264,7 +251,11 @@ homepage: http://drexed.github.io/lite-redis
 licenses:
 - MIT
 metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/drexed/lite-redis/blob/master/CHANGELOG.md
+  homepage_uri: http://drexed.github.io/lite-redis
   rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/drexed/lite-redis
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -280,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Access Redis with an ActiveRecord like ORM interface

data/lib/lite/redis/helpers/base_helper.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Lite
-  module Redis
-    module BaseHelper
-
-      attr_writer :client
-
-      def initialize(redis = nil)
-        @client = redis
-      end
-
-      def client
-        @client ||= Lite::Redis.configuration.client
-      end
-
-      private
-
-      def append?(order)
-        order.to_s == 'append'
-      end
-
-      def milliseconds?(format)
-        format.to_s == 'milliseconds'
-      end
-
-      def prepend?(order)
-        order.to_s == 'prepend'
-      end
-
-      def seconds?(format)
-        format.to_s == 'seconds'
-      end
-
-      def stringify_keys(*keys)
-        keys.map { |key, _| key.to_s }
-      end
-
-    end
-  end
-end

data/lib/lite/redis/helpers/connection_helper.rb

@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-module Lite
-  module Redis
-    module ConnectionHelper
-
-      def authenticate(password)
-        client.auth(password)
-      end
-
-      def connected?
-        client.connected?
-      end
-
-      def database(index)
-        client.select(index)
-      end
-
-      def database_id
-        client.database_id
-      end
-
-      def database_size
-        client.dbsize
-      end
-
-      def debug(*args)
-        client.debug(*args)
-      end
-
-      def disconnect
-        client.disconnect
-      end
-
-      def echo(message)
-        client.echo(message)
-      end
-
-      def flush
-        client.flushdb
-      end
-
-      def flush_all
-        client.flushall
-      end
-
-      def info
-        client.info
-      end
-
-      def ping
-        client.ping
-      end
-
-      def quit
-        client.quit
-      end
-
-      def reconnect
-        client.reconnect
-      end
-
-      def rewrite_aof
-        client.bgrewriteaof
-      end
-
-      def save
-        client.bgsave
-      end
-
-      def saved_at
-        client.lastsave
-      end
-
-      def shutdown
-        client.shutdown
-      end
-
-      def slave_of(host, port)
-        client.slaveof(host, port)
-      end
-
-      def slowlog(command, length = nil)
-        client.slowlog(command, length)
-      end
-
-      def synchronize
-        client.synchronize
-      end
-
-      def time
-        client.time
-      end
-
-      def with_reconnect(&block)
-        client.with_reconnect(true, &block)
-      end
-
-      def without_reconnect(&block)
-        client.with_reconnect(false, &block)
-      end
-
-    end
-  end
-end

data/lib/lite/redis/helpers/geo_helper.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Lite
-  module Redis
-    module GeoHelper
-
-      def create(key, *member)
-        client.geoadd(key.to_s, *member)
-      end
-
-      def hash(key, member)
-        client.geohash(key.to_s, member)
-      end
-
-      def position(key, member)
-        client.geopos(key.to_s, member)
-      end
-
-      def distance(key, member1, member2, unit = 'm')
-        client.geodist(key.to_s, member1, member2, unit.to_s)
-      end
-
-      def radius(*args, **geoptions)
-        client.georadius(*args, **geoptions)
-      end
-
-      def radius_member(*args, **geoptions)
-        client.georadiusbymember(*args, **geoptions)
-      end
-
-    end
-  end
-end