diaspora_federation 0.2.5 → 0.3.0

data/lib/diaspora_federation/entities/photo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a photo and it is federated as a part of a status message.
@@ -14,7 +16,7 @@ module DiasporaFederation
       #   The diaspora* ID of the person who uploaded the photo
       #   @see Person#author
       #   @return [String] author diaspora* ID
-      property :author, :string, xml_name: :diaspora_handle
+      property :author, :string
 
       # @!attribute [r] public
       #   Points if the photo is visible to everyone or only to some aspects

data/lib/diaspora_federation/entities/poll.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a poll and it is federated as an optional part of a status message.

data/lib/diaspora_federation/entities/poll_answer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a poll answer and is federated as a part of the Poll entity.

data/lib/diaspora_federation/entities/poll_participation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a participation in poll, i.e. it is issued when a user votes for an answer in a poll.
@@ -5,7 +7,7 @@ module DiasporaFederation
     # @see Validators::PollParticipationValidator
     class PollParticipation < Entity
       # The {PollParticipation} parent is a {Poll}
-      PARENT_TYPE = "Poll".freeze
+      PARENT_TYPE = "Poll"
 
       include Relayable
 

data/lib/diaspora_federation/entities/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This is a module that defines common properties for a post which
@@ -30,7 +32,7 @@ module DiasporaFederation
       # @param [Entity] entity the entity in which it is included
       def self.included(entity)
         entity.class_eval do
-          property :author, :string, xml_name: :diaspora_handle
+          property :author, :string
           property :guid, :string
           property :created_at, :timestamp, default: -> { Time.now.utc }
           property :public, :boolean, default: false

data/lib/diaspora_federation/entities/profile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity contains all the profile data of a person.
@@ -12,7 +14,7 @@ module DiasporaFederation
       #   Alias for author
       #   @see Profile#author
       #   @return [String] diaspora* ID
-      property :author, :string, alias: :diaspora_id, xml_name: :diaspora_handle
+      property :author, :string, alias: :diaspora_id
 
       # @!attribute [r] edited_at
       #   The timestamp when the profile was edited

data/lib/diaspora_federation/entities/related_entity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # Entity meta informations for a related entity (parent or target of
@@ -50,7 +52,7 @@ module DiasporaFederation
       end
 
       # never add {RelatedEntity} to json
-      def to_json
+      def to_json(*_args)
         nil
       end
     end

data/lib/diaspora_federation/entities/relayable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This is a module that defines common properties for relayable entities
@@ -33,12 +35,6 @@ module DiasporaFederation
       #   a target pod.
       #   @return [String] author signature
       #
-      # @!attribute [r] parent_author_signature
-      #   Contains a signature of the entity using the private key of the author of a parent post.
-      #   @deprecated This signature isn't required anymore, because we can check the signature from
-      #     the parent author in the MagicEnvelope.
-      #   @return [String] parent author signature
-      #
       # @!attribute [r] parent
       #   Meta information about the parent object
       #   @return [RelatedEntity] parent entity
@@ -46,11 +42,10 @@ module DiasporaFederation
       # @param [Entity] klass the entity in which it is included
       def self.included(klass)
         klass.class_eval do
-          property :author, :string, xml_name: :diaspora_handle
+          property :author, :string
           property :guid, :string
           property :parent_guid, :string
           property :author_signature, :string, default: nil
-          property :parent_author_signature, :string, default: nil
           entity :parent, Entities::RelatedEntity
         end
 
@@ -65,7 +60,7 @@ module DiasporaFederation
       # @see DiasporaFederation::Entity#initialize
       def initialize(data, signature_order=nil, additional_data={})
         self.signature_order = signature_order if signature_order
-        @additional_data = additional_data
+        self.additional_data = additional_data
 
         super(data)
       end
@@ -88,7 +83,7 @@ module DiasporaFederation
         "#{super}#{":#{parent_type}" if respond_to?(:parent_type)}:#{parent_guid}"
       end
 
-      def to_json
+      def to_json(*_args)
         super.merge!(property_order: signature_order).tap {|json_hash|
           missing_properties = json_hash[:property_order] - json_hash[:entity_data].keys
           missing_properties.each {|property|
@@ -100,9 +95,9 @@ module DiasporaFederation
       # The order for signing
       # @return [Array]
       def signature_order
-        @signature_order || self.class.class_props.keys.reject {|key|
+        @signature_order || (self.class.class_props.keys.reject {|key|
           self.class.optional_props.include?(key) && public_send(key).nil?
-        } - %i[author_signature parent_author_signature parent]
+        } - %i[author_signature parent])
       end
 
       private
@@ -113,19 +108,9 @@ module DiasporaFederation
       def sign_with_author
         privkey = DiasporaFederation.callbacks.trigger(:fetch_private_key, author)
         raise AuthorPrivateKeyNotFound, "author=#{author} obj=#{self}" if privkey.nil?
-        sign_with_key(privkey).tap do
-          logger.info "event=sign status=complete signature=author_signature author=#{author} obj=#{self}"
-        end
-      end
-
-      # Sign with parent author key, if the parent author is local (if the private key is found)
-      # @return [String] A Base64 encoded signature of #signature_data with key
-      def sign_with_parent_author_if_available
-        privkey = DiasporaFederation.callbacks.trigger(:fetch_private_key, parent.root.author)
-        return unless privkey
 
         sign_with_key(privkey).tap do
-          logger.info "event=sign status=complete signature=parent_author_signature obj=#{self}"
+          logger.info "event=sign status=complete signature=author_signature author=#{author} obj=#{self}"
         end
       end
 
@@ -135,8 +120,7 @@ module DiasporaFederation
       # @return [Hash] properties with updated signatures
       def enriched_properties
         super.merge(additional_data).tap do |hash|
-          hash[:author_signature] = author_signature || sign_with_author
-          hash.delete(:parent_author_signature)
+          hash[:author_signature] = author_signature || sign_with_author unless author == parent.root.author
         end
       end
 
@@ -144,19 +128,22 @@ module DiasporaFederation
       #
       # @return [Hash] sorted xml elements
       def xml_elements
-        data = super.tap do |hash|
-          hash[:parent_author_signature] = parent_author_signature || sign_with_parent_author_if_available.to_s
-        end
-        order = signature_order + %i[author_signature parent_author_signature]
+        data = super
+        order = signature_order
+        order += %i[author_signature] unless author == parent.root.author
         order.map {|element| [element, data[element].to_s] }.to_h
       end
 
       def signature_order=(order)
         prop_names = self.class.class_props.keys.map(&:to_s)
-        @signature_order = order.reject {|name| name =~ /signature/ }
+        @signature_order = order.grep_v(/signature/)
                                 .map {|name| prop_names.include?(name) ? name.to_sym : name }
       end
 
+      def additional_data=(additional_data)
+        @additional_data = additional_data.reject {|name, _| name =~ /signature/ }
+      end
+
       # @return [String] signature data string
       def signature_data
         data = normalized_properties.merge(additional_data)

data/lib/diaspora_federation/entities/reshare.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents the fact that a user reshared another user's post.
@@ -8,7 +10,7 @@ module DiasporaFederation
       #   The diaspora* ID of the person who reshares the post
       #   @see Person#author
       #   @return [String] diaspora* ID
-      property :author, :string, xml_name: :diaspora_handle
+      property :author, :string
 
       # @!attribute [r] guid
       #   A random string of at least 16 chars
@@ -25,7 +27,7 @@ module DiasporaFederation
       #   The diaspora* ID of the person who posted the original post
       #   @see Person#author
       #   @return [String] diaspora* ID
-      property :root_author, :string, optional: true, xml_name: :root_diaspora_id
+      property :root_author, :string, optional: true
 
       # @!attribute [r] root_guid
       #   Guid of the original post

data/lib/diaspora_federation/entities/retraction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a claim of deletion of a previously federated entity.
@@ -8,17 +10,17 @@ module DiasporaFederation
       #   The diaspora* ID of the person who deletes the entity
       #   @see Person#author
       #   @return [String] diaspora* ID
-      property :author, :string, xml_name: :diaspora_handle
+      property :author, :string
 
       # @!attribute [r] target_guid
       #   Guid of the entity to be deleted
       #   @return [String] target guid
-      property :target_guid, :string, xml_name: :post_guid
+      property :target_guid, :string
 
       # @!attribute [r] target_type
       #   A string describing the type of the target
       #   @return [String] target type
-      property :target_type, :string, xml_name: :type
+      property :target_type, :string
 
       # @!attribute [r] target
       #   Target entity
@@ -28,7 +30,7 @@ module DiasporaFederation
       def sender_valid?(sender)
         case target_type
         when "Comment", "Like", "PollParticipation"
-          sender == target.author || sender == target.root.author
+          [target.root.author, target.author].include?(sender)
         else
           sender == target.author
         end

data/lib/diaspora_federation/entities/signable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # Signable is a module that encapsulates basic signature generation/verification flow for entities.
@@ -5,7 +7,7 @@ module DiasporaFederation
       include Logging
 
       # Digest instance used for signing
-      DIGEST = OpenSSL::Digest::SHA256.new
+      DIGEST = OpenSSL::Digest.new("SHA256")
 
       # Sign the data with the key
       #

data/lib/diaspora_federation/entities/status_message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Entities
     # This entity represents a status message sent by a user.
@@ -9,7 +11,7 @@ module DiasporaFederation
       # @!attribute [r] text
       #   Text of the status message composed by the user
       #   @return [String] text of the status message
-      property :text, :string, xml_name: :raw_message
+      property :text, :string
 
       # @!attribute [r] edited_at
       #   The timestamp when the status message was edited

data/lib/diaspora_federation/entities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   # This namespace contains all the entities used to encapsulate data that is
   # passed around in the diaspora* network as part of the federation protocol.
@@ -44,8 +46,3 @@ require "diaspora_federation/entities/message"
 require "diaspora_federation/entities/conversation"
 
 require "diaspora_federation/entities/retraction"
-
-# deprecated
-require "diaspora_federation/entities/request"
-require "diaspora_federation/entities/signed_retraction"
-require "diaspora_federation/entities/relayable_retraction"

data/lib/diaspora_federation/entity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   # +Entity+ is the base class for all other objects used to encapsulate data
   # for federation messages in the diaspora* network.
@@ -15,7 +17,6 @@ module DiasporaFederation
   #     property :prop
   #     property :optional, default: false
   #     property :dynamic_default, default: -> { Time.now }
-  #     property :another_prop, xml_name: :another_name
   #     entity :nested, NestedEntity
   #     entity :multiple, [OtherEntity]
   #   end
@@ -38,10 +39,10 @@ module DiasporaFederation
 
     # Invalid XML characters
     # @see https://www.w3.org/TR/REC-xml/#charsets "Extensible Markup Language (XML) 1.0"
-    INVALID_XML_REGEX = /[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u{10000}-\u{10FFFF}]/
+    INVALID_XML_REGEX = /[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u{10000}-\u{10FFFF}]/.freeze
 
     # Regex to validate and find entity names
-    ENTITY_NAME_REGEX = "[a-z]*(?:_[a-z]*)*".freeze
+    ENTITY_NAME_REGEX = "[a-z]*(?:_[a-z]*)*"
 
     # Initializes the Entity with the given attribute hash and freezes the created
     # instance it returns.
@@ -96,7 +97,7 @@ module DiasporaFederation
     #
     # @return [Nokogiri::XML::Element] root element containing properties as child elements
     def to_xml
-      doc = Nokogiri::XML::DocumentFragment.new(Nokogiri::XML::Document.new)
+      doc = Nokogiri::XML::Document.new
       Nokogiri::XML::Element.new(self.class.entity_name, doc).tap do |root_element|
         xml_elements.each do |name, value|
           add_property_to_xml(doc, root_element, name, value)
@@ -149,6 +150,7 @@ module DiasporaFederation
     # @return [Class] entity class
     def self.entity_class(entity_name)
       raise InvalidEntityName, "'#{entity_name}' is invalid" unless entity_name =~ /\A#{ENTITY_NAME_REGEX}\z/
+
       class_name = entity_name.sub(/\A[a-z]/, &:upcase)
       class_name.gsub!(/_([a-z])/) { Regexp.last_match[1].upcase }
 
@@ -169,7 +171,7 @@ module DiasporaFederation
 
     # Renders entity to a hash representation of the entity JSON format
     # @return [Hash] Returns a hash that is equal by structure to the entity in JSON format
-    def to_json
+    def to_json(*_args)
       {
         entity_type: self.class.entity_name,
         entity_data: json_data
@@ -213,7 +215,7 @@ module DiasporaFederation
     end
 
     def setable_property?(type, val)
-      setable_string?(type, val) || type == :timestamp && val.is_a?(Time)
+      setable_string?(type, val) || (type == :timestamp && val.is_a?(Time))
     end
 
     def setable_string?(type, val)
@@ -231,12 +233,14 @@ module DiasporaFederation
 
     def nilify(value)
       return nil if value.respond_to?(:empty?) && value.empty? && !value.instance_of?(Array)
+
       value
     end
 
     def instantiate_nested(name, value)
       if value.instance_of?(Array)
         return value unless value.first.instance_of?(Hash)
+
         value.map {|hash| self.class.class_props[name].first.new(hash) }
       elsif value.instance_of?(Hash)
         self.class.class_props[name].new(value)
@@ -317,7 +321,7 @@ module DiasporaFederation
     # Generates a hash with entity properties which is put to the "entity_data"
     # field of a JSON serialized object.
     # @return [Hash] object properties in JSON format
-    def json_data
+    def json_data # rubocop:disable Metrics/PerceivedComplexity
       enriched_properties.map {|key, value|
         type = self.class.class_props[key]
         next if optional_nil_value?(key, value)
@@ -326,7 +330,7 @@ module DiasporaFederation
           entity_data = value.to_json
           [key, entity_data] unless entity_data.nil?
         elsif type.instance_of?(Array)
-          entity_data = value.nil? ? nil : value.map(&:to_json)
+          entity_data = value&.map(&:to_json)
           [key, entity_data] unless entity_data.nil?
         else
           [key, value]

data/lib/diaspora_federation/federation/diaspora_url_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Federation
     # This module is for parsing and fetching linked entities.
@@ -10,7 +12,7 @@ module DiasporaFederation
         (#{Validation::Rule::DiasporaId::DIASPORA_ID_REGEX})/
         (#{Entity::ENTITY_NAME_REGEX})/
         (#{Validation::Rule::Guid::VALID_CHARS})
-      }ux
+      }ux.freeze
 
       # Parses all diaspora:// URLs from the text and fetches the entities from
       # the remote server if needed.
@@ -25,6 +27,7 @@ module DiasporaFederation
       private_class_method def self.fetch_entity(author, type, guid)
         class_name = Entity.entity_class(type).to_s.rpartition("::").last
         return if DiasporaFederation.callbacks.trigger(:fetch_related_entity, class_name, guid)
+
         Fetcher.fetch_public(author, type, guid)
       rescue => e # rubocop:disable Style/RescueStandardError
         logger.error "Failed to fetch linked entity #{type}:#{guid}: #{e.class}: #{e.message}"

data/lib/diaspora_federation/federation/fetcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Federation
     # This module is for fetching entities from other pods.
@@ -10,6 +12,7 @@ module DiasporaFederation
       def self.fetch_public(author, entity_type, guid)
         type = entity_name(entity_type).to_s
         raise "Already fetching ..." if fetching[type].include?(guid)
+
         fetch_from_url(author, type, guid)
       rescue => e # rubocop:disable Style/RescueStandardError
         raise NotFetchable, "Failed to fetch #{entity_type}:#{guid} from #{author}: #{e.class}: #{e.message}"

data/lib/diaspora_federation/federation/receiver/abstract_receiver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Federation
     module Receiver

data/lib/diaspora_federation/federation/receiver/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Federation
     module Receiver

data/lib/diaspora_federation/federation/receiver/private.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Federation
     module Receiver
@@ -7,6 +9,7 @@ module DiasporaFederation
 
         def validate
           raise RecipientRequired if recipient_id.nil?
+
           super
         end
       end

data/lib/diaspora_federation/federation/receiver/public.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Federation
     module Receiver

data/lib/diaspora_federation/federation/receiver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Federation
     # This module parses and receives entities.
@@ -6,14 +8,9 @@ module DiasporaFederation
 
       # Receive a public message
       # @param [String] data message to receive
-      # @param [Boolean] legacy use old slap parser
-      def self.receive_public(data, legacy=false)
-        magic_env = if legacy
-                      Salmon::Slap.from_xml(data)
-                    else
-                      magic_env_xml = Nokogiri::XML(data).root
-                      Salmon::MagicEnvelope.unenvelop(magic_env_xml)
-                    end
+      def self.receive_public(data)
+        magic_env_xml = Nokogiri::XML(data).root
+        magic_env = Salmon::MagicEnvelope.unenvelop(magic_env_xml)
         Public.new(magic_env).receive
       rescue => e # rubocop:disable Style/RescueStandardError
         logger.error "failed to receive public message: #{e.class}: #{e.message}"
@@ -26,15 +23,11 @@ module DiasporaFederation
       # @param [OpenSSL::PKey::RSA] recipient_private_key recipient private key to decrypt the message
       # @param [Object] recipient_id the identifier to persist the entity for the correct user,
       #   see +receive_entity+ callback
-      # @param [Boolean] legacy use old slap parser
-      def self.receive_private(data, recipient_private_key, recipient_id, legacy=false)
+      def self.receive_private(data, recipient_private_key, recipient_id)
         raise ArgumentError, "no recipient key provided" unless recipient_private_key.instance_of?(OpenSSL::PKey::RSA)
-        magic_env = if legacy
-                      Salmon::EncryptedSlap.from_xml(data, recipient_private_key)
-                    else
-                      magic_env_xml = Salmon::EncryptedMagicEnvelope.decrypt(data, recipient_private_key)
-                      Salmon::MagicEnvelope.unenvelop(magic_env_xml)
-                    end
+
+        magic_env_xml = Salmon::EncryptedMagicEnvelope.decrypt(data, recipient_private_key)
+        magic_env = Salmon::MagicEnvelope.unenvelop(magic_env_xml)
         Private.new(magic_env, recipient_id).receive
       rescue => e # rubocop:disable Style/RescueStandardError
         logger.error "failed to receive private message for #{recipient_id}: #{e.class}: #{e.message}"

data/lib/diaspora_federation/federation/sender/hydra_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "typhoeus"
 
 module DiasporaFederation

data/lib/diaspora_federation/federation/sender.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Federation
     # Federation logic to send messages to other pods

data/lib/diaspora_federation/federation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   # This module contains the federation logic
   module Federation

data/lib/diaspora_federation/http_client.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require "faraday"
-require "faraday_middleware/response/follow_redirects"
+require "faraday_middleware"
 
 module DiasporaFederation
   # A wrapper for {https://github.com/lostisland/faraday Faraday}
@@ -30,7 +32,7 @@ module DiasporaFederation
       }
 
       @connection = Faraday::Connection.new(options) do |builder|
-        builder.use FaradayMiddleware::FollowRedirects, limit: DiasporaFederation.http_redirect_limit
+        builder.response :follow_redirects, limit: DiasporaFederation.http_redirect_limit
         builder.adapter Faraday.default_adapter
       end
 

data/lib/diaspora_federation/logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   # Logging module for the diaspora* federation
   #
@@ -15,15 +17,15 @@ module DiasporaFederation
     #
     # Use the logging-gem if available, else use a default logger.
     def logger
-      @logger ||= begin
+      @logger ||= if defined?(::Logging::Logger)
                     # Use logging-gem if available
-                    return ::Logging::Logger[self] if defined?(::Logging::Logger)
-
+                    ::Logging::Logger[self]
+                  elsif defined?(::Rails)
                     # Use rails logger if running in rails and no logging-gem is available
-                    return ::Rails.logger if defined?(::Rails)
-
+                    ::Rails.logger
+                  else
                     # fallback logger
-                    @logger = Logger.new(STDOUT)
+                    @logger = Logger.new($stdout)
                     @logger.level = Logger::INFO
                     @logger
                   end

data/lib/diaspora_federation/parsers/base_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Parsers
     # +BaseParser+ is an abstract class which is used for defining parsers for different
@@ -36,6 +38,7 @@ module DiasporaFederation
           text.to_i if text =~ /\A\d+\z/
         when :boolean
           return true if text =~ /\A(true|t|yes|y|1)\z/i
+
           false if text =~ /\A(false|f|no|n|0)\z/i
         else
           text
@@ -44,6 +47,7 @@ module DiasporaFederation
 
       def assert_parsability_of(entity_class)
         return if entity_class == entity_type.entity_name
+
         raise InvalidRootNode, "'#{entity_class}' can't be parsed by #{entity_type.name}"
       end
 

data/lib/diaspora_federation/parsers/json_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiasporaFederation
   module Parsers
     # This is a parser of JSON serialized object. JSON object format is defined by
@@ -16,7 +18,7 @@ module DiasporaFederation
 
       def parse_entity_data(entity_data)
         hash = entity_data.map {|key, value|
-          property = entity_type.find_property_for_xml_name(key)
+          property = entity_type.class_props.keys.find {|name| name.to_s == key }
           if property
             type = entity_type.class_props[property]
             [property, parse_element_from_value(type, entity_data[key])]
@@ -30,12 +32,14 @@ module DiasporaFederation
 
       def parse_element_from_value(type, value)
         return if value.nil?
+
         if %i[integer boolean timestamp].include?(type) && !value.is_a?(String)
           value
         elsif type.instance_of?(Symbol)
           parse_string(type, value)
         elsif type.instance_of?(Array)
           raise DeserializationError, "Expected array for #{type}" unless value.respond_to?(:map)
+
           value.map {|element|
             type.first.from_json(element)
           }
@@ -49,6 +53,7 @@ module DiasporaFederation
           prop if json_hash[prop].nil?
         }.compact.join(", ")
         raise DeserializationError, "Required properties are missing in JSON object: #{missing}" unless missing.empty?
+
         assert_parsability_of(json_hash["entity_type"])
       end