redcord 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134041206308ab5d1cb967dca5b5985b2bdd6b9c058601d7040d75d1119a2c98
-  data.tar.gz: d04f590786ab4cd9251ac32f5eea7d11e8103c448916c4aaee290db177370eca
+  metadata.gz: c343794236cfb0990142a2200625066bd176b3f57cdfbf4336e752a568796621
+  data.tar.gz: d4dff503e7bf52756ea884be7179a2b7a0b004ab5c93d8af24a8fa7bee953e76
 SHA512:
-  metadata.gz: 374deab010a1f6b40e038adae19b4a7dee5485c5e17ff3a7e8fc92a4e839a2e9835166acd9b6369e7b628e206c1a280e943a28c040172d107c147d3be158fa8b
-  data.tar.gz: 28279ab008fcf6ba226d574250f882f35b05b69fc968794430c3d992c69fd686ec9c2f3fa7821aa6227426c7a027fda07c6e929624a533058c4a396c975f1140
+  metadata.gz: 78d24a7abea242512ad8943c19b50ad363ee320204c3e56d386f6b408e4d11c508dd35f724490963546817f87c53a2b38cb496035bd1b1a4e0c078b78503c1ff
+  data.tar.gz: a3660d9cb64af06ae210e1885be8de10e9285edea5671252204caea07eda43c0b7fc899a29f5d5975c1cc2c216abd61345b6211a9e83dffdc3920e45704d42d0

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
@@ -37,7 +34,7 @@ module Redcord::Attribute
     klass.include(InstanceMethods)
     klass.class_variable_set(:@@index_attributes, Set.new)
     klass.class_variable_set(:@@range_index_attributes, Set.new)
-    klass.class_variable_set(:@@custom_index_attributes, Hash.new { |h, k| h[k] = [] })
+    klass.class_variable_set(:@@custom_index_attributes, Hash.new)
     klass.class_variable_set(:@@ttl, nil)
     klass.class_variable_set(:@@shard_by_attribute, nil)
   end

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/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
 
@@ -99,7 +95,7 @@ class Redcord::Relation
         extract_query_conditions!,
         index_attrs: model._script_arg_index_attrs,
         range_index_attrs: model._script_arg_range_index_attrs,
-        custom_index_attrs: model._script_arg_custom_index_attrs[custom_index_name],
+        custom_index_attrs: model._script_arg_custom_index_attrs[custom_index_name] || [],
         hash_tag: extract_hash_tag!,
         custom_index_name: custom_index_name
       )
@@ -223,7 +219,7 @@ class Redcord::Relation
           select_attrs: select_attrs,
           index_attrs: model._script_arg_index_attrs,
           range_index_attrs: model._script_arg_range_index_attrs,
-          custom_index_attrs: model._script_arg_custom_index_attrs[custom_index_name],
+          custom_index_attrs: model._script_arg_custom_index_attrs[custom_index_name] || [],
           hash_tag: extract_hash_tag!,
           custom_index_name: custom_index_name
         )
@@ -239,7 +235,7 @@ class Redcord::Relation
           extract_query_conditions!,
           index_attrs: model._script_arg_index_attrs,
           range_index_attrs: model._script_arg_range_index_attrs,
-          custom_index_attrs: model._script_arg_custom_index_attrs[custom_index_name],
+          custom_index_attrs: model._script_arg_custom_index_attrs[custom_index_name] || [],
           hash_tag: extract_hash_tag!,
           custom_index_name: custom_index_name
         )

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
@@ -81,7 +73,7 @@ module Redcord::Serializer
       attr_keys.each do |attr_key|
         next if attr_key == shard_by_attribute
 
-        if !custom_index_attributes.empty?
+        if !custom_index_attributes.nil? && !custom_index_attributes.empty?
           if !custom_index_attributes.include?(attr_key)
             raise(
               Redcord::AttributeNotIndexed,

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.4
+  version: 0.2.0
 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:
   - - ">="