codekindly-utils 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/code_kindly/utils/active_record.rb +10 -1
- data/lib/code_kindly/utils/s_q_l.rb +3 -3
- data/lib/code_kindly/utils/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0789e3f04e0428ce3886fbf813a3b9b8226abeb8
|
4
|
+
data.tar.gz: 7b4473cb0ee368327121ee7bba9e7844a040e097
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1f3cc0ca3dd20c4cf473825ccee41e9df421d95c8533ff8034907fa6fb102ce7105b0bd5bba0edcc5c649c3692ef210234dba5da44389d4443b130be707987dd
|
7
|
+
data.tar.gz: c3fc613a058c4389ed0c9c2898a506f74177ce29deb5f8ea8c83e8e35fcb9511b3ad14cd6c4b05f3a602511111ef0632fb4a44720c9237311b74fe2e7b3f1899
|
@@ -7,6 +7,7 @@ module CodeKindly
|
|
7
7
|
sets = {}.with_indifferent_access
|
8
8
|
find_active_record_classes.each do |klass|
|
9
9
|
config_name = configurations.keys.select { |k| configurations[k]["database"] == klass.connection.current_database }.first
|
10
|
+
config_name ||= ::Rails.env
|
10
11
|
sets[config_name] ||= []
|
11
12
|
sets[config_name] << klass
|
12
13
|
end
|
@@ -39,6 +40,7 @@ module CodeKindly
|
|
39
40
|
connection ||= ::Rails.env
|
40
41
|
@default_connection_class ||= {}.with_indifferent_access
|
41
42
|
@default_connection_class[connection] ||= active_record_classes_by_connection.fetch(connection, []).first
|
43
|
+
@default_connection_class[connection] ||= active_record_classes_by_connection.fetch(active_record_classes_by_connection.keys).first
|
42
44
|
end
|
43
45
|
|
44
46
|
private
|
@@ -53,11 +55,18 @@ module CodeKindly
|
|
53
55
|
end
|
54
56
|
end
|
55
57
|
|
58
|
+
def application_active_record_class? (klass)
|
59
|
+
return false unless klass < ::ActiveRecord::Base
|
60
|
+
return false if klass.abstract_class
|
61
|
+
return false if klass.name =~ /ActiveRecord::/
|
62
|
+
true
|
63
|
+
end
|
64
|
+
|
56
65
|
def find_active_record_classes
|
57
66
|
if ::Rails.env.development?
|
58
67
|
::Dir.glob(::Rails.root.join("app", "models").to_s + "/**/*.rb") { |f| require f }
|
59
68
|
end
|
60
|
-
ObjectSpace.each_object(Class).select { |klass| klass
|
69
|
+
ObjectSpace.each_object(Class).select { |klass| application_active_record_class?(klass) }.sort_by(&:name)
|
61
70
|
end
|
62
71
|
end
|
63
72
|
end
|
@@ -20,7 +20,7 @@ module CodeKindly
|
|
20
20
|
@default_connection_class ||= CodeKindly::Utils::ActiveRecord.default_connection_class
|
21
21
|
end
|
22
22
|
|
23
|
-
def process (method_name, query, connection_class =
|
23
|
+
def process (method_name, query, connection_class = NilClass)
|
24
24
|
if query.is_a?(::ActiveRecord::Relation)
|
25
25
|
connection_class = query.klass
|
26
26
|
query = query.to_sql
|
@@ -29,10 +29,10 @@ module CodeKindly
|
|
29
29
|
connection_class = CodeKindly::Utils::ActiveRecord.default_connection_class(connection_class)
|
30
30
|
else
|
31
31
|
connection_class = connection_class.class unless connection_class.is_a?(Class)
|
32
|
-
connection_class =
|
32
|
+
connection_class = NilClass if connection_class < ::ActiveRecord::Base
|
33
33
|
end
|
34
|
-
connection_class ||= default_connection_class
|
35
34
|
end
|
35
|
+
connection_class = default_connection_class if connection_class == NilClass
|
36
36
|
connection_class.connection.send(method_name, query)
|
37
37
|
end
|
38
38
|
end
|