locations_ng 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa049b1575ec78e58249287f6d569e18f89d4142
-  data.tar.gz: b5cf8f333940cef919906c7d58a04a04233e45f0
+  metadata.gz: cdfcb7c01c3a323698dcbd29ca166dd6444d7fde
+  data.tar.gz: f32b8b96950a4cb8fb307832be130888f769eb01
 SHA512:
-  metadata.gz: ab36708ef06d4666f7f2e3eae7534454c5ce2b03fbbea09da34e55e36071a5888a1b7b26ea4ca5605ae2cf59f6bae09724677e45103bf59a32881134bafe5b71
-  data.tar.gz: d96f563f5709afb642b657595f6f8bfcf5d569bd8021c2c9eb97ec556eb9526d946f8a6a060ac3996781355cd13d7b73a89bb2411c535db3fab0bc0ff917e750
+  metadata.gz: ad89e4edd1f6e9d0cee7bdc7c978fef02c8b202b2b0e7bf9ca6ff275c7d5dcda54479a21af9e56cdf1b8ca0c07e67fa924efa7a4dd8c1fd31573c6ee8f97e1d8
+  data.tar.gz: a0ddc4f9be213ad0b8a3e45f908cfeb4d046f4bdae101415bb16ae25f88539e6a91b5363200a554bf1abb73931bfd466a626192adae20f9217d31b8f852a3bb7

data/lib/locations_ng.rb

@@ -1,5 +1,6 @@
 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/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].with_indifferent_access
           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.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locations_ng
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Fiyin Adebayo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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