redcord 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f33907b35b938f14be13d1d20f89f1530d72a28cb55e7e38a53f61743a2bfe5
-  data.tar.gz: 1297ac81f293f35572a0015782aa621b1d5ba0e3e691ea86abadbdde26ca094a
+  metadata.gz: 91184713358e549897cc7d1a544a8f8244b2aa267b623a6af947711219983ce5
+  data.tar.gz: d24d9e8f1f5cfa72afc6c4f2bfe64933f8f7278ed3dd7a3a53f4ae026168a732
 SHA512:
-  metadata.gz: f4d23f458c6f6de224293010b60f19d7c07199c66eb382e5bd5a7917a429900658bfd42202107c3e72ace588ea526bcf3edb6b56dfeaa7a6b58f3eea4b91dc81
-  data.tar.gz: d1aa8dedf1dccad372489072405725fe51e3712b634524c73c574130ab8473bab1fefdedfbd47466c956ab7e96e121153798f08a4250b30e7dc30d33039bf801
+  metadata.gz: 828c660a25ea131fc013ba261cb3395fbbcc637170f5b8601f68e30f7095cda8f5e3ed5781bcbb0bf39fcec693438953b76b4a106b9fd9966e3c5f3ff6469145
+  data.tar.gz: e3a6469ae8778ea5c110922c7324c43e394e273c0392a16524bbe489fd24df4bffca4cd83c7a225430b05ac134e346dad9de64e2514f87caddf249704209961d

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/errors.rb

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

data/lib/redcord/relation.rb

@@ -2,13 +2,10 @@
 
 # typed: strict
 
+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
 
@@ -98,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
       )
@@ -222,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
         )
@@ -238,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/vacuum_helper.rb

@@ -9,15 +9,15 @@ module Redcord::VacuumHelper
   sig { params(model: T.class_of(Redcord::Base)).void }
   def self.vacuum(model)
     model.class_variable_get(:@@index_attributes).each do |index_attr|
-      puts "Vacuuming index attribute: #{index_attr}"
+      puts "Vacuuming index attribute: #{index_attr} for model: #{model.name}"
       _vacuum_index_attribute(model, index_attr)
     end
     model.class_variable_get(:@@range_index_attributes).each do |range_index_attr|
-      puts "Vacuuming range index attribute: #{range_index_attr}"
+      puts "Vacuuming range index attribute: #{range_index_attr} for model: #{model.name}"
       _vacuum_range_index_attribute(model, range_index_attr)
     end
     model.class_variable_get(:@@custom_index_attributes).keys.each do |index_name|
-      puts "Vacuuming custom index: #{index_name}"
+      puts "Vacuuming custom index: #{index_name} for model: #{model.name}"
       _vacuum_custom_index(model, index_name)
     end
   end

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.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -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
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A Ruby ORM like Active Record, but for Redis