Merge pull request fog#557 from gnufied/master

Cleanup Attributes#merge_attributes
demonbane · Oct 12, 2011 · a7829fe · a7829fe
2 parents 3f00d86 + 112c956
commit a7829fe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/fog/core/attributes.rb b/lib/fog/core/attributes.rb
@@ -142,7 +142,7 @@ def merge_attributes(new_attributes = {})
           unless self.class.ignored_attributes.include?(key)
             if aliased_key = self.class.aliases[key]
               send("#{aliased_key}=", value)
-            elsif (public_methods | private_methods).detect {|method| ["#{key}=", :"#{key}="].include?(method)}
+            elsif self.respond_to?("#{key}=",true)
               send("#{key}=", value)
             else
               attributes[key] = value