discriminable 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63543cd5b47a63a6870368d2d16c9570e7cd0cebb53cfd296d717884c37fb4c3
-  data.tar.gz: b4417f8e33ff2d24a71a9ec436a26b66c38cab59395ed7fbb1182c818ff48439
+  metadata.gz: 332984f03395d4725f162027692324d66fa591f19820d7690201677c37ab8d0c
+  data.tar.gz: 49017319a8f0cc0ff6bbf498ec32fc68fc51cf062821d683e58b1340b317e7f3
 SHA512:
-  metadata.gz: e053310353bf54fcfbef35b32b5de0015f9b28903cb6dc04631bc04cfbaeec274359c0dc34d687eca7a9813eee36590f2c745e90d3c9587e381fceb9bb38886d
-  data.tar.gz: dbf905a1c5a7c7c10154ad5cc9eb73b67d81cd65513e5ac7a1ab33086dbfaee92a885b511942ecc37db4b8528a75283d270ec807db9c4982defb7ba7f2c814a8
+  metadata.gz: 23b33e6a0ebe2009ec62ef57747fbb585cd400837476a3199f28ff8733f607f3974b667713fd788457824adaa9a09ee93e0093e071010016d389b2eab2ec415a
+  data.tar.gz: fabeb7320aa926567261756a3d2c9863feb193abfd4124da42a47588d84ab3b6a4736bd197d850aa74fbd8c6841c7077bbeb41020549f0e962ca54f0d132e494

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+### [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/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/lib/discriminable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Discriminable
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 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.
@@ -46,12 +45,19 @@ module Discriminable
       self.inheritance_column = attribute.to_s
     end
 
+    # rubocop:disable Metrics/AbcSize
     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 ||= 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
     end
+    # rubocop:enable Metrics/AbcSize
 
     def discriminable_as(*values)
       raise "Only subclasses should specify .discriminable_as" if base_class?
@@ -62,22 +68,10 @@ module Discriminable
     end
 
     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
@@ -94,5 +88,9 @@ module Discriminable
       value = base_class.type_for_attribute(inheritance_column).cast(value)
       sti_class_for(value)
     end
+
+    def discriminable_descendants(value)
+      descendants.detect { |d| d.discriminable_values.include? 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.1
 platform: ruby
 authors:
 - Gregor Wassmann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord