From 2696557650b3fab5a6f203f9788d75deeae2ab30 Mon Sep 17 00:00:00 2001
From: Lucas Hosseini <lucas.hosseini@gmail.com>
Date: Wed, 13 Jan 2016 05:13:20 +0100
Subject: [PATCH] Replace `Field#included?` with `Field#excluded?`.

---
 lib/active_model/serializer/associations.rb | 2 +-
 lib/active_model/serializer/attributes.rb   | 2 +-
 lib/active_model/serializer/field.rb        | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/active_model/serializer/associations.rb b/lib/active_model/serializer/associations.rb
index fe4bfe1f..7d87156e 100644
--- a/lib/active_model/serializer/associations.rb
+++ b/lib/active_model/serializer/associations.rb
@@ -88,7 +88,7 @@ module ActiveModel
 
         Enumerator.new do |y|
           self.class._reflections.each do |reflection|
-            next unless reflection.included?(self)
+            next if reflection.excluded?(self)
             key = reflection.options.fetch(:key, reflection.name)
             next unless include_tree.key?(key)
             y.yield reflection.build_association(self, instance_options)
diff --git a/lib/active_model/serializer/attributes.rb b/lib/active_model/serializer/attributes.rb
index 6962f5ac..11d39c4b 100644
--- a/lib/active_model/serializer/attributes.rb
+++ b/lib/active_model/serializer/attributes.rb
@@ -17,7 +17,7 @@ module ActiveModel
         def attributes(requested_attrs = nil, reload = false)
           @attributes = nil if reload
           @attributes ||= self.class._attributes_data.each_with_object({}) do |(key, attr), hash|
-            next unless attr.included?(self)
+            next if attr.excluded?(self)
             next unless requested_attrs.nil? || requested_attrs.include?(key)
             hash[key] = attr.value(self)
           end
diff --git a/lib/active_model/serializer/field.rb b/lib/active_model/serializer/field.rb
index 1134bb35..35e6fe26 100644
--- a/lib/active_model/serializer/field.rb
+++ b/lib/active_model/serializer/field.rb
@@ -24,14 +24,14 @@ module ActiveModel
       #
       # @api private
       #
-      def included?(serializer)
+      def excluded?(serializer)
         case condition_type
         when :if
-          serializer.public_send(condition)
-        when :unless
           !serializer.public_send(condition)
+        when :unless
+          serializer.public_send(condition)
         else
-          true
+          false
         end
       end