codekindly-utils 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c87077bb68385ca6a26780c0a663e274df86d1
-  data.tar.gz: 8311851ecd14b99f841314eb569f5641dd59686d
+  metadata.gz: 0789e3f04e0428ce3886fbf813a3b9b8226abeb8
+  data.tar.gz: 7b4473cb0ee368327121ee7bba9e7844a040e097
 SHA512:
-  metadata.gz: 9173c1d767fcae0079bf752c5d5f188ed5d59b3c0e53f24d42c06bdb1d65569f956f3dbf114969bcf6eb1deefc6a18033c2274cb9c52be249be9327e60067db4
-  data.tar.gz: 4ae5443743c4714056acb3ae9fe29efe48c6a23fb97b7e5caade2c3a07dd023b3026b094c7246beef0e76b5a891e7dc405758f403d5ea1c61ee100353b1e7efd
+  metadata.gz: 1f3cc0ca3dd20c4cf473825ccee41e9df421d95c8533ff8034907fa6fb102ce7105b0bd5bba0edcc5c649c3692ef210234dba5da44389d4443b130be707987dd
+  data.tar.gz: c3fc613a058c4389ed0c9c2898a506f74177ce29deb5f8ea8c83e8e35fcb9511b3ad14cd6c4b05f3a602511111ef0632fb4a44720c9237311b74fe2e7b3f1899

data/lib/code_kindly/utils/active_record.rb

@@ -7,6 +7,7 @@ module CodeKindly
             sets = {}.with_indifferent_access
             find_active_record_classes.each do |klass|
               config_name = configurations.keys.select { |k| configurations[k]["database"] == klass.connection.current_database }.first
+              config_name ||= ::Rails.env
               sets[config_name] ||= []
               sets[config_name] << klass
             end
@@ -39,6 +40,7 @@ module CodeKindly
           connection ||= ::Rails.env
           @default_connection_class ||= {}.with_indifferent_access
           @default_connection_class[connection] ||= active_record_classes_by_connection.fetch(connection, []).first
+          @default_connection_class[connection] ||= active_record_classes_by_connection.fetch(active_record_classes_by_connection.keys).first
         end
 
       private
@@ -53,11 +55,18 @@ module CodeKindly
           end
         end
 
+        def application_active_record_class? (klass)
+          return false unless klass < ::ActiveRecord::Base
+          return false     if klass.abstract_class
+          return false     if klass.name =~ /ActiveRecord::/
+          true
+        end
+
         def find_active_record_classes
           if ::Rails.env.development?
             ::Dir.glob(::Rails.root.join("app", "models").to_s + "/**/*.rb") { |f| require f }
           end
-          ObjectSpace.each_object(Class).select { |klass| klass < ::ActiveRecord::Base && !klass.abstract_class }.sort_by(&:name)
+          ObjectSpace.each_object(Class).select { |klass| application_active_record_class?(klass) }.sort_by(&:name)
         end
       end
     end

data/lib/code_kindly/utils/s_q_l.rb

@@ -20,7 +20,7 @@ module CodeKindly
           @default_connection_class ||= CodeKindly::Utils::ActiveRecord.default_connection_class
         end
 
-        def process (method_name, query, connection_class = nil)
+        def process (method_name, query, connection_class = NilClass)
           if query.is_a?(::ActiveRecord::Relation)
             connection_class = query.klass
             query = query.to_sql
@@ -29,10 +29,10 @@ module CodeKindly
               connection_class = CodeKindly::Utils::ActiveRecord.default_connection_class(connection_class)
             else
               connection_class = connection_class.class unless connection_class.is_a?(Class)
-              connection_class = nil if connection_class < ::ActiveRecord::Base
+              connection_class = NilClass if connection_class < ::ActiveRecord::Base
             end
-            connection_class ||= default_connection_class
           end
+          connection_class = default_connection_class if connection_class == NilClass
           connection_class.connection.send(method_name, query)
         end
       end

data/lib/code_kindly/utils/version.rb

@@ -1,5 +1,5 @@
 module CodeKindly
   module Utils
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codekindly-utils
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeremy Weathers