discriminable 2.2.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63543cd5b47a63a6870368d2d16c9570e7cd0cebb53cfd296d717884c37fb4c3
-  data.tar.gz: b4417f8e33ff2d24a71a9ec436a26b66c38cab59395ed7fbb1182c818ff48439
+  metadata.gz: 77f7e596256a4d211a4437b0a52d9e0f40d03a038e48c5ce6332083f7f910da9
+  data.tar.gz: cdaf98658eea3b2faf0bd6193c38fd83d010141c08d7c8cff643f331b51c0986
 SHA512:
-  metadata.gz: e053310353bf54fcfbef35b32b5de0015f9b28903cb6dc04631bc04cfbaeec274359c0dc34d687eca7a9813eee36590f2c745e90d3c9587e381fceb9bb38886d
-  data.tar.gz: dbf905a1c5a7c7c10154ad5cc9eb73b67d81cd65513e5ac7a1ab33086dbfaee92a885b511942ecc37db4b8528a75283d270ec807db9c4982defb7ba7f2c814a8
+  metadata.gz: eabc2a7dd9bbbce30010f777ffc782e9f875f4c9b5c67daa2d762c224a4493b6f48d74a52b43696de29f0ef2de57128c52e2e83612362e78f896645594e5ef95
+  data.tar.gz: da4b9c0a03acca87af217b97d996077d8d60e79fe43bf1dc0baaacde5c465b3911ce0259422382c0c9ec0a3aaeea70adaf738aa62d36f1401c0763d3f6f4fa44

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## [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)
+
+
+### Bug Fixes
+
+* Typo in gemspec uris ([f77253f](https://github.com/gregorw/discriminable/commit/f77253f2cb2f400e04baf3c7bd6083f42ae3aa6b))
+
+### [2.2.1](https://github.com/gregorw/discriminable/compare/v2.2.0...v2.2.1) (2022-04-17)
+
+
+### Bug Fixes
+
+* Simplify STI using OCP ([68f49c2](https://github.com/gregorw/discriminable/commit/68f49c2d0b7a9437525fe0bc9ebef1927fccb2e8))
+
 ## [2.2.0](https://github.com/gregorw/discriminable/compare/v2.1.1...v2.2.0) (2022-04-16)
 
 

data/README.md

@@ -3,7 +3,7 @@
 # Discriminable
 
 [![Gem Version](https://badge.fury.io/rb/discriminable.svg)](https://rubygems.org/gems/discriminable)
-[![CI](https://github.com/gregorw/discriminable/actions/workflows/main.yml/badge.svg)](https://github.com/gregorw/discriminable/actions/workflows/main.yml)
+[![CI](https://github.com/gregorw/discriminable/actions/workflows/main.yml/badge.svg?event=push)](https://github.com/gregorw/discriminable/actions/workflows/main.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/94041c5f946b64040368/maintainability)](https://codeclimate.com/github/gregorw/discriminable/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/94041c5f946b64040368/test_coverage)](https://codeclimate.com/github/gregorw/discriminable/test_coverage)
 

data/Rakefile

@@ -16,6 +16,4 @@ RuboCop::RakeTask.new
 task default: %i[test rubocop]
 
 # Release task
-# gem build *.gemspec
-# gem push *.gem
-# rm *.gem
+# gem build *.gemspec && gem push *.gem && rm *.gem

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.0"
+  VERSION = "2.2.3"
 end

data/lib/discriminable.rb

@@ -27,7 +27,6 @@ module Discriminable
     class_attribute :discriminable_map, instance_writer: false
     class_attribute :discriminable_inverse_map, instance_writer: false
     class_attribute :discriminable_values, instance_writer: false
-    class_attribute :discriminable_as_descendant_value, instance_writer: false
   end
 
   # Specify the column to use for discrimination.
@@ -37,20 +36,27 @@ 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
 
     def discriminable_by(attribute)
       raise "Subclasses should not override .discriminable_by" unless base_class?
 
-      self.discriminable_as_descendant_value = true
-      self.inheritance_column = attribute.to_s
+      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
 
     def discriminable_as(*values)
@@ -61,23 +67,12 @@ module Discriminable
       end
     end
 
+    # This is the value of the discriminable attribute
     def sti_name
-      if discriminable_as_descendant_value
-        self.discriminable_inverse_map ||= Hash.new do |map, value|
-          map[value] = name.constantize.discriminable_values&.first
-        end
-      end
-
       discriminable_inverse_map[name]
     end
 
     def sti_class_for(value)
-      if discriminable_as_descendant_value
-        self.discriminable_map ||= Hash.new do |map, v|
-          map[v] = descendants.detect { |d| d.discriminable_values.include? v }&.name
-        end
-      end
-
       return self unless (type_name = discriminable_map[value])
 
       super type_name
@@ -90,9 +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_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.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Gregor Wassmann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -131,13 +131,13 @@ files:
 - lib/discriminable.rb
 - lib/discriminable/version.rb
 - sig/discriminable.rbs
-homepage: https://github.com/gregorw/discrimainable
+homepage: https://github.com/gregorw/discriminable
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/gregorw/discrimainable
-  source_code_uri: https://github.com/gregorw/discrimainable
-  changelog_uri: https://github.com/gregorw/discrimainable/CHANGELOG.md
+  homepage_uri: https://github.com/gregorw/discriminable
+  source_code_uri: https://github.com/gregorw/discriminable
+  changelog_uri: https://github.com/gregorw/discriminable/CHANGELOG.md
   rubygems_mfa_required: 'false'
 post_install_message:
 rdoc_options: []