From af38b30179b1ac842aec2e88c8aca5a61f0f2411 Mon Sep 17 00:00:00 2001 From: Kyle Reeves Date: Tue, 3 Jul 2018 15:58:22 -0500 Subject: [PATCH] remove options param from Link class --- lib/fast_jsonapi/link.rb | 23 ++++++----------------- lib/fast_jsonapi/object_serializer.rb | 5 ++--- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/lib/fast_jsonapi/link.rb b/lib/fast_jsonapi/link.rb index 2b48ba9..41f84c2 100644 --- a/lib/fast_jsonapi/link.rb +++ b/lib/fast_jsonapi/link.rb @@ -1,29 +1,18 @@ module FastJsonapi class Link - attr_reader :key, :method, :conditional_proc + attr_reader :key, :method - def initialize(key:, method:, options: {}) + def initialize(key:, method:) @key = key @method = method - @conditional_proc = options[:if] end def serialize(record, serialization_params, output_hash) - if include_link?(record, serialization_params) - output_hash[key] = if method.is_a?(Proc) - method.arity == 1 ? method.call(record) : method.call(record, serialization_params) - else - record.public_send(method) - end - end - end - - def include_link?(record, serialization_params) - if conditional_proc.present? - conditional_proc.call(record, serialization_params) + output_hash[key] = if method.is_a?(Proc) + method.arity == 1 ? method.call(record) : method.call(record, serialization_params) else - true + record.public_send(method) end end end -end \ No newline at end of file +end diff --git a/lib/fast_jsonapi/object_serializer.rb b/lib/fast_jsonapi/object_serializer.rb index 9da9400..7cc3634 100644 --- a/lib/fast_jsonapi/object_serializer.rb +++ b/lib/fast_jsonapi/object_serializer.rb @@ -239,15 +239,14 @@ module FastJsonapi {} end - def link(link_name, link_method_name = nil, options = {}, &block) + def link(link_name, link_method_name = nil, &block) self.data_links = {} if self.data_links.nil? link_method_name = link_name if link_method_name.nil? key = run_key_transform(link_name) self.data_links[key] = Link.new( key: key, - method: block || link_method_name, - options: options + method: block || link_method_name ) end