redcord 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf6ea43c415c480fb7b3484deb69005c13f52bb644fef52f5570d078b15baf46
-  data.tar.gz: 0ae55fe438326a9fac46364e6ca0652d71da69aadae9dd204477f1ef502211fc
+  metadata.gz: 243af4e2e05e9b611adabe523330b170d853434920ca81530e081d63790c871a
+  data.tar.gz: 24baac2c7c4eb7d2d6f0dc9a90988b77461d95b683e01cc18892ba1a5894f6a1
 SHA512:
-  metadata.gz: 5f45e3e9bb1c575051df21af680a817bff3a1bb2a367adba95258ab23535cb0fb08d024008edfdd16c58e4132bf67037e7f8bb8ce947e494323ef23a33e4ab1a
-  data.tar.gz: d99aa9db0fec8580aacb6fa066612b6cc39c4028fb5a2af4c3c2bc03e851c1bdfa58a2eb17c121e148fef171a1913ed5086e4a2abc877fa47149aa701b260092
+  metadata.gz: f3b81515ee166f4c57bc2c2a1f4abb9b11d5e32aa349b5ec748503e4b689edfaf64b2caa4e23e3ce8ce3a0c0b628929fa6a848f445fc0eed9990b0a43d1e12a1
+  data.tar.gz: c6a6fd2af78a0d53fdf5aa26b3673d3c2bdbac716fa8dfefb6b14b8793512daf5764857b5033573078ccdb66cb0e2a13fd2e1040dc201978073f972880b667b4

data/lib/redcord/actions.rb

@@ -3,15 +3,8 @@
 # typed: strict
 
 require 'sorbet-coerce'
-
 require 'redcord/relation'
 
-module Redcord
-  # Raised by Model.find
-  class RecordNotFound < StandardError; end
-  class InvalidAction < StandardError; end
-end
-
 module Redcord::Actions
   extend T::Sig
   extend T::Helpers
@@ -171,6 +164,13 @@ module Redcord::Actions
           )
         end
       end
+    # TODO: break down Redis::CommandError further by parsing the error message
+    rescue Redis::CommandError => e
+      if e.message.include?('has been deleted')
+        raise Redcord::RedcordDeletedError.new(e)
+      else
+        raise e
+      end
     end
 
     sig { returns(T::Boolean) }
@@ -179,7 +179,6 @@ module Redcord::Actions
 
       true
     rescue Redis::CommandError
-      # TODO: break down Redis::CommandError by parsing the error message
       false
     end
 
@@ -213,6 +212,13 @@ module Redcord::Actions
           )
         end
       end
+    # TODO: break down Redis::CommandError further by parsing the error message
+    rescue Redis::CommandError => e
+      if e.message.include?('has been deleted')
+        raise Redcord::RedcordDeletedError.new(e)
+      else
+        raise e
+      end
     end
 
     sig { params(args: T::Hash[Symbol, T.untyped]).returns(T::Boolean) }
@@ -221,7 +227,6 @@ module Redcord::Actions
 
       true
     rescue Redis::CommandError
-      # TODO: break down Redis::CommandError by parsing the error message
       false
     end
 

data/lib/redcord/attribute.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 # typed: strict
-module Redcord
-  class InvalidAttribute < StandardError; end
-end
 
 module Redcord::Attribute
   extend T::Sig

data/lib/redcord/connection_pool.rb

@@ -13,16 +13,16 @@ class Redcord::ConnectionPool
   # Avoid method_missing when possible for better performance
   methods = Set.new(Redcord::Redis.instance_methods(false) + Redis.instance_methods(false))
   methods.each do |method_name|
-    define_method method_name do |*args, &blk|
+    define_method method_name do |*args, **kwargs, &blk|
       @connection_pool.with do |redis|
-        redis.send(method_name, *args, &blk)
+        redis.send(method_name, *args, **kwargs, &blk)
       end
     end
   end
 
-  def method_missing(method_name, *args, &blk)
+  def method_missing(method_name, *args, **kwargs, &blk)
     @connection_pool.with do |redis|
-      redis.send(method_name, *args, &blk)
+      redis.send(method_name, *args, **kwargs, &blk)
     end
   end
 end

data/lib/redcord/errors.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Redcord
+  class RedcordError < StandardError; end
+
+  # Raised by Model.find
+  class RecordNotFound < RedcordError; end
+  class InvalidAction < RedcordError; end
+
+  # Raised by Model.where
+  class InvalidQuery < RedcordError; end
+  class AttributeNotIndexed < RedcordError; end
+  class WrongAttributeType < TypeError; end
+  class CustomIndexInvalidQuery < RedcordError; end
+  class CustomIndexInvalidDesign < RedcordError; end
+  class RedcordDeletedError < ::Redis::CommandError; end
+
+  # Raised by shared_by_attribute
+  class InvalidAttribute < RedcordError; end
+end

data/lib/redcord/migration/index.rb

@@ -48,7 +48,7 @@ module Redcord::Migration::Index
   sig { params(model: T.class_of(Redcord::Base), key: String).void }
   def _del_zset(model, key)
     # ZPOPMIN might not be avaliable on old redis servers
-    model.redis.zscan_each(match: key) do |id, _|
+    model.redis.zscan_each(key) do |id, _|
       model.redis.zrem(key, id)
     end
 

data/lib/redcord/railtie.rb

@@ -24,9 +24,16 @@ class Redcord::Railtie < Rails::Railtie
     config_file = 'config/redcord.yml'
 
     if File.file?(config_file)
-      Redcord::Base.configurations = YAML.load(
-        ERB.new(File.read(config_file)).result
-      )
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1.0')
+        Redcord::Base.configurations = YAML.load(
+          ERB.new(File.read(config_file)).result,
+        )
+      else
+        Redcord::Base.configurations = YAML.load(
+          ERB.new(File.read(config_file)).result,
+          aliases: true,
+        )
+      end
     end
 
     Redcord._after_initialize!

data/lib/redcord/relation.rb

@@ -6,10 +6,6 @@ require 'active_support'
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/module'
 
-module Redcord
-  class InvalidQuery < StandardError; end
-end
-
 class Redcord::Relation
   extend T::Sig
 

data/lib/redcord/serializer.rb

@@ -4,14 +4,6 @@
 
 require 'redcord/range_interval'
 
-module Redcord
-  # Raised by Model.where
-  class AttributeNotIndexed < StandardError; end
-  class WrongAttributeType < TypeError; end
-  class CustomIndexInvalidQuery < StandardError; end
-  class CustomIndexInvalidDesign < StandardError; end
-end
-
 # This module defines various helper methods on Redcord for serialization
 # between the  Ruby client and Redis server.
 module Redcord::Serializer

data/lib/redcord.rb

@@ -32,6 +32,7 @@ module Redcord
 end
 
 require 'redcord/base'
+require 'redcord/errors'
 require 'redcord/migration'
 require 'redcord/migration/migrator'
 require 'redcord/migration/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcord
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -123,35 +123,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.4704
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,6 +177,7 @@ files:
 - lib/redcord/base.rb
 - lib/redcord/configurations.rb
 - lib/redcord/connection_pool.rb
+- lib/redcord/errors.rb
 - lib/redcord/logger.rb
 - lib/redcord/lua_script_reader.rb
 - lib/redcord/migration.rb
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="