fakeredis 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1be2134927d3b7838ee3e2fd4376791bea516561
-  data.tar.gz: 2b3e0c64b79df1358151bbd1405000395fa06e86
+SHA256:
+  metadata.gz: 472bc70d16d42ddd98a542825b81fdd5d8f7af18a8b704f5022046895ca5a867
+  data.tar.gz: 7f0b48ebe4cfa88e99b9d949be3e0bd6816dbc3c0629062d42e0e1fce92a03fc
 SHA512:
-  metadata.gz: cfb37be84fd30d941fadc44a177e2029cd2de063fc090bc3004166a72f5dba6e7378e9c918aa1d156d44b8277f830dfedbd34aad57142770512f420f4f12fae3
-  data.tar.gz: 2f841badb4c16e9ff6d3c35b697b9ee262022bc8286553e7187a47173af742114eacd5cccdb3d0477c111457fc9a7f50fdb7de970a25c04ba1be33318c84a1ac
+  metadata.gz: fcef2e419257364269044dbd0d8b21d0aacdaeb613d91e83abaef77a18a6c5551e72ded9e90ac334d17760aaf80e4c0fec9fd72f15e3a80efe63c7be5b3f2903
+  data.tar.gz: 6076a543910d3eec4a6fb8912ce1be5b44bea9fa71cbd76fd62f8b0a130eb97d85a4a2390d05ef5bd2a1eae699c487b01de537f9781c8aa39553c198f53c9618

data/.github/workflows/codeql.yml

@@ -0,0 +1,74 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '34 3 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# GitHub recommends pinning actions to a commit SHA.
+# To get a newer version, you will need to update the SHA.
+# You can also reference a tag or branch, but the action may change without warning.
+
+name: Ruby CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, macos]
+        ruby: [3.0, 3.1, 3.2, head, debug, jruby, jruby-head, truffleruby, truffleruby-head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: bundle exec rake

data/.gitignore

@@ -1,7 +1,6 @@
 *.gem
 .bundle
 Gemfile.lock
-gemfiles/*.gemfile.lock
 pkg/*
 .rvmrc
 *.rbc

data/Gemfile

@@ -3,11 +3,5 @@ source "https://rubygems.org"
 gem 'rake'
 gem 'rdoc'
 
-platforms :rbx do
-  gem 'racc'
-  gem 'rubysl', '~> 2.0'
-  gem 'psych'
-end
-
 # Specify your gem's dependencies in fakeredis.gemspec
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2018 Guillermo Iguaran
+Copyright (c) 2011-2023 Guillermo Iguaran
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,6 @@
-# FakeRedis [![Build Status](https://secure.travis-ci.org/guilleiguaran/fakeredis.png)](http://travis-ci.org/guilleiguaran/fakeredis)
+# FakeRedis
+![Build Status](https://github.com/guilleiguaran/fakeredis/actions/workflows/ruby.yml/badge.svg)
+
 This a fake implementation of redis-rb for machines without Redis or test environments
 
 
@@ -100,5 +102,4 @@ Thanks to [all contributors](https://github.com/guilleiguaran/fakeredis/graphs/c
 
 ## Copyright
 
-Copyright (c) 2011-2018 Guillermo Iguaran. See LICENSE for
-further details.
+Copyright (c) 2011-2023 Guillermo Iguaran. See LICENSE for further details.

data/fakeredis.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<redis>, [">= 3.2", "< 5.0"])
-  s.add_development_dependency(%q<rspec>, ["~> 3.0"])
+  s.add_runtime_dependency(%q<redis>, ["~> 4.8"])
+  s.add_development_dependency(%q<rspec>, ["~> 3"])
 end

data/lib/fakeredis/command_executor.rb

@@ -15,12 +15,6 @@ module FakeRedis
         raise Redis::CommandError, "ERR unknown command '#{meffod}'"
       end
 
-      if reply == true
-        reply = 1
-      elsif reply == false
-        reply = 0
-      end
-
       replies << reply
       nil
     end

data/lib/fakeredis/expiring_hash.rb

@@ -44,10 +44,8 @@ module FakeRedis
     end
 
     def values_at(*keys)
-      keys.each do |key|
-        key = normalize(key)
-        delete(key) if expired?(key)
-      end
+      keys = keys.map { |key| normalize(key) }
+      keys.each { |key| delete(key) if expired?(key) }
       super
     end
 

data/lib/fakeredis/geo_commands.rb

@@ -0,0 +1,142 @@
+require "fakeredis/geo_set"
+
+module FakeRedis
+  module GeoCommands
+    DISTANCE_UNITS = {
+      "m" => 1,
+      "km" => 1000,
+      "ft" => 0.3048,
+      "mi" => 1609.34
+    }
+
+    REDIS_DOUBLE_PRECISION = 4
+    REDIS_GEOHASH_SIZE = 10
+
+    def geoadd(key, *members)
+      raise_argument_error("geoadd") if members.empty? || members.size % 3 != 0
+
+      set = (data[key] ||= GeoSet.new)
+      prev_size = set.size
+      members.each_slice(3) do |member|
+        set.add(*member)
+      end
+      set.size - prev_size
+    end
+
+    def geodist(key, member1, member2, unit = "m")
+      unit = unit.to_s
+      raise_command_error("ERR unsupported unit provided. please use #{DISTANCE_UNITS.keys.join(', ')}") unless DISTANCE_UNITS.include?(unit)
+
+      set = (data[key] || GeoSet.new)
+      point1 = set.get(member1)
+      point2 = set.get(member2)
+      if point1 && point2
+        distance = point1.distance_to(point2)
+        distance_in_units = distance / DISTANCE_UNITS[unit]
+        distance_in_units.round(REDIS_DOUBLE_PRECISION).to_s
+      end
+    end
+
+    def geohash(key, member)
+      members = Array(member)
+      raise_argument_error("geohash") if members.empty?
+      set = (data[key] || GeoSet.new)
+      members.map do |member|
+        point = set.get(member)
+        point.geohash(REDIS_GEOHASH_SIZE) if point
+      end
+    end
+
+    def geopos(key, member)
+      return nil unless data[key]
+
+      members = Array(member)
+      set = (data[key] || GeoSet.new)
+      members.map do |member|
+        point = set.get(member)
+        [point.lon.to_s, point.lat.to_s] if point
+      end
+    end
+
+    def georadius(*args)
+      args = args.dup
+      raise_argument_error("georadius") if args.size < 5
+      key, lon, lat, radius, unit, *rest = args
+      raise_argument_error("georadius") unless DISTANCE_UNITS.has_key?(unit)
+      radius *= DISTANCE_UNITS[unit]
+
+      set = (data[key] || GeoSet.new)
+      center = GeoSet::Point.new(lon, lat, nil)
+
+      do_georadius(set, center, radius, unit, rest)
+    end
+
+    def georadiusbymember(*args)
+      args = args.dup
+      raise_argument_error("georadiusbymember") if args.size < 4
+      key, member, radius, unit, *rest = args
+      raise_argument_error("georadiusbymember") unless DISTANCE_UNITS.has_key?(unit)
+      radius *= DISTANCE_UNITS[unit]
+
+      set = (data[key] || GeoSet.new)
+      center = set.get(member)
+      raise_command_error("ERR could not decode requested zset member") unless center
+
+      do_georadius(set, center, radius, unit, args)
+    end
+
+    private
+
+    def do_georadius(set, center, radius, unit, args)
+      points = set.points_within_radius(center, radius)
+
+      options = georadius_options(args)
+
+      if options[:asc]
+        points.sort_by! { |p| p.distance_to(center) }
+      elsif options[:desc]
+        points.sort_by! { |p| -p.distance_to(center) }
+      end
+
+      points = points.take(options[:count]) if options[:count]
+      extras = options[:extras]
+      return points.map(&:name) if extras.empty?
+
+      points.map do |point|
+        member = [point.name]
+
+        extras.each do |extra|
+          case extra
+          when "WITHCOORD"
+            member << [point.lon.to_s, point.lat.to_s]
+          when "WITHDIST"
+            distance = point.distance_to(center)
+            distance_in_units = distance / DISTANCE_UNITS[unit]
+            member << distance_in_units.round(REDIS_DOUBLE_PRECISION).to_s
+          when "WITHHASH"
+            member << point.geohash(REDIS_GEOHASH_SIZE)
+          end
+        end
+
+        member
+      end
+    end
+
+    def georadius_options(args)
+      options = {}
+      args = args.map { |arg| arg.to_s.upcase }
+
+      if idx = args.index("COUNT")
+        options[:count] = Integer(args[idx + 1])
+      end
+
+      options[:asc]  = true if args.include?("ASC")
+      options[:desc] = true if args.include?("DESC")
+
+      extras = args & ["WITHCOORD", "WITHDIST", "WITHHASH"]
+      options[:extras] = extras
+
+      options
+    end
+  end
+end

data/lib/fakeredis/geo_set.rb

@@ -0,0 +1,84 @@
+module FakeRedis
+  class GeoSet
+    class Point
+      BASE32 = "0123456789bcdefghjkmnpqrstuvwxyz" # (geohash-specific) Base32 map
+      EARTH_RADIUS_IN_M = 6_378_100.0
+
+      attr_reader :lon, :lat, :name
+
+      def initialize(lon, lat, name)
+        @lon = Float(lon)
+        @lat = Float(lat)
+        @name = name
+      end
+
+      def geohash(precision = 10)
+        latlon = [@lat, @lon]
+        ranges = [[-90.0, 90.0], [-180.0, 180.0]]
+        coordinate = 1
+
+        (0...precision).map do
+          index = 0 # index into base32 map
+
+          5.times do |bit|
+            mid = (ranges[coordinate][0] + ranges[coordinate][1]) / 2
+            if latlon[coordinate] >= mid
+              index = index * 2 + 1
+              ranges[coordinate][0] = mid
+            else
+              index *= 2
+              ranges[coordinate][1] = mid
+            end
+
+            coordinate ^= 1
+          end
+
+          BASE32[index]
+        end.join
+      end
+
+      def distance_to(other)
+        lat1 = deg_to_rad(@lat)
+        lon1 = deg_to_rad(@lon)
+        lat2 = deg_to_rad(other.lat)
+        lon2 = deg_to_rad(other.lon)
+        haversine_distance(lat1, lon1, lat2, lon2)
+      end
+
+      private
+
+      def deg_to_rad(deg)
+        deg * Math::PI / 180.0
+      end
+
+      def haversine_distance(lat1, lon1, lat2, lon2)
+        h = Math.sin((lat2 - lat1) / 2) ** 2 + Math.cos(lat1) * Math.cos(lat2) *
+              Math.sin((lon2 - lon1) / 2) ** 2
+
+        2 * EARTH_RADIUS_IN_M * Math.asin(Math.sqrt(h))
+      end
+    end
+
+    def initialize
+      @points = {}
+    end
+
+    def size
+      @points.size
+    end
+
+    def add(lon, lat, name)
+      @points[name] = Point.new(lon, lat, name)
+    end
+
+    def get(name)
+      @points[name]
+    end
+
+    def points_within_radius(center, radius)
+      @points.values.select do |point|
+        point.distance_to(center) <= radius
+      end
+    end
+  end
+end

data/lib/fakeredis/minitest.rb

@@ -15,8 +15,8 @@ require 'fakeredis'
 module FakeRedis
   module Minitest
     def setup
-      super
       Redis::Connection::Memory.reset_all_databases
+      super
     end
 
     ::Minitest::Test.send(:include, self)

data/lib/fakeredis/sort_method.rb

@@ -6,7 +6,6 @@ module FakeRedis
       return [] if type(key) == 'none'
 
       unless %w(list set zset).include? type(key)
-        warn "Operation against a key holding the wrong kind of value: Expected list, set or zset at #{key}."
         raise Redis::CommandError.new("WRONGTYPE Operation against a key holding the wrong kind of value")
       end
 

data/lib/fakeredis/version.rb

@@ -1,3 +1,3 @@
 module FakeRedis
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

data/lib/fakeredis/zset.rb

@@ -17,7 +17,7 @@ module FakeRedis
     def select_by_score min, max
       min = _floatify(min, true)
       max = _floatify(max, false)
-      reject {|_,v| v < min || v > max }
+      select {|_,v| v >= min && v <= max }
     end
 
     private
@@ -26,7 +26,7 @@ module FakeRedis
     def _floatify(str, increment = true)
       if (( inf = str.to_s.match(/^([+-])?inf/i) ))
         (inf[1] == "-" ? -1.0 : 1.0) / 0.0
-      elsif (( number = str.to_s.match(/^\((\d+)/i) ))
+      elsif (( number = str.to_s.match(/^\((-?\d+)/i) ))
         number[1].to_i + (increment ? 1 : -1)
       else
         Float str.to_s

data/lib/fakeredis.rb

@@ -15,4 +15,20 @@ module FakeRedis
   def self.disable
     Redis::Connection.drivers.delete_if {|driver| Redis::Connection::Memory == driver }
   end
+
+  def self.disabling
+    return yield unless enabled?
+
+    disable
+    yield
+    enable
+  end
+
+  def self.enabling
+    return yield if enabled?
+
+    enable
+    yield
+    disable
+  end
 end