locations_ng 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa049b1575ec78e58249287f6d569e18f89d4142
-  data.tar.gz: b5cf8f333940cef919906c7d58a04a04233e45f0
+SHA256:
+  metadata.gz: e0f6ef8d982bcd1d492e7581ef5c430288f0dddb4c7315ea8e74aa1e4903d4c2
+  data.tar.gz: 37a3806fb1fabb9a1110ac68a4d6b62b3c309f6cc7b9002841477dd32b20ef70
 SHA512:
-  metadata.gz: ab36708ef06d4666f7f2e3eae7534454c5ce2b03fbbea09da34e55e36071a5888a1b7b26ea4ca5605ae2cf59f6bae09724677e45103bf59a32881134bafe5b71
-  data.tar.gz: d96f563f5709afb642b657595f6f8bfcf5d569bd8021c2c9eb97ec556eb9526d946f8a6a060ac3996781355cd13d7b73a89bb2411c535db3fab0bc0ff917e750
+  metadata.gz: bbd2abace362b8cd43c63591cfef75635c58fce637b67e87bd9ed3e6760d27ae76dad748229a22f247d1efb4a0d314034e2a5582e331b9c129370ae9b6bc507a
+  data.tar.gz: c16215a75822cdba38f8cc92821bf40b7f0c43827e70fb5c4768b3a16021cf05d02676d9933e61e23635217ffc5ce242fdf324fe6a246696bc048e492a745b35

data/lib/locations_ng.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'active_support/core_ext/hash/indifferent_access'
+require 'locations_ng/load_file'
 require 'locations_ng/state'
 require 'locations_ng/city'
 require 'locations_ng/lga'

data/lib/locations_ng/city.rb

@@ -1,35 +1,27 @@
 module LocationsNg
   class City
+    @all_cities = LoadFile.read('cities')
+
     class << self
       def all
-        load_cities
+        @all_cities
       end
 
       def cities(state)
-        state_query = state.downcase.gsub(' ', '_')
-        all_cities = load_cities
+        state_query = state_query(state.downcase.tr(' ', '_'))
+        city_index = @all_cities.index{ |c| c['alias'] == state_query }
 
-        if state_query == 'federal_capital_territory'
-          state_query = 'fct'
+        unless city_index.nil?
+          return @all_cities[city_index]['cities']
         end
 
-        city_index = all_cities.index{|c| c['alias'] == state_query}
-
-        if city_index.nil?
-          {message: "No cities found for '#{state}'", status: 404}
-        else
-          all_cities[city_index]['cities']
-        end
+        {message: "No cities found for '#{state}'", status: 404}
       end
 
       private
 
-      def load_cities
-        YAML.load(File.read(files_location 'cities'))
-      end
-
-      def files_location(file)
-        File.expand_path("../locations/#{file}.yml", __FILE__)
+      def state_query(state)
+        state == 'federal_capital_territory' ? 'fct' : state
       end
     end
   end

data/lib/locations_ng/lga.rb

@@ -1,57 +1,44 @@
 module LocationsNg
   class Lga
+    @all_lgas = LoadFile.read('lgas')
+
     class << self
       def all
-        load_lgas
+        @all_lgas
       end
 
       def lgas(state)
-        query = format_query(state)
-        all_lgas = load_lgas
-
-        lga_index = all_lgas.index{|l| l['state_alias'] == query}
+        lga_index = @all_lgas.index{ |l| l['state_alias'] == format_query(state) }
 
-        if lga_index.nil?
-          {message: "No lgas found for '#{state}'", status: 404}
-        else
-          all_lgas[lga_index]['lgas']
+        unless lga_index.nil?
+          return @all_lgas[lga_index]['lgas']
         end
+
+        {message: "No lgas found for '#{state}'", status: 404}
       end
 
       def localities(state, lga)
         return {message: 'You must enter a state and lga.', status: 500} unless state && lga
 
-        state_query = format_query(state)
-        lga_query = format_query(lga)
-        all_lgas = load_lgas
+        state_index = @all_lgas.index{ |s| s['state_alias'] == format_query(state) }
 
-        state_index = all_lgas.index{|s| s['state_alias'] == state_query}
+        unless state_index
+          return {message: "'#{state}' state not found.", status: 404}
+        end
 
-        if state_index
-          lga_index = all_lgas[state_index]['locality'].index{|l| l['lga_alias'] == lga_query}
+        lga_index = @all_lgas[state_index]['locality'].index{ |l| l['lga_alias'] == format_query(lga) }
 
-          if lga_index
-            all_lgas[state_index]['locality'][lga_index]['localities']
-          else
-            {message: "'#{lga}' LGA not found for '#{state}' state.", status: 404}
-          end
-        else
-          {message: "'#{state}' state not found.", status: 404}
+        unless lga_index
+          return {message: "'#{lga}' LGA not found for '#{state}' state.", status: 404}
         end
-      end
 
-      private
-
-      def load_lgas
-        YAML.load(File.read(files_location 'lgas'))
+        @all_lgas[state_index]['locality'][lga_index]['localities']
       end
 
-      def files_location(file)
-        File.expand_path("../locations/#{file}.yml", __FILE__)
-      end
+      private
 
       def format_query(query)
-        query ? query.downcase.gsub(' ', '_') : query
+        query ? query.downcase.tr(' ', '_') : query
       end
     end
   end

data/lib/locations_ng/load_file.rb

@@ -0,0 +1,13 @@
+module LocationsNg
+  class LoadFile
+    class << self
+      def read(file_name)
+        YAML.load(File.read(files_location file_name))
+      end
+
+      def files_location(file)
+        File.expand_path("../locations/#{file}.yml", __FILE__)
+      end
+    end
+  end
+end

data/lib/locations_ng/locations/lgas.yml

@@ -676,7 +676,7 @@
     - NGURORE
     - TOUNGO
     - YOLDE KOHI
-- state: Akwa-ibom
+- state: Akwa Ibom
   state_alias: akwa-ibom
   lgas:
   - Abak
@@ -4758,7 +4758,7 @@
     - Ukpata
     - Umulokpa
     - Uvuru
-- state: Fct
+- state: Federal Capital Territory
   state_alias: fct
   lgas:
   - Abaji

data/lib/locations_ng/locations/states.yml

@@ -8,6 +8,7 @@
   longitude: 7.524724300000001
   maxLong: 7.9630091
   alias: abia
+  area: 6320
 - minLat: 7.452592
   name: Adamawa
   capital: Yola
@@ -17,6 +18,7 @@
   longitude: 12.4380581
   maxLong: 13.6924919
   alias: adamawa
+  area: 36917
 - minLat: 4.4780049
   name: Akwa Ibom
   capital: Uyo
@@ -26,6 +28,7 @@
   longitude: 7.872159999999999
   maxLong: 8.340371
   alias: akwa_ibom
+  area: 7081
 - minLat: 5.692615000000001
   name: Anambra
   capital: Awka
@@ -35,6 +38,7 @@
   longitude: 7.0068393
   maxLong: 7.355934
   alias: anambra
+  area: 4844
 - minLat: 10.255381
   name: Bauchi
   capital: Bauchi
@@ -44,6 +48,7 @@
   longitude: 9.844166999999999
   maxLong: 9.864006
   alias: bauchi
+  area: 45837
 - minLat: 6.4427789
   name: Benue
   capital: Makurdi
@@ -53,6 +58,7 @@
   longitude: 8.8362755
   maxLong: 9.918301
   alias: benue
+  area: 34059
 - minLat: 10.0291549
   name: Borno
   capital: Maiduguri
@@ -62,6 +68,7 @@
   longitude: 12.9789121
   maxLong: 14.680073
   alias: borno
+  area: 70898
 - minLat: 4.2771439
   name: Bayelsa
   capital: Yenagoa
@@ -71,6 +78,7 @@
   longitude: 5.898713900000001
   maxLong: 6.724865899999999
   alias: bayelsa
+  area: 10773
 - minLat: 4.690596000000001
   name: Cross River
   capital: Calabar
@@ -80,6 +88,7 @@
   longitude: 8.6600586
   maxLong: 9.472486
   alias: cross_river
+  area: 20156
 - minLat: 5.024351999999999
   name: Delta
   capital: Asaba
@@ -89,6 +98,7 @@
   longitude: 5.898713900000001
   maxLong: 6.7653911
   alias: delta
+  area: 17698
 - minLat: 5.6873539
   name: Ebonyi
   capital: Abakaliki
@@ -98,6 +108,7 @@
   longitude: 7.959286299999999
   maxLong: 8.4470269
   alias: ebonyi
+  area: 5670
 - minLat: 5.7386799
   name: Edo
   capital: Benin
@@ -107,6 +118,7 @@
   longitude: 5.898713900000001
   maxLong: 6.707891000000001
   alias: edo
+  area: 17802
 - minLat: 7.272215999999999
   name: Ekiti
   capital: Ado-Ekiti
@@ -116,6 +128,7 @@
   longitude: 5.3102505
   maxLong: 5.8048959
   alias: ekiti
+  area: 6353
 - minLat: 6.360852
   name: Enugu
   capital: Enugu
@@ -125,6 +138,7 @@
   longitude: 7.510332999999998
   maxLong: 7.618160199999999
   alias: enugu
+  area: 7161
 - minLat: 8.396675
   name: Federal Capital Territory
   capital: Abuja
@@ -134,6 +148,7 @@
   longitude: 7.179025999999999
   maxLong: 7.617400000000001
   alias: fct
+  area: 7315
 - minLat: 10.264117
   name: Gombe
   capital: Gombe
@@ -143,6 +158,7 @@
   longitude: 11.166667
   maxLong: 11.2147019
   alias: gombe
+  area: 18768
 - minLat: 12.5688205
   name: Jigawa
   capital: Dutse
@@ -152,6 +168,7 @@
   longitude: 8.9400589
   maxLong: 8.9410364
   alias: jigawa
+  area: 23154
 - minLat: 5.179824000000001
   name: Imo
   capital: Owerri
@@ -161,6 +178,7 @@
   longitude: 6.920913499999999
   maxLong: 7.404109
   alias: imo
+  area: 5530
 - minLat: 10.3971566
   name: Kaduna
   capital: Kaduna
@@ -170,6 +188,7 @@
   longitude: 7.433332999999999
   maxLong: 7.508812000000001
   alias: kaduna
+  area: 46053
 - minLat: 10.0931591
   name: Kebbi
   capital: Birnin Kebbi
@@ -179,6 +198,7 @@
   longitude: 4.0695454
   maxLong: 6.027123
   alias: kebbi
+  area: 36800
 - minLat: 11.912873
   name: Kano
   capital: Kano
@@ -188,6 +208,7 @@
   longitude: 8.591956099999999
   maxLong: 8.6704765
   alias: kano
+  area: 20131
 - minLat: 6.528274199999999
   name: Kogi
   capital: Lokoja
@@ -197,6 +218,7 @@
   longitude: 6.5783387
   maxLong: 7.8822179
   alias: kogi
+  area: 29833
 - minLat: 6.3936419
   name: Lagos
   capital: Ikeja
@@ -205,6 +227,7 @@
   maxLat: 6.7027984
   longitude: 3.3792057
   maxLong: 3.696727799999999
+  area: 3345
   alias: lagos
 - minLat: 12.934095
   name: Katsina
@@ -215,6 +238,7 @@
   longitude: 7.6
   maxLong: 7.676266000000001
   alias: katsina
+  area: 24192
 - minLat: 7.966079000000001
   name: Kwara
   capital: Ilorin
@@ -224,6 +248,7 @@
   longitude: 4.5624426
   maxLong: 6.2142591
   alias: kwara
+  area: 36825
 - minLat: 7.769181
   name: Nasarawa
   capital: Lafia
@@ -233,6 +258,7 @@
   longitude: 8.3088441
   maxLong: 9.605724
   alias: nasarawa
+  area: 27117
 - minLat: 4.269857099999999
   name: Niger
   capital: Minna
@@ -242,6 +268,7 @@
   longitude: 8.675277
   maxLong: 14.677982
   alias: niger
+  area: 76363
 - minLat: 6.315346099999999
   name: Ogun
   capital: Abeokuta
@@ -251,6 +278,7 @@
   longitude: 3.2583626
   maxLong: 4.5990951
   alias: ogun
+  area: 16762
 - minLat: 7.0529381
   name: Ondo
   capital: Akure
@@ -260,6 +288,7 @@
   longitude: 4.833333
   maxLong: 4.871921599999999
   alias: ondo
+  area: 15500
 - minLat: 4.347035099999999
   name: Rivers
   capital: Port Harcourt
@@ -269,6 +298,7 @@
   longitude: 6.920913499999999
   maxLong: 7.591592899999998
   alias: rivers
+  area: 11077
 - minLat: 7.790425099999999
   name: Oyo
   capital: Ibadan
@@ -278,6 +308,7 @@
   longitude: 3.933
   maxLong: 3.9751624
   alias: oyo
+  area: 28454
 - minLat: 6.969976
   name: Osun
   capital: Osogbo
@@ -287,6 +318,7 @@
   longitude: 4.5624426
   maxLong: 5.0647019
   alias: osun
+  area: 9251
 - minLat: 12.9764148
   name: Sokoto
   capital: Sokoto
@@ -296,6 +328,7 @@
   longitude: 5.233333
   maxLong: 5.2881144
   alias: sokoto
+  area: 25973
 - minLat: 8.350639
   name: Plateau
   capital: Jos
@@ -305,6 +338,7 @@
   longitude: 9.7232673
   maxLong: 10.6606639
   alias: plateau
+  area: 30913
 - minLat: 6.502453999999999
   name: Taraba
   capital: Jalingo
@@ -314,6 +348,7 @@
   longitude: 10.9807003
   maxLong: 11.981274
   alias: taraba
+  area: 54473
 - minLat: 10.5932052
   name: Yobe
   capital: Damaturu
@@ -323,6 +358,7 @@
   longitude: 11.7068294
   maxLong: 12.494047
   alias: yobe
+  area: 45502
 - minLat: 10.854616
   name: Zamfara
   capital: Gusau
@@ -332,3 +368,4 @@
   longitude: 6.2375947
   maxLong: 7.245729999999999
   alias: zamfara
+  area: 39762

data/lib/locations_ng/state.rb

@@ -1,20 +1,19 @@
 module LocationsNg
   class State
+    @all_states = LocationsNg::LoadFile.read('states')
+
     class << self
       def all
-        load_states.map{ |s| {name: s['name'], capital: s['capital']} }
+        @all_states.map{ |s| {name: s['name'], capital: s['capital']} }
       end
 
       def details(state)
-        state_query = format_query(state)
-        all_states = load_states
-
-        state_index = all_states.index{|s| s['alias'] == state_query}
+        state_index = @all_states.index{ |s| s['alias'] == format_query(state) }
 
         if state_index.nil?
           {message: "No state found for '#{state}'", status: 404}
         else
-          res = all_states[state_index].with_indifferent_access
+          res = @all_states[state_index]
           res['cities'] = LocationsNg::City.cities(state)
           res['lgas'] = LocationsNg::Lga.lgas(state)
           res
@@ -22,30 +21,19 @@ module LocationsNg
       end
 
       def capital(state)
-        state_query = format_query(state)
-        all_states = load_states
-
-        state_index = all_states.index{|s| s['alias'] == state_query}
+        state_index = @all_states.index{ |s| s['alias'] == format_query(state) }
 
-        if state_index.nil?
-          {message: "No state found for '#{state}'", status: 404}
-        else
-          all_states[state_index]['capital']
+        unless state_index.nil?
+          return @all_states[state_index]['capital']
         end
-      end
-
-      private
 
-      def load_states
-        YAML.load(File.read(files_location 'states'))
+        {message: "No state found for '#{state}'", status: 404}
       end
 
-      def files_location(file)
-        File.expand_path("../locations/#{file}.yml", __FILE__)
-      end
+      private
 
       def format_query(query)
-        query ? query.downcase.gsub(' ', '_') : query
+        query ? query.downcase.tr(' ', '_') : query
       end
     end
   end

data/lib/locations_ng/version.rb

@@ -1,3 +1,3 @@
 module LocationsNg
-  VERSION = '1.0.2'
+  VERSION = '1.1.1'
 end

data/spec/locations_ng/state_spec.rb

@@ -26,21 +26,22 @@ module LocationsNg
       context 'when state is found' do
         it 'returns detailed data for the state' do
           expect(state.details('Lagos')).to eq({'minLat'=>6.3936419,
-                                             'name'=>'Lagos',
-                                             'capital'=>'Ikeja',
-                                             'latitude'=>6.5243793,
-                                             'minLong'=>3.0982732,
-                                             'maxLat'=>6.7027984,
-                                             'longitude'=>3.3792057,
-                                             'maxLong'=>3.696727799999999,
-                                             'alias'=>'lagos',
-                                             'cities'=>%w(Agege Ikeja),
-                                             'lgas'=>['Agege', 'Ajeromi/ifelodun', 'Alimosho',
-                                                      'Amuwo-odofin', 'Apapa', 'Badagry', 'Epe',
-                                                      'Eti-osa', 'Ibeju/lekki', 'Ifako/ijaiye',
-                                                      'Ikeja', 'Ikorodu', 'Kosofe', 'Lagos Island',
-                                                      'Lagos Mainland', 'Mushin', 'Ojo', 'Oshodi/isolo',
-                                                      'Shomolu', 'Surulere']
+                                                'name'=>'Lagos',
+                                                'capital'=>'Ikeja',
+                                                'latitude'=>6.5243793,
+                                                'minLong'=>3.0982732,
+                                                'maxLat'=>6.7027984,
+                                                'longitude'=>3.3792057,
+                                                'maxLong'=>3.696727799999999,
+                                                'area'=>3345,
+                                                'alias'=>'lagos',
+                                                'cities'=>%w(Agege Ikeja),
+                                                'lgas'=>['Agege', 'Ajeromi/ifelodun', 'Alimosho',
+                                                         'Amuwo-odofin', 'Apapa', 'Badagry', 'Epe',
+                                                         'Eti-osa', 'Ibeju/lekki', 'Ifako/ijaiye',
+                                                         'Ikeja', 'Ikorodu', 'Kosofe', 'Lagos Island',
+                                                         'Lagos Mainland', 'Mushin', 'Ojo', 'Oshodi/isolo',
+                                                         'Shomolu', 'Surulere']
                                             })
         end
       end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: locations_ng
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Fiyin Adebayo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.6
 - !ruby/object:Gem::Dependency
@@ -47,6 +47,7 @@ files:
 - lib/locations_ng.rb
 - lib/locations_ng/city.rb
 - lib/locations_ng/lga.rb
+- lib/locations_ng/load_file.rb
 - lib/locations_ng/locations/cities.yml
 - lib/locations_ng/locations/lgas.yml
 - lib/locations_ng/locations/states.yml
@@ -78,16 +79,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: States, Cities and LGAs in Nigeria.
 test_files:
-- spec/locations_ng/city_spec.rb
-- spec/locations_ng/lga_spec.rb
-- spec/locations_ng/state_spec.rb
+- spec/spec_helper.rb
+- spec/responses/lgas.json
 - spec/responses/canonical_states.json
 - spec/responses/cities.json
-- spec/responses/lgas.json
-- spec/spec_helper.rb
+- spec/locations_ng/state_spec.rb
+- spec/locations_ng/lga_spec.rb
+- spec/locations_ng/city_spec.rb