nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove "try", because it is a rails feature

Browse source 
Also "&." is only available on ruby >= 2.3 (can be used later)
This commit is contained in:
Benjamin Neff 2017-01-26 02:21:51 +01:00
parent 4ff91a56cc
commit 1f3293a403
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -190,6 +190,8 @@ Style/NumericPredicate:
# only with ruby >= 2.3 # only with ruby >= 2.3
Style/FrozenStringLiteralComment: Style/FrozenStringLiteralComment:
Enabled: false Enabled: false
Style/SafeNavigation:
Enabled: false
# only with ruby >= 2.4 # only with ruby >= 2.4
Performance/RegexpMatch: Performance/RegexpMatch:

3
lib/diaspora_federation/discovery/h_card.rb
View file

@ -269,7 +269,8 @@ module DiasporaFederation
end end
private_class_method def self.content_from_doc(doc, content_selector) 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 end
private_class_method def self.photo_from_doc(doc, photo_selector) private_class_method def self.photo_from_doc(doc, photo_selector)

2
lib/diaspora_federation/entities/relayable.rb
View file

@ -72,7 +72,7 @@ module DiasporaFederation
# @param [Hash] additional_xml_elements additional xml elements # @param [Hash] additional_xml_elements additional xml elements
# @see DiasporaFederation::Entity#initialize # @see DiasporaFederation::Entity#initialize
def initialize(data, xml_order=nil, additional_xml_elements={}) 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 @additional_xml_elements = additional_xml_elements
super(data) super(data)