locations_ng 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6a119150f710c2249b1a9023afd76b449a4621
-  data.tar.gz: eb979e5c18d214931235c367de8aa3ee7b42de0d
+  metadata.gz: fa049b1575ec78e58249287f6d569e18f89d4142
+  data.tar.gz: b5cf8f333940cef919906c7d58a04a04233e45f0
 SHA512:
-  metadata.gz: 2649379d702a7a37055c1b8aaec32982edaa3997530a19a68d5e5a6e57a3dff12affe5b6bd7bd3f3e3e6d34432da1b3f853e8ae757895c1e3e9a272f0104309e
-  data.tar.gz: b7e514d95187a3177ae6d533d80bf525221c17f3f9b5b5b64ea586f8ef4580b37705cd097369296310d84aaac0d2c5b9a47418e69fd48fdfe69b7c317837a61a
+  metadata.gz: ab36708ef06d4666f7f2e3eae7534454c5ce2b03fbbea09da34e55e36071a5888a1b7b26ea4ca5605ae2cf59f6bae09724677e45103bf59a32881134bafe5b71
+  data.tar.gz: d96f563f5709afb642b657595f6f8bfcf5d569bd8021c2c9eb97ec556eb9526d946f8a6a060ac3996781355cd13d7b73a89bb2411c535db3fab0bc0ff917e750

data/lib/locations_ng/city.rb

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

data/lib/locations_ng/lga.rb

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