iron_trail 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4541270b52cf87af024251d4b442fca74f17bf54c913b12baa2f61267d6aef7f
-  data.tar.gz: c151fa8780fb9ef8aeb6e8ee0870b315cb2a97a776086ea1653776ef12b7f124
+  metadata.gz: 53e65b9972a06bb052bf64095ab551e9da2da8068d2e6dc4f99b212807d00efc
+  data.tar.gz: 26d20d4244935be46e0734ca97135a0708bc055cc766d97f34c777f5fa5c4630
 SHA512:
-  metadata.gz: 2f81445c9ffac1c12426e5313d62587ec6cd91609fef8658ac23d156e6298453aedf6d43282a999d80eda8807139b35fc7e73491a7b62893a974a9df06950de0
-  data.tar.gz: 32be78582d5146fb289b4b0a297d64d2d6c912528405d2a16f0111649cd686e39098bce51f9fea335d590d0c96d1cd1b703c552f6e898e504f5a4727976119ce
+  metadata.gz: '091d403022eb43516db646a17c96f9a65d1367dca2e845d0ebd7ca4d614edfa774a2fc88bbbbae5d89aaaca134d3ef255408594a0c176805834709257d02ee59'
+  data.tar.gz: 8bad5c9401a1bcb21d6504027944ccd8346fcbfdcad6730fc6155468ba0671050027395b293c3219285071b13e4ee71838266b4005bcb0dd06bdee8933f677f6

data/lib/iron_trail/query_transformer.rb

@@ -24,7 +24,9 @@ module IronTrail
         metadata = JSON.dump(current_metadata)
 
         if metadata.length > METADATA_MAX_LENGTH
-          Rails.logger.warn("IronTrail metadata is longer than maximum length! #{metadata.length} > #{METADATA_MAX_LENGTH}")
+          msg = "IronTrail metadata is longer than maximum length! #{metadata.length} > #{METADATA_MAX_LENGTH}"
+          Rails.logger.warn(msg)
+          Sentry.capture_message(msg, level: :warning) if defined?(Sentry)
           next query
         end
 

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.2'
 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.2
 platform: ruby
 authors:
 - André Diego Piske
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Creates a trail strong as iron
 test_files: []