Carto::GeoAPI → ApiGeo

app/lib/api_geo/driver.rb

@@ -0,0 +1,25 @@
+module ApiGeo
+  class Driver
+    def self.regions
+      url = [API_GEO_URL, "regions"].join("/")
+      call(url)
+    end
+
+    def self.departements
+      url = [API_GEO_URL, "departements"].join("/")
+      call(url)
+    end
+
+    def self.pays
+      File.open('app/lib/api_geo/pays.json').read
+    end
+
+    private
+
+    def self.call(api_url)
+      RestClient.get api_url, params: { fields: :nom }
+    rescue RestClient::ServiceUnavailable
+      nil
+    end
+  end
+end

app/lib/carto/geo_api/driver.rb

@@ -1,27 +0,0 @@
-module Carto
-  module GeoAPI
-    class Driver
-      def self.regions
-        url = [API_GEO_URL, "regions"].join("/")
-        call(url)
-      end
-
-      def self.departements
-        url = [API_GEO_URL, "departements"].join("/")
-        call(url)
-      end
-
-      def self.pays
-        File.open('app/lib/carto/geo_api/pays.json').read
-      end
-
-      private
-
-      def self.call(api_url)
-        RestClient.get api_url, params: { fields: :nom }
-      rescue RestClient::ServiceUnavailable
-        nil
-      end
-    end
-  end
-end

app/models/champs/departement_champ.rb

@@ -1,5 +1,5 @@
 class Champs::DepartementChamp < Champs::TextChamp
   def self.departements
-    JSON.parse(Carto::GeoAPI::Driver.departements).map { |liste| "#{liste['code']} - #{liste['nom']}" }.push('99 - Étranger')
+    JSON.parse(ApiGeo::Driver.departements).map { |liste| "#{liste['code']} - #{liste['nom']}" }.push('99 - Étranger')
   end
 end

app/models/champs/pays_champ.rb

@@ -1,5 +1,5 @@
 class Champs::PaysChamp < Champs::TextChamp
   def self.pays
-    JSON.parse(Carto::GeoAPI::Driver.pays).pluck("nom")
+    JSON.parse(ApiGeo::Driver.pays).pluck("nom")
   end
 end

app/models/champs/region_champ.rb

@@ -1,5 +1,5 @@
 class Champs::RegionChamp < Champs::TextChamp
   def self.regions
-    JSON.parse(Carto::GeoAPI::Driver.regions).sort_by { |e| e['nom'] }.pluck("nom")
+    JSON.parse(ApiGeo::Driver.regions).sort_by { |e| e['nom'] }.pluck("nom")
   end
 end

spec/lib/api_geo/driver_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Carto::GeoAPI::Driver do
+describe ApiGeo::Driver do
-  describe '.regions', vcr: { cassette_name: 'geoapi_regions' } do
+  describe '.regions', vcr: { cassette_name: 'api_geo_regions' } do
     subject { described_class.regions }
 
     it { expect(subject.code).to eq 200 }
   end
 
-  describe '.departements', vcr: { cassette_name: 'geoapi_departements' } do
+  describe '.departements', vcr: { cassette_name: 'api_geo_departements' } do
     subject { described_class.departements }
 
     it { expect(subject.code).to eq 200 }
@@ -16,6 +16,6 @@ describe Carto::GeoAPI::Driver do
   describe '.pays' do
     subject { described_class.pays }
 
-    it { is_expected.to eq File.open('app/lib/carto/geo_api/pays.json').read }
+    it { is_expected.to eq File.open('app/lib/api_geo/pays.json').read }
   end
 end