diff options
| author | Robert | 2017-07-21 15:59:34 +0200 | 
|---|---|---|
| committer | Robert | 2017-07-21 16:32:47 +0200 | 
| commit | ded817a7d0802cc2aafcdbe4bb256698f6868afd (patch) | |
| tree | 30ac61f0f8483dc36d470da28a786eb091e5f0ff /app/models/organisation.rb | |
| parent | 4fffff70d5dc57929653ed1d1a1ce68e9769cee4 (diff) | |
| download | chouette-core-ded817a7d0802cc2aafcdbe4bb256698f6868afd.tar.bz2 | |
Refs: #3507@4.5h spec setup and refactoring, using Faraday in worker
- Setting up correct headers for the Webmock request (Oh Boy)
- Refactoring all Faraday requests into `lib/af83/http_fetcher.rb`
- Implementing the Download
Diffstat (limited to 'app/models/organisation.rb')
| -rw-r--r-- | app/models/organisation.rb | 19 | 
1 files changed, 6 insertions, 13 deletions
diff --git a/app/models/organisation.rb b/app/models/organisation.rb index d0742bda6..a3c5da1af 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*-  class Organisation < ActiveRecord::Base    include DataFormatEnumerations @@ -26,19 +25,13 @@ class Organisation < ActiveRecord::Base    def self.portail_api_request      conf = Rails.application.config.try(:stif_portail_api) -    raise 'Rails.application.config.stif_portail_api settings is not defined' unless conf +    raise 'Rails.application.config.stif_portail_api configuration is not defined' unless conf -    conn = Faraday.new(:url => conf[:url]) do |c| -      c.headers['Authorization'] = "Token token=\"#{conf[:key]}\"" -      c.adapter  Faraday.default_adapter -    end - -    resp = conn.get '/api/v1/organizations' -    if resp.status == 200 -      JSON.parse resp.body -    else -      raise "Error on api request status : #{resp.status} => #{resp.body}" -    end +    AF83::HTTPFetcher.get_resource( +      host: conf[:url], +      path: '/api/v1/organizations', +      parse_json: true, +      token: conf[:key])    end    def self.sync_update code, name, scope  | 
