rails-infrastructure 0.1.1 → 0.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/infrastructure/constants.rb +1 -1
- data/lib/infrastructure/databases.rb +12 -6
- 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: a5045a137b3998ad395180087110314e178da906
|
4
|
+
data.tar.gz: 633b880d6a015d602f50c68ec800d6691ec504ff
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5210f0ce3c3428b49b1b900c7584605826374ec10faef069498668b08340f3f6b9aedaff9f9cd339df8240bf6f64242ae39523c5ee91ad36644be3a8a8fd3544
|
7
|
+
data.tar.gz: a6d1ce9fe4b843858396051e8c57fad8881c39a4ba4ef26fc28af6e4dd3bf9ec521b758f8f441d5e1e1fc954f649ca19b750c824715222e4816085d2cf77c18c
|
@@ -11,7 +11,9 @@ class Infrastructure
|
|
11
11
|
@environment = environment.to_sym
|
12
12
|
@global_defaults = {}
|
13
13
|
@environment_defaults = {}
|
14
|
-
@system = {
|
14
|
+
@system = {
|
15
|
+
id: 'system'
|
16
|
+
}
|
15
17
|
callback :after_configure, -> { merge_defaults }
|
16
18
|
callback :after_assignment, -> (key, value) { merge_defaults }
|
17
19
|
end
|
@@ -94,17 +96,21 @@ class Infrastructure
|
|
94
96
|
connection.create_database database(id)
|
95
97
|
end
|
96
98
|
|
97
|
-
def connect(id)
|
98
|
-
|
99
|
+
def connect(id, params = {})
|
100
|
+
config = config(id)
|
101
|
+
unless params[:fallback]
|
102
|
+
raise ArgumentError, "database configuration for #{id} in environment #{environment} is not configured" if config[:id] != id.to_s
|
103
|
+
end
|
104
|
+
orm.establish_connection config
|
99
105
|
end
|
100
106
|
|
101
|
-
def connect!(id)
|
107
|
+
def connect!(id, params = {})
|
102
108
|
begin
|
103
|
-
connect id
|
109
|
+
connect id, params
|
104
110
|
rescue StandardError
|
105
111
|
connect system
|
106
112
|
create id
|
107
|
-
connect id
|
113
|
+
connect id, params
|
108
114
|
end
|
109
115
|
end
|
110
116
|
|