mushin 0.24.0 → 0.25.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/mushin/main.rb +6 -3
- data/lib/mushin/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: da81c1675da6e9783e42353eef72a6672f78fe02
|
|
4
|
+
data.tar.gz: 1c9ebe65abe0035b5d6b32e907e12aaaa3b9c754
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b6b7f343fb0b15fb6e151cc21c8f890c1503bb06545934aaffe575aae35927ed0eaea8d8c053b07e4a726a09f99b5a8fddc31007d163275b0e7290f2b161cd76
|
|
7
|
+
data.tar.gz: 9fbd0f16b471bc572113762cd11cfe81d8a31ee69cbab3254bd7fdc3b9c3089e450cc29dfbc5434f22a0fe32310386eee0892629359ae1c49d2c0d9728388b41
|
data/lib/mushin/main.rb
CHANGED
|
@@ -83,9 +83,12 @@ module Mushin
|
|
|
83
83
|
ext_hash[:params][klass_params_hash.invert[instance_hash_key]] = instance_hash_value unless klass_params_hash.invert[instance_hash_key].nil?
|
|
84
84
|
end
|
|
85
85
|
|
|
86
|
-
#NOTE adds the extras from klass_hashs
|
|
87
|
-
ext_hash[:opts].merge
|
|
88
|
-
ext_hash[:params].merge
|
|
86
|
+
#NOTE adds the extras from klass_hashs via reverse merge
|
|
87
|
+
ext_hash[:opts] = klass_opts_hash.merge(ext_hash[:opts])
|
|
88
|
+
ext_hash[:params] = klass_opts_hash.merge(ext_hash[:params])
|
|
89
|
+
|
|
90
|
+
#ext_hash[:opts].merge!(klass_opts_hash)
|
|
91
|
+
#ext_hash[:params].merge!(klass_params_hash)
|
|
89
92
|
|
|
90
93
|
$log.debug "insert_before 0 into stack: #{ext_hash[:ext]}, #{ext_hash[:opts]}, #{ext_hash[:params]}"
|
|
91
94
|
@stack.insert_before 0, ext_hash[:ext], ext_hash[:opts], ext_hash[:params]
|
data/lib/mushin/version.rb
CHANGED