simply_configurable 0.1.0 → 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.
Files changed (4) hide show
  1. data/CHANGELOG.rdoc +3 -0
  2. data/lib/simply_configurable/version.rb +1 -1
  3. data/lib/simply_configurable.rb +5 -1
  4. metadata +3 -3
data/CHANGELOG.rdoc CHANGED
@@ -1,5 +1,8 @@
1
1
  = Simply Configurable
2
2
 
3
+ == Version 0.2.0
4
+ * Added ability for modules (not just classes) to be SimplyConfigurable
5
+
3
6
  == Version 0.1.0
4
7
  * Added capability to nest SimplyConfigurable classes (see README)
5
8
 
data/lib/simply_configurable/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SimplyConfigurable
2
- VERSION = '0.1.0'
2
+ VERSION = '0.2.0'
3
3
  end
data/lib/simply_configurable.rb CHANGED
@@ -21,7 +21,11 @@ module SimplyConfigurable
21
21
  @config.merge!(options || {})
22
22
  end
23
23
 
24
- superclass_config.merge(@config)
24
+ if self.is_a?(Class)
25
+ superclass_config.merge(@config)
26
+ else
27
+ @config
28
+ end
25
29
  end
26
30
 
27
31
  private
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simply_configurable
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
4
+ hash: 23
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
- - 1
8
+ - 2
9
9
  - 0
10
- version: 0.1.0
10
+ version: 0.2.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - David Dawson