lib/divining_rod/murge.rb in divining_rod-0.5.0 vs lib/divining_rod/murge.rb in divining_rod-0.6.0
- old
+ new
@@ -1,16 +1,17 @@
module DiviningRod
module Murge
-
+
# This is tacky, but I'm preserving tags in the option hash
# and only want to have to write this once
#
def murge(old_opts, new_opts)
old_opts = old_opts || {}
+ new_opts = new_opts || {}
tags = Array(old_opts[:tags]) | Array(new_opts[:tags])
opts = old_opts.merge(new_opts)
opts[:tags] = tags
opts
end
-
+
end
-end
\ No newline at end of file
+end