discriminable 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a89c1ad10593a4aa548c3792343092ef153d6a9a5abd0a65ac253005dcb1b69
-  data.tar.gz: 67db220cf69fa783068f8eb9b2d4852f4a44066926da4703ac41233ff62f88d7
+  metadata.gz: 77f7e596256a4d211a4437b0a52d9e0f40d03a038e48c5ce6332083f7f910da9
+  data.tar.gz: cdaf98658eea3b2faf0bd6193c38fd83d010141c08d7c8cff643f331b51c0986
 SHA512:
-  metadata.gz: dbdd8c37b95997ccf9daf4556a79d7248e9d20165ecf8f51022961ed3ae884cb3a16316ff7e8aa7669da53af38e6fba5f9e1a61fcbe13b370c536cdc5bd5fbb1
-  data.tar.gz: 94af960d7e56c3b913faf4d2c5ef721d0400c8e3235884b03cc77707f4015372c12cd108370de41016ffabb7e202217eab9cb14657d566b161b82567b307479f
+  metadata.gz: eabc2a7dd9bbbce30010f777ffc782e9f875f4c9b5c67daa2d762c224a4493b6f48d74a52b43696de29f0ef2de57128c52e2e83612362e78f896645594e5ef95
+  data.tar.gz: da4b9c0a03acca87af217b97d996077d8d60e79fe43bf1dc0baaacde5c465b3911ce0259422382c0c9ec0a3aaeea70adaf738aa62d36f1401c0763d3f6f4fa44

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+### [2.2.3](https://github.com/gregorw/discriminable/compare/v2.2.2...v2.2.3) (2022-04-20)
+
+
+### Bug Fixes
+
+* Allow to use attribute aliases ([448e4e8](https://github.com/gregorw/discriminable/commit/448e4e81925543f1ee4949898f0ac6628eb2d3fd))
+
 ### [2.2.2](https://github.com/gregorw/discriminable/compare/v2.2.1...v2.2.2) (2022-04-17)
 
 

data/TODO.md

@@ -1,6 +1,10 @@
 - [x] multiple values per subclass
 - [x] default to first value when using hash syntax
 - [x] open-closed principle
-- [ ] use `type` column with enum, int, string, etc.
+- [ ] Bug: multiple values: Child.all query
+- [ ] more tests / examples
+- [ ] Rails 5 support
 - [ ] test permitted attributes
 - [ ] `self.abstract_class = true`
+- [ ] scoping…
+- [ ] ~~use `type` column with enum, int, string, etc.~~

data/lib/discriminable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Discriminable
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/lib/discriminable.rb

@@ -36,28 +36,28 @@ module Discriminable
 
       attribute, map = options.first
 
+      # E.g. { value: "ClassName" }
       self.discriminable_map = map.with_indifferent_access
 
       # Use first key as default discriminator
       # { a: "C", b: "C" }.invert => { "C" => :b }
       # { a: "C", b: "C" }.to_a.reverse.to_h.invert => { "C" => :a }
+      # E.g. { "ClassName" => :value }
       self.discriminable_inverse_map = map.to_a.reverse.to_h.invert
-      self.inheritance_column = attribute.to_s
+
+      attribute = attribute.to_s
+      self.inheritance_column = attribute_aliases[attribute] || attribute
     end
 
-    # rubocop:disable Metrics/AbcSize
     def discriminable_by(attribute)
       raise "Subclasses should not override .discriminable_by" unless base_class?
 
-      self.inheritance_column = attribute.to_s
-      self.discriminable_map ||= Hash.new do |map, value|
-        map[value] = discriminable_descendants(value)&.name
-      end
-      self.discriminable_inverse_map ||= Hash.new do |map, value|
-        map[value] = value.constantize.discriminable_values&.first
-      end
+      self.discriminable_map ||= discriminable_map_memoized
+      self.discriminable_inverse_map ||= discriminable_inverse_map_memoized
+
+      attribute = attribute.to_s
+      self.inheritance_column = attribute_aliases[attribute] || attribute
     end
-    # rubocop:enable Metrics/AbcSize
 
     def discriminable_as(*values)
       raise "Only subclasses should specify .discriminable_as" if base_class?
@@ -67,6 +67,7 @@ module Discriminable
       end
     end
 
+    # This is the value of the discriminable attribute
     def sti_name
       discriminable_inverse_map[name]
     end
@@ -84,13 +85,27 @@ module Discriminable
       attrs = attrs.to_h if attrs.respond_to?(:permitted?)
       return unless attrs.is_a?(Hash)
 
-      value = attrs.with_indifferent_access[inheritance_column]
-      value = base_class.type_for_attribute(inheritance_column).cast(value)
+      value = discriminable_value(attrs)
       sti_class_for(value)
     end
 
-    def discriminable_descendants(value)
-      descendants.detect { |d| d.discriminable_values.include? value }
+    def discriminable_map_memoized
+      Hash.new do |map, value|
+        map[value] = descendants.detect { |d| d.discriminable_values.include? value }&.name
+      end
+    end
+
+    def discriminable_inverse_map_memoized
+      Hash.new do |map, value|
+        map[value] = value.constantize.discriminable_values&.first
+      end
+    end
+
+    def discriminable_value(attrs)
+      attrs = attrs.with_indifferent_access
+      value = attrs[inheritance_column]
+      value ||= attrs[attribute_aliases.invert[inheritance_column]]
+      base_class.type_for_attribute(inheritance_column).cast(value)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discriminable
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Gregor Wassmann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord