better_record 0.22.5 → 0.22.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d23ae910e5777201c932f569405099050acae9761fcbc320f5da78d8c6b08a
-  data.tar.gz: 0a5901d81b9468f06bf7fa58bba90449cfc84126d3333a14d7ce007e7305a7a4
+  metadata.gz: a24b88309e9f96d1e6cd205addfd4e9e4c6c8b0f9e84d1eb7e04c1c2538841af
+  data.tar.gz: 4525937c547907d0485358a2b7a2f38d5a7df7dfd8ce635cd9b888a6c0609aeb
 SHA512:
-  metadata.gz: ad293180c34f9fa78a089b59452230550599db7f73cac893d080bce986b44d9cabb9bfa3b6ed62d461477965672a31808c9c055f98e5b640b81cf32103d7a64c
-  data.tar.gz: 42dd7e2e3ece6d1b6f7ba797e30bceed78ebb36f9677c0b9e1ede660b4738875558da1df4e747614598320cb970e17b5116d6804016cdfa2463e02a6baa5489e
+  metadata.gz: da437ec12b078e879d4e65ec7c1d09c1b9966a06158412e485938a3dbd0f61ae9b073ca5ea791944cf0fea9a0b13adf7115f7eab7e2066dbef8a4f26db85e914
+  data.tar.gz: dc700fda50ac668eba00991a64307d631698218210e938b2f5b9929cbf4d98f1591e500fe70d0b8bc74a06bbf7f58102071531f7fc2788ed19abc7e6de251ff6

data/lib/better_record.rb

@@ -42,6 +42,12 @@ module BetterRecord
       attrs_hash.dup
     end
 
+    def model_index_by_table_name(reset = false)
+      @index_by_table_name = nil if reset
+      
+      @index_by_table_name ||= ActiveRecord::Base.descendants.reject(&:abstract_class).index_by(&:table_name)
+    end
+
     attr_accessor *ATTRIBUTE_METHODS
 
     # ATTRIBUTE_METHODS.each do |method|

data/lib/better_record/concerns/active_record_extensions/associations_extensions/belongs_to_polymorphic_extensions.rb

@@ -12,7 +12,8 @@ module BetterRecord
       included do
         def klass
           type = owner[reflection.foreign_type]
-          type.presence && type.capitalize.singularize.constantize
+          type.presence &&
+            BetterRecord.model_index_by_table_name[type] ||= find_model_from_table_name(type)
         end
 
         def replace_keys record
@@ -23,6 +24,47 @@ module BetterRecord
         def get_type_value record
           BetterRecord::PolymorphicOverride.polymorphic_value(record.class, reflection.options)
         end
+
+        def find_model_from_table_name(type)
+          found_model = nil
+
+          begin
+            found_model = sub_string.classify.constantize
+            return found_model
+          rescue
+            found_model = nil
+          end
+
+          permeate_options(type.to_s.underscore).each do |sub_string|
+            begin
+              found_model = sub_string.classify.constantize
+            rescue
+              found_model = nil
+            end
+            break if found_model
+          end
+
+          raise "Model Not Found: #{type}" unless found_model
+
+          found_model
+        end
+
+        def permeate_options(type)
+          str = type.dup.sub(/^_+/, '').gsub(/_+/, '_')
+          Enumerator.new do |y|
+            if str =~ /_/
+              split_str = str.split('_')
+
+              underscores = str.gsub(/[^_]+/, '').split('')
+
+              [*underscores, *Array.new(underscores.size, '/')].permutation(underscores.size).each do |mutation|
+                y << split_str.zip(mutation).flatten.join
+              end
+            else
+              y << str
+            end
+          end
+        end
       end
     end
   end

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.22.5'
+  VERSION = '0.22.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.22.5
+  version: 0.22.6
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails