From 1f3293a403005cf73ebb6275847ce4fb1601e515 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Thu, 26 Jan 2017 02:21:51 +0100 Subject: [PATCH] Remove "try", because it is a rails feature Also "&." is only available on ruby >= 2.3 (can be used later) --- .rubocop.yml | 2 ++ lib/diaspora_federation/discovery/h_card.rb | 3 ++- lib/diaspora_federation/entities/relayable.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index b520263..c90af36 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -190,6 +190,8 @@ Style/NumericPredicate: # only with ruby >= 2.3 Style/FrozenStringLiteralComment: Enabled: false +Style/SafeNavigation: + Enabled: false # only with ruby >= 2.4 Performance/RegexpMatch: diff --git a/lib/diaspora_federation/discovery/h_card.rb b/lib/diaspora_federation/discovery/h_card.rb index 17900fc..816127f 100644 --- a/lib/diaspora_federation/discovery/h_card.rb +++ b/lib/diaspora_federation/discovery/h_card.rb @@ -269,7 +269,8 @@ module DiasporaFederation end private_class_method def self.content_from_doc(doc, content_selector) - element_from_doc(doc, content_selector).try(:content) + element = element_from_doc(doc, content_selector) + element.content if element end private_class_method def self.photo_from_doc(doc, photo_selector) diff --git a/lib/diaspora_federation/entities/relayable.rb b/lib/diaspora_federation/entities/relayable.rb index cf0a2ad..7a06ddf 100644 --- a/lib/diaspora_federation/entities/relayable.rb +++ b/lib/diaspora_federation/entities/relayable.rb @@ -72,7 +72,7 @@ module DiasporaFederation # @param [Hash] additional_xml_elements additional xml elements # @see DiasporaFederation::Entity#initialize def initialize(data, xml_order=nil, additional_xml_elements={}) - @xml_order = xml_order.try(:reject) {|name| name =~ /signature/ } + @xml_order = xml_order.reject {|name| name =~ /signature/ } if xml_order @additional_xml_elements = additional_xml_elements super(data)