torque-postgresql 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979764ebdcc3d060ce4aab1c28de3dc4f0aff8b1
-  data.tar.gz: e522c438e3d8d04f61d761d5738217b471724075
+  metadata.gz: 6422949dcd6390bea82ed290528491efd5b0effe
+  data.tar.gz: 797f069fd9b3a3207e39abfc781fc9c816ef3e72
 SHA512:
-  metadata.gz: ccbc5797fdac9fecf2208acda837db28990235576848a22d389664237f45d6cc9d2cbfe6101aa1992615a2daad01f4fc6e1f792c59c18ed51d32a943f93fbfbd
-  data.tar.gz: 20e7a8e8dbe6b4c4fc0eed20d84a003fc908a855da63ff7df00df2b6b9d706db21e28ecb36c5785156f663c6dc4ddb1168383c4d8e18dba1916f7b888f12ee02
+  metadata.gz: cf0c65ecca84216b3cf185fbeb4b5c4ef15de3a1e793a9071bf47e37dc0467ee6278ad4caba2db041874b39a3164689f3daa34b012055f38b82d52818ac3f487
+  data.tar.gz: 76d427aa302b392caa4552107f23252acb6c18608de0692b607f407e56c2fe5bba6a07fce2688708c702cd42c4b97e167bb331ab1098064a55c1b876975edc8e

data/lib/torque/postgresql/schema_cache.rb

@@ -1,5 +1,7 @@
 module Torque
   module PostgreSQL
+    LookupError = Class.new(ArgumentError)
+
     # :TODO: Create the +add+ to load inheritance info
     module SchemaCache
 
@@ -41,7 +43,7 @@ module Torque
         @data_sources_model_names.delete name
         @inheritance_dependencies.delete name
         @inheritance_associations.delete name
-        @inheritance_cache -= 1
+        @inheritance_cache = inheritance_cache_key
       end
 
       def marshal_dump # :nodoc:
@@ -102,7 +104,11 @@ module Torque
           scopes.pop
         end
 
-        nil
+        # If this part is reach, no model name was found
+        raise LookupError.new(<<~MSG.squish)
+          Unable to find a valid model that is associated with the '#{table_name}' table.
+          Please, check if they correctly inherit from ActiveRecord::Base
+        MSG
       end
 
       private
@@ -125,10 +131,14 @@ module Torque
           # Now iterate over
           while (condition = conditions.shift)
             ns_places.each{ |i| pieces[i] = condition.include?(i) ? '::' : '' }
-            next unless scope.const_defined?(pieces.join)
+
+            candidate = pieces.join
+            candidate.prepend("#{scope.name}::") unless scope === Object
+
+            klass = candidate.safe_constantize
+            next if klass.nil?
 
             # Check if the class match the table name
-            klass = scope.const_get(pieces.join)
             return klass if klass < ::ActiveRecord::Base && klass.table_name == table_name
           end
         end
@@ -146,8 +156,8 @@ module Torque
           return unless @inheritance_cache != cache_key
           @inheritance_cache = cache_key
 
-          @inheritance_dependencies = connection.inherited_tables.freeze
-          @inheritance_associations = generate_associations.freeze
+          @inheritance_dependencies = connection.inherited_tables
+          @inheritance_associations = generate_associations
         end
 
         # Calculates the inverted dependency (association), where even indirect

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails