config_reader 0.0.3 → 0.0.4

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.
Files changed (4) hide show
  1. data/History.txt +3 -0
  2. data/lib/config_reader.rb +2 -1
  3. data/lib/config_reader/version.rb +1 -1
  4. metadata +2 -2
data/History.txt CHANGED
@@ -1,3 +1,6 @@
1
+ == 0.0.4 2008-12-08
2
+ * fix the environment merging issue, for real this time
3
+
1
4
  == 0.0.3 2008-12-02
2
5
  * fix the environment merging issue
3
6
 
data/lib/config_reader.rb CHANGED
@@ -40,7 +40,8 @@ class ConfigReader
40
40
  end
41
41
 
42
42
  _conf = conf['defaults']
43
- _conf.merge(conf[env]) if conf[env]
43
+ _conf.merge!(conf[env]) if conf[env]
44
+ _conf
44
45
  end
45
46
 
46
47
  def [](key)
data/lib/config_reader/version.rb CHANGED
@@ -2,7 +2,7 @@ module ConfigReader
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 0
5
- TINY = 3
5
+ TINY = 4
6
6
 
7
7
  STRING = [MAJOR, MINOR, TINY].join('.')
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: config_reader
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Moen
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-12-02 00:00:00 -06:00
12
+ date: 2008-12-08 00:00:00 -06:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency