iron_trail 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4541270b52cf87af024251d4b442fca74f17bf54c913b12baa2f61267d6aef7f
-  data.tar.gz: c151fa8780fb9ef8aeb6e8ee0870b315cb2a97a776086ea1653776ef12b7f124
+  metadata.gz: d9d355d0b56b36b299f0eac1f43dea8ba843358119a8d2d02ddce34528f504f7
+  data.tar.gz: e0915938859c2263226ee04fac0ae56ab7f11782dab1e51f38cb745ded6edca2
 SHA512:
-  metadata.gz: 2f81445c9ffac1c12426e5313d62587ec6cd91609fef8658ac23d156e6298453aedf6d43282a999d80eda8807139b35fc7e73491a7b62893a974a9df06950de0
-  data.tar.gz: 32be78582d5146fb289b4b0a297d64d2d6c912528405d2a16f0111649cd686e39098bce51f9fea335d590d0c96d1cd1b703c552f6e898e504f5a4727976119ce
+  metadata.gz: 6349be50c371976cc781d8f0921d4112e97230086c81f0cc6886e66ff35c128c7ddf9d5db67393a8b77d573ad39b81595e359071e7f6a0eb2e38f040d4e795a9
+  data.tar.gz: 96f17b9eaab3ed0ec8963a96b2f4d9231b43c0e5171db548ae29f59234282ee66ff6ae63a44ee7b807d9d30fc652a714157de5ab75cda68b2e7770fddf7ab2d3

data/lib/iron_trail/reifier.rb

@@ -25,27 +25,32 @@ module IronTrail
       record
     end
 
-    def self.model_from_table_name(table_name, sti_type=nil)
-      index = ActiveRecord::Base.descendants.reject(&:abstract_class).chunk(&:table_name).to_h do |key, val|
-        v = \
-          if val.length == 1
-            val[0]
-          else
-            val.to_h { |k| [k.to_s, k] }
-          end
+    def self.model_from_table_name(table_name, sti_type = nil)
+      candidates = ActiveRecord::Base.descendants
+        .reject(&:abstract_class)
+        .select { |klass| klass.table_name == table_name }
 
-        [key, v]
-      end
+      raise "Cannot infer model from table named '#{table_name}'" if candidates.empty?
+      return candidates.first if candidates.one?
 
-      klass = index[table_name]
-      raise "Cannot infer model from table named '#{table_name}'" unless klass
+      if sti_type.present?
+        klass = candidates.find { |c| c.name == sti_type }
+        return klass if klass
+
+        raise "Cannot infer STI model for table #{table_name} and type '#{sti_type}'"
+      end
 
-      return klass unless klass.is_a?(Hash)
-      klass = klass[sti_type]
+      # When sti_type is nil and multiple classes share the table,
+      # filter out STI subclasses to find the base class.
+      bases = candidates.reject { |c| candidates.any? { |other| other != c && c < other } }
+      return bases.first if bases.one?
 
-      return klass if klass
+      # If multiple base classes remain, prefer the one that is an STI base
+      # (i.e., has subclasses among the original candidates).
+      sti_bases = bases.select { |c| candidates.any? { |other| other != c && other < c } }
+      return sti_bases.first if sti_bases.one?
 
-      raise "Cannot infer STI model for table #{table_name} and type '#{sti_type}'"
+      raise "Cannot infer model from table named '#{table_name}'"
     end
   end
 end

data/lib/iron_trail/version.rb

@@ -1,5 +1,5 @@
 # frozen_literal_string: true
 
 module IronTrail
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_trail
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - André Diego Piske