app/models/aranha/address.rb in aranha-0.12.1 vs app/models/aranha/address.rb in aranha-0.13.0

- old
+ new

@@ -1,7 +1,9 @@ # frozen_string_literal: true +require 'eac_ruby_utils/yaml' + module Aranha class Address < ActiveRecord::Base include ::Eac::InequalityQueries add_inequality_queries(:created_at) @@ -66,24 +68,28 @@ end private def instanciate_processor - if processor_instancier_arity == 2 || processor_instancier_arity < 0 - processor_instancier.call(url_to_process, YAML.load(extra_data)) - elsif processor_instancier_arity == 1 - processor_instancier.call(url_to_process) - else - raise("#{processor}.initialize should has 1 or 2 or * arguments") - end + processor_instancier.call(*processor_instancier_arguments) end def url_to_process - ::YAML.load(url) + ::EacRubyUtils::Yaml.load_common(url) end def processor_instancier processor.constantize.method(:new) + end + + def processor_instancier_arguments + if processor_instancier_arity == 2 || processor_instancier_arity.negative? + [url_to_process, EacRubyUtils::Yaml.load_common(extra_data)] + elsif processor_instancier_arity == 1 + [processor_instancier.call(url_to_process)] + else + raise("#{processor}.initialize should has 1 or 2 or * arguments") + end end def processor_instancier_arity processor.constantize.instance_method(:initialize).arity end