globals 0.1.4 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/globals.rb +6 -6
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 28edc8d32d4a8d5bf657b37dd35b740c83d220bc
|
4
|
+
data.tar.gz: b81415afb297bade29d7d0ab39383f429bf9eb43
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b7bdb8f42fdabe90f453ec529e618f766149ca744d564ba2f01631c845dcf011f00590a35c47ea4506fa32242fac74ed8e2486688d1d9fa5b1bf656a46f144b4
|
7
|
+
data.tar.gz: 5a43253b4e8f0a40754bc9740dcf393f97d3b581578ed58ee6dd8489ce3df7c4112e7c6d5f8b164b83762e1e7424c1d998a0cef9512dc18ac3a193dea9bdb301
|
data/lib/globals.rb
CHANGED
@@ -22,8 +22,8 @@ class Globals
|
|
22
22
|
define_accessors
|
23
23
|
end
|
24
24
|
|
25
|
-
def self.load(
|
26
|
-
yaml = YAML.load ERB.new(
|
25
|
+
def self.load(content, env)
|
26
|
+
yaml = YAML.load ERB.new(content).result
|
27
27
|
hash = yaml['defaults'] || {}
|
28
28
|
hash.recursive_merge!(yaml[env] || {})
|
29
29
|
|
@@ -36,14 +36,14 @@ class Globals
|
|
36
36
|
hash
|
37
37
|
end
|
38
38
|
|
39
|
-
def self.read(
|
39
|
+
def self.read(content, env='development')
|
40
40
|
env = env.to_s
|
41
|
-
hash = load(
|
41
|
+
hash = load(content, env)
|
42
42
|
new(hash, env)
|
43
43
|
end
|
44
44
|
|
45
|
-
def override(
|
46
|
-
overrides = self.class.load(
|
45
|
+
def override(override_content)
|
46
|
+
overrides = self.class.load(override_content, @environment)
|
47
47
|
|
48
48
|
if overrides
|
49
49
|
@globals.recursive_merge! overrides
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: globals
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sujoy Gupta
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2014-03-19 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: A simple way to define globals for use in a Ruby application.
|
14
14
|
email: sujoyg@gmail.com
|