diff options
Diffstat (limited to 'activemodel/lib/active_model')
| -rw-r--r-- | activemodel/lib/active_model/observing.rb | 4 | ||||
| -rw-r--r-- | activemodel/lib/active_model/serializers/xml.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb index 4682ae07ef..b94ad4bb9b 100644 --- a/activemodel/lib/active_model/observing.rb +++ b/activemodel/lib/active_model/observing.rb @@ -71,9 +71,7 @@ module ActiveModel # Notify list of observers of a change. def notify_observers(*arg) - for observer in observer_instances - observer.update(*arg) - end + observer_instances.each { |observer| observer.update(*arg) } end # Total number of observers. diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index 19639b1363..eb3975f86b 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -25,7 +25,7 @@ module ActiveModel def decorations decorations = {} decorations[:encoding] = 'base64' if type == :binary - decorations[:type] = type unless type == :string + decorations[:type] = (type == :string) ? nil : type decorations[:nil] = true if value.nil? decorations end |