Merge branch 'master' into base_spec_single_ops

# Conflicts:
#	lib/jsonapi/request_parser.rb

Author: lgebhardt

lib/jsonapi/request_parser.rb

@@ -122,7 +122,7 @@ def parse_modify_relationship_action(params, modification_type)
       if data_required
         data = params.fetch(:data)
         object_params = { relationships: { format_key(relationship.name) => { data: data } } }
-        verified_params = parse_params(object_params, updatable_fields)
+        verified_params = parse_params(object_params, @resource_klass.updatable_fields(@context))
 
         parse_arguments = [verified_params, relationship, parent_key]
       else
@@ -362,7 +362,7 @@ def parse_add_operation(params)
 
       verify_type(params[:type])
 
-      data = parse_params(params, creatable_fields)
+      data = parse_params(params, @resource_klass.creatable_fields(@context))
       @operations.push JSONAPI::Operation.new(:create_resource,
         @resource_klass,
         context: @context,
@@ -567,17 +567,6 @@ def verify_permitted_params(params, allowed_fields)
       end
     end
 
-    # TODO: Please remove after `updateable_fields` is removed
-    # :nocov:
-    def updatable_fields
-      if @resource_klass.respond_to?(:updateable_fields)
-        @resource_klass.updateable_fields(@context)
-      else
-        @resource_klass.updatable_fields(@context)
-      end
-    end
-    # :nocov:
-
     def parse_add_relationship_operation(verified_params, relationship, parent_key)
       if relationship.is_a?(JSONAPI::Relationship::ToMany)
         @operations.push JSONAPI::Operation.new(:create_to_many_relationship,
@@ -636,7 +625,7 @@ def parse_single_replace_operation(data, keys, id_key_presence_check_required: t
         @resource_klass,
         context: @context,
         resource_id: key,
-        data: parse_params(data, updatable_fields),
+        data: parse_params(data, @resource_klass.updatable_fields(@context)),
         fields: @fields,
         include_directives: @include_directives
       )

lib/jsonapi/resource.rb

@@ -572,21 +572,6 @@ def cache_field(field)
         @_cache_field = field.to_sym
       end
 
-      # TODO: remove this after the createable_fields and updateable_fields are phased out
-      # :nocov:
-      def method_missing(method, *args)
-        if method.to_s.match(/createable_fields/)
-          ActiveSupport::Deprecation.warn('`createable_fields` is deprecated, please use `creatable_fields` instead')
-          creatable_fields(*args)
-        elsif method.to_s.match(/updateable_fields/)
-          ActiveSupport::Deprecation.warn('`updateable_fields` is deprecated, please use `updatable_fields` instead')
-          updatable_fields(*args)
-        else
-          super
-        end
-      end
-      # :nocov:
-
       # Override in your resource to filter the updatable keys
       def updatable_fields(_context = nil)
         _updatable_relationships | _attributes.keys - [:id]

test/unit/resource/resource_test.rb

@@ -289,20 +289,6 @@ def test_updatable_fields_does_not_include_id
     assert(!CatResource.updatable_fields.include?(:id))
   end
 
-  # TODO: Please remove after `updateable_fields` is removed
-  def test_updateable_fields_delegates_to_updatable_fields_with_deprecation
-    ActiveSupport::Deprecation.silence do
-      assert_empty(CatResource.updateable_fields(nil) - [:mother, :father, :name, :breed, :kind])
-    end
-  end
-
-  # TODO: Please remove after `createable_fields` is removed
-  def test_createable_fields_delegates_to_creatable_fields_with_deprecation
-    ActiveSupport::Deprecation.silence do
-      assert_empty(CatResource.createable_fields(nil) - [:mother, :father, :name, :breed, :id, :kind])
-    end
-  end
-
   def test_filter_on_to_many_relationship_id
     posts = PostResource.find(:comments => 3)
     assert_equal([2], posts.map(&:id))