mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Merge pull request #557 from gnufied/master
Cleanup Attributes#merge_attributes
This commit is contained in:
commit
a7829fe856
1 changed files with 1 additions and 1 deletions
|
@ -142,7 +142,7 @@ module Fog
|
||||||
unless self.class.ignored_attributes.include?(key)
|
unless self.class.ignored_attributes.include?(key)
|
||||||
if aliased_key = self.class.aliases[key]
|
if aliased_key = self.class.aliases[key]
|
||||||
send("#{aliased_key}=", value)
|
send("#{aliased_key}=", value)
|
||||||
elsif (public_methods | private_methods).detect {|method| ["#{key}=", :"#{key}="].include?(method)}
|
elsif self.respond_to?("#{key}=",true)
|
||||||
send("#{key}=", value)
|
send("#{key}=", value)
|
||||||
else
|
else
|
||||||
attributes[key] = value
|
attributes[key] = value
|
||||||
|
|
Loading…
Reference in a new issue