redisize 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dcd0ec61589ecc0a7b6441b224fc47a7a8827c3e63bda9abfa713f59dcb8060
-  data.tar.gz: f23c60d6e5be1d2356ca21bf42adf932c9b3e4e42b74b5cb0528afd0f562a943
+  metadata.gz: 5b7b65e687f5003dac2ba7e92d42450cea066554ce88bccb49c210ff0a413d41
+  data.tar.gz: 95e775070c058d4f3804d03bb082969146c6e5402aec915d489a11eca262214e
 SHA512:
-  metadata.gz: df20089630b617bda9bec1dd6140410e0a284461382a402b9cba08b16707f18cc4ad86a1b4b41d0d8092ebc612e2af41c46ee1edee5277c9e850841c60aad56c
-  data.tar.gz: dceec345d85e24a4ca3e6c655b28e71dffe8227c2aad2861b2461bf4ad9194521c737c79b1c98e428497c95b83152a54dcf6ec44fd02df3c2e8d1719db3cd1ea
+  metadata.gz: b26a2aa8e95fd8de86db627fb45207af2bbebaaaf5fc468b2b4ed8d2f9675a83f8e4852c8d1adbd1150a03bd4dd00a588d2c67c9b5a3ed30f30ddb7f05544c72
+  data.tar.gz: b2493b59261c6c0cbe9962c6dd7e97b635de114695d77373c56608a723b78d9f2e655d59605c2788b4ca978f0e2161b0177c3db7c3c6673126af95dd5e9f1d19

data/lib/redisize/version.rb

@@ -1,3 +1,3 @@
 module Redisize
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/redisize.rb

@@ -133,7 +133,7 @@ module Redisize
       end
 
       def key_name_for model_name, attrs, type = "meta"
-         primary_key = model_name.constantize.primary_key
+         primary_key = model_name.constantize.primary_key || attrs.keys.first
          [type, model_name, primary_key, attrs[primary_key].to_s]
       end
 
@@ -244,7 +244,7 @@ module Redisize
    # self -> model instance
    def redisize_json scheme, &block
       primary_key = self.class.primary_key
-      key = ["json", self.class.polymorphic_name, primary_key, self[primary_key].to_s, scheme]
+      key = ["json", self.class.polymorphic_base_name, primary_key, self[primary_key].to_s, scheme]
 
       # binding.pry
       redisize_cache_fetch(key, expires_in: 1.week) do
@@ -259,7 +259,7 @@ module Redisize
    # self -> model instance
    def deredisize_json scheme, &block
       primary_key = self.class.primary_key
-      key = ["json", self.class.polymorphic_name, primary_key, self[primary_key], scheme]
+      key = ["json", self.class.polymorphic_base_name, primary_key, self[primary_key], scheme]
 
       # binding.pry
       Redisize.enqueue(:deredisize_json_metas, key)
@@ -267,13 +267,13 @@ module Redisize
 
    # self -> model instance
    def deredisize_model
-      Redisize.enqueue(:deredisize_model_metas, self.class.polymorphic_name)
+      Redisize.enqueue(:deredisize_model_metas, self.class.polymorphic_base_name)
    end
 
    # self -> model instance
    def reredisize_instance
       attrs = Redisize.as_json_for(self)
-      key = Redisize.key_name_for(self.class.polymorphic_name, attrs, "instance")
+      key = Redisize.key_name_for(self.class.polymorphic_base_name, attrs, "instance")
 
       # binding.pry
       redisize_cache_write(key, self, expires_in: 1000.years)
@@ -283,13 +283,23 @@ module Redisize
    # self -> model instance
    def deredisize_instance
       attrs = Redisize.as_json_for(self)
-      key = Redisize.key_name_for(self.class.polymorphic_name, attrs, "instance")
+      key = Redisize.key_name_for(self.class.polymorphic_base_name, attrs, "instance")
 
       # binding.pry
       Redisize.enqueue(:deredisize_instance_metas, key)
    end
 
    module ClassMethods
+      def polymorphic_base_name
+         base_name = base_class.to_s
+
+         if base_name == polymorphic_name
+            polymorphic_name
+         else
+            (base_class.to_s.split("::")[0...-1] + [polymorphic_name]).join("::")
+         end
+      end
+
       # self -> model class
       def redisize_sql &block
          key = ["sql", self.name, self.primary_key, self.all.to_sql]
@@ -308,7 +318,7 @@ module Redisize
       def redisize_model value, options = {}, &block
          primary_key = options.fetch(:by_key, self.primary_key).to_s
          key = ["instance", name, primary_key, value]
-         metakey = ["meta", self.class.polymorphic_name, primary_key, value]
+         metakey = ["meta", self.class.polymorphic_base_name, primary_key, value]
 
          # binding.pry
          redisize_cache_fetch(key, expires_in: 1.week) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redisize
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Pavel «Malo» Skrylev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry