torque-postgresql 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b95a55ebfe82e5b96582da09307f1d45d62ba922
-  data.tar.gz: 38a068ec3fa7cc5aab2425a31e8ed37a49b15132
+  metadata.gz: 261ea2ffc412c3f06c841be868141f631fa9f983
+  data.tar.gz: e5f58518bcc173eaa8be19ea24e25f086546e78c
 SHA512:
-  metadata.gz: b708c73cfcac1798474e35099570e4def16a6a51b2448ef34ce2ec5e97dd4c8d57f48fa51f18182f0405afa7eed1884b81846cb3b2e132b638c8711ee80dd72c
-  data.tar.gz: 7bab6bd30e0b3898826b20cce99ff629192ea62d772864e10a3fc141e86e5f3f27a0f9e459addc29a8a27bcbb7df17920831d0f7e7b01ac823d65f600b699530
+  metadata.gz: 2742264fd62ee56eea953349bd95dc441d37948e2ebce6e8acb69ec200aabab5ca95e016ad7654b6626fc4bac465797abf88e3bd259f5149f2e3d60f74cae566
+  data.tar.gz: 879d2eb8e794009a63f1d69ea85b967a126709b242cee0fd9ccac6d1ad4734e8ca62aa69413c708b47c692557e1b935ed759562caebae56bc48e85afe3269bc9

data/Rakefile

@@ -14,13 +14,16 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Prints a schema dump of the test database'
-task :dump do |t|
+desc 'Initialize the local environment'
+task :environment do |t|
   lib  = File.expand_path('../lib', __FILE__)
   spec = File.expand_path('../spec', __FILE__)
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
   $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
+end
 
+desc 'Prints a schema dump of the test database'
+task dump: :environment do |t|
   require 'byebug'
   require 'spec_helper'
   ActiveRecord::SchemaDumper.dump

data/lib/torque/postgresql/associations/association_scope.rb

@@ -20,7 +20,6 @@ module Torque
             # 5.2 reflection, owner
 
             reflection = args.size.eql?(2) ? args[0] : args[1]
-            puts reflection.connected_through_array?.inspect
             return super unless reflection.connected_through_array?
 
             table = args[0] if args.size > 2

data/lib/torque/postgresql/schema_cache.rb

@@ -11,6 +11,7 @@ module Torque
         @data_sources_model_names = {}
         @inheritance_dependencies = {}
         @inheritance_associations = {}
+        @inheritance_loaded = false
       end
 
       def initialize_dup(*) # :nodoc:
@@ -22,16 +23,16 @@ module Torque
 
       def encode_with(coder) # :nodoc:
         super
-        coder["data_sources_model_names"] = @data_sources_model_names
-        coder["inheritance_dependencies"] = @inheritance_dependencies
-        coder["inheritance_associations"] = @inheritance_associations
+        coder['data_sources_model_names'] = @data_sources_model_names
+        coder['inheritance_dependencies'] = @inheritance_dependencies
+        coder['inheritance_associations'] = @inheritance_associations
       end
 
       def init_with(coder) # :nodoc:
         super
-        @data_sources_model_names = coder["data_sources_model_names"]
-        @inheritance_dependencies = coder["inheritance_dependencies"]
-        @inheritance_associations = coder["inheritance_associations"]
+        @data_sources_model_names = coder['data_sources_model_names']
+        @inheritance_dependencies = coder['inheritance_dependencies']
+        @inheritance_associations = coder['inheritance_associations']
       end
 
       def add(table_name, *) # :nodoc:
@@ -41,6 +42,7 @@ module Torque
         if @data_sources.key?(table_name)
           @inheritance_dependencies.clear
           @inheritance_associations.clear
+          @inheritance_loaded = false
         end
       end
 
@@ -49,6 +51,7 @@ module Torque
         @data_sources_model_names.clear
         @inheritance_dependencies.clear
         @inheritance_associations.clear
+        @inheritance_loaded = false
       end
 
       def size # :nodoc:
@@ -71,10 +74,12 @@ module Torque
           @inheritance_dependencies,
           @inheritance_associations,
           @data_sources_model_names,
+          @inheritance_loaded,
         ]
       end
 
       def marshal_load(array) # :nodoc:
+        @inheritance_loaded = array.pop
         @data_sources_model_names = array.pop
         @inheritance_associations = array.pop
         @inheritance_dependencies = array.pop
@@ -101,13 +106,13 @@ module Torque
       end
 
       # Try to find a model based on a given table
-      def lookup_model(table_name, scopred_class = '')
-        scopred_class = scopred_class.name if scopred_class.is_a?(Class)
+      def lookup_model(table_name, scoped_class = '')
+        scoped_class = scoped_class.name if scoped_class.is_a?(Class)
         return @data_sources_model_names[table_name] \
           if @data_sources_model_names.key?(table_name)
 
         # Get all the possible scopes
-        scopes = scopred_class.scan(/(?:::)?[A-Z][a-z]+/)
+        scopes = scoped_class.scan(/(?:::)?[A-Z][a-z]+/)
         scopes.unshift('Object::')
 
         # Consider the maximum namespaced possible model name
@@ -164,14 +169,17 @@ module Torque
         # Reload information about tables inheritance and dependencies, uses a
         # cache to not perform additional checkes
         def reload_inheritance_data!
-          return if @inheritance_dependencies.present?
+          return if @inheritance_loaded
           @inheritance_dependencies = connection.inherited_tables
           @inheritance_associations = generate_associations
+          @inheritance_loaded = true
         end
 
         # Calculates the inverted dependency (association), where even indirect
         # inheritance comes up in the list
         def generate_associations
+          return {} if @inheritance_dependencies.empty?
+
           result = Hash.new{ |h, k| h[k] = [] }
           masters = @inheritance_dependencies.values.flatten.uniq
 
@@ -200,7 +208,7 @@ module Torque
           super
           @data_sources_model_names = Torque::PostgreSQL.config
             .irregular_models.slice(*@data_sources.keys).map do |table_name, model_name|
-            [table_name, model_name.constantize]
+            [table_name, (model_name.is_a?(Class) ? model_name : model_name.constantize)]
           end.to_h
         end
 

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails