From 32da0fa891187e9eba49928e248cccc2038695ed Mon Sep 17 00:00:00 2001 From: Tanguy PATTE Date: Thu, 20 Aug 2015 16:46:46 +0200 Subject: [PATCH] style check --- lib/siade/api.rb | 2 -- lib/siade/entreprise_adapter.rb | 7 ++----- lib/siade/etablissement_adapter.rb | 31 +++++++++++++----------------- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/lib/siade/api.rb b/lib/siade/api.rb index bb34fd796..2fedcc79c 100644 --- a/lib/siade/api.rb +++ b/lib/siade/api.rb @@ -1,11 +1,9 @@ class SIADE::API - class << self attr_accessor :token end def initialize - end def self.entreprise(siren) diff --git a/lib/siade/entreprise_adapter.rb b/lib/siade/entreprise_adapter.rb index 1d61652de..06a6344a0 100644 --- a/lib/siade/entreprise_adapter.rb +++ b/lib/siade/entreprise_adapter.rb @@ -1,5 +1,4 @@ class SIADE::EntrepriseAdapter - def initialize(siren) @siren = siren end @@ -13,10 +12,8 @@ class SIADE::EntrepriseAdapter def to_params params = {} - data_source[:entreprise].each do |k,v| - if attr_to_fetch.include?(k) - params[k] = v - end + data_source[:entreprise].each do |k, v| + params[k] = v if attr_to_fetch.include?(k) end params rescue diff --git a/lib/siade/etablissement_adapter.rb b/lib/siade/etablissement_adapter.rb index e71ae063f..a042f878b 100644 --- a/lib/siade/etablissement_adapter.rb +++ b/lib/siade/etablissement_adapter.rb @@ -1,5 +1,4 @@ class SIADE::EtablissementAdapter - def initialize(siret) @siret = siret end @@ -11,16 +10,12 @@ class SIADE::EtablissementAdapter def to_params params = {} - data_source[:etablissement].each do |k,v| - if attr_to_fetch.include?(k) - params[k] = v - end + data_source[:etablissement].each do |k, v| + params[k] = v if attr_to_fetch.include?(k) end params[:adresse] = adresse - data_source[:etablissement][:adresse].each do |k,v| - if address_attribut_to_fetch.include?(k) - params[k] = v - end + data_source[:etablissement][:adresse].each do |k, v| + params[k] = v if address_attribut_to_fetch.include?(k) end params end @@ -29,25 +24,25 @@ class SIADE::EtablissementAdapter [:siret, :siege_social, :naf, - :libelle_naf, - ] + :libelle_naf + ] end def adresse adresse = '' [:l1, :l2, :l3, :l4, :l5].each do |line| - adresse = adresse + data_source[:etablissement][:adresse][line] + "\r\n" unless data_source[:etablissement][:adresse][line].nil? + adresse = adresse + data_source[:etablissement][:adresse][line] + "\r\n" unless data_source[:etablissement][:adresse][line].nil? end adresse end def address_attribut_to_fetch [:numero_voie, - :type_voie, - :nom_voie, - :complement_adresse, - :code_postal, - :localite, - :code_insee_localite] + :type_voie, + :nom_voie, + :complement_adresse, + :code_postal, + :localite, + :code_insee_localite] end end