Merge pull request #1 from daniel-sullivan/fix-for-conditionals

Fix for jsonapi-rb#80

lib/jsonapi/serializable/resource/conditional_fields.rb

@@ -22,14 +22,16 @@ def self.prepended(klass)
         end
 
         def self.extended(klass)
-          klass.class_eval do
-            include InstanceMethods
+          klass.module_eval do
+            prepend InstanceMethods
+
             class << self
               attr_accessor :field_condition_blocks
               attr_accessor :link_condition_blocks
             end
             self.field_condition_blocks ||= {}
             self.link_condition_blocks  ||= {}
+
           end
         end
 
@@ -49,6 +51,8 @@ def attribute(name, options = {}, &block)
           _register_condition(field_condition_blocks, name, options)
         end
 
+
+
         # Handle the `if` and `unless` options for relationships (has_one,
         #   belongs_to, has_many).
         #