rwanda 0.5.3 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDJmYjJlYmJhNTc1MmEyNTg0ODRiZDk5NjFiODFhNmIzNGNlN2IwZg==
-  data.tar.gz: !binary |-
-    OTNhM2I3NDQ4ZDVkYTc5MzYwNGU4ODc0MWM2N2YyYjJhYTEwZDJlYQ==
+SHA1:
+  metadata.gz: d7935155fa37e92a3cc84b95cfaf5f93459fae59
+  data.tar.gz: 2d48de8bcdc1cdb1cd01c2ef39c5a15cf8d80e47
 SHA512:
-  metadata.gz: !binary |-
-    YzhkYWY4NjNkMGNlZmZlMDFhNzk5NWE3MjRhZWI1MjE0NjczM2ZiZTlhMDY4
-    OTg2ZTMzOTk1YjRmNjU0NjQ3YzY1MGE0OTQ0NzM0ZGZlZGQ2NzI1YzIwMGRl
-    ZDA2NWM5Yjg3YjliYTExYzlhNWY2MjRlNzQ4NWU0ZGMyN2NlNTc=
-  data.tar.gz: !binary |-
-    MzEyN2NiNWQwOTk4NTExMmQ5YzRmYzU1MDlhOGJiZDdiNTYwMzJmOTA2NWIy
-    MzkyZmU3MmE4NTgyYjdhNWZlNzQ0M2QwMGMzMDNhOGE0NTg4MzY2OWU4ZjQ1
-    ZThjMzdiMWU3NzZkODEyZjNiZGMxYzQ0OWM1ODBiZGY5Njk2NmQ=
+  metadata.gz: 5eb13f9ecb7c632554936fe85200e82fd9148e19c5b6515dc88a5d99bbb4979b50321a5ae27034d4b51dac3c22262b2a5315c911411e602df46ef703c0ffc327
+  data.tar.gz: 102598987dfa3b05c9b2c24374e23e75a9bc4a336c0aba9665b2f497c76bd5bb6158f006717e35a38d27fb3f6626f3104878d299a9c6dc88ac434c160f5ce161

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 kigali-sez.txt
+.ruby-version

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.6.0
+
+ * Addition of Location class (moved out of rails app)
+ * Separation of rails components in separate gem
+ * Conversion to singleton to reduce load times in some circumstances
+ * Improved test environment (catching up with code)
+
 ## 0.5.2
  * Fix serious bug in .where_is? that gave incorrect information
 

data/README.md

@@ -27,7 +27,7 @@ Then you can try it on the command line:
 ## Usage
 
 ```ruby
-rw = Rwanda.new
+rw = Rwanda.instance
 rw.where_is? 'Gasabo'
 rw.provinces
 rw.sectors_of 'Gasabo'
@@ -42,7 +42,7 @@ rw.exist?('Karongi','Bwishyura','Kiniha','Nyarurembo')
 rw.exist?('Karongi','Bwishyura','Nyarurembo')
 ```
 
-Geographic information kindly provided by MINALOC.  There are some minor spelling differences between this data and other sources available at sector level (I have not had any other source to compare with at cell and village level).  In particular the following sectors seem to have alternative spellings:
+Geographic information kindly provided by [MINALOC](http://www.minaloc.gov.rw/).  There are some minor spelling differences between this data and other sources available at sector level (I have not had any other source to compare with at cell and village level).  In particular the following sectors seem to have alternative spellings:
 
 | This gem uses | Others may use |
 ----------------|-----------------

data/lib/rwanda/array.rb

@@ -0,0 +1,8 @@
+class Array
+  def select_first
+    self.each do |el|
+      return el if yield(el)
+    end
+    nil
+  end
+end

data/lib/rwanda/location.rb

@@ -0,0 +1,114 @@
+class Location < Struct.new(:district, :sector, :cell, :village)
+  #Rw = Rwanda.instance
+
+  def division_names(strings=false); strings ? self.members.map(&:humanize) : self.members; end
+  def divisions(strip_nil=false); strip_nil ? self.to_a.grep(String) : self.to_a; end
+  def n_divisions; divisions.count; end
+  
+  def valid? # is it valid?
+    Rwanda.instance.exists? *divisions
+  end
+  def validate! # get rid of invalid data
+    # NOT WORKING BECAUSE CP! DOESN'T WORK
+    #binding.pry
+    each_with_index do |div, n|
+      #binding.pry
+      unless Rwanda.instance.exists? *top(n+1, true)
+        duplicate!(Location.new(*top(n)))
+        return self
+      end
+    end
+    self
+  end
+  
+  # from district down, always returning an n-element array if keep_nils is set
+  def top(n, keep_nils=false)
+    keep_nils ? divisions[0...n] : divisions[0...n].compact
+  end
+  # from district down to and including level
+  def downto(level, keep_nils=false)
+    d = top(division_names.index(level.to_sym)+1)
+    keep_nils ? d : d.compact
+  end
+  # from village up, starting with the village
+  # will be n-element if keep_nils is true
+  def bottom(n, keep_nils=false)
+    d = divisions.reverse[0...n]
+    keep_nils ? d : d.compact
+  end
+  # from village up to and including level
+  def upto(level, keep_nils=false)
+    divisions = bottom(n_divisions - division_names.index(level.to_sym))
+    keep_nils ? divisions : divisions.compact
+  end
+  
+  def first_missing
+    raise "Called first_missing on invalid Location [#{self.to_s}]" unless valid?
+    each_pair do |level, div|
+      return level if div == nil
+    end
+    false
+  end
+  
+  # present? and blank? are rails-only
+  # undefined what to do with a blank string -- it should never happen
+  
+  def to_s
+    if present?
+      to_h.inject([]) { |r, (k,v)| r << "#{v} #{k.to_s.capitalize}" if v; r }.join(', ')
+    else
+      'Unknown'
+    end
+  end
+  def blank?; !present?; end
+  def present?
+    if district.respond_to? :present? # defined in rails, which may be available
+      district.present?
+    else
+      !district.nil? && !district.empty?
+    end
+  end
+
+  private
+  # Useful but broken
+  #def cp!(other) # copies other's attributes to self
+  #  self.division_names do |level|
+  #    self[:level] = other[:level]
+  #  end
+  #  self
+  #end
+  
+  def duplicate!(other)
+    # to_h first implemented in 2.0, but also seemingly provided by rails
+    other.to_h.each_pair do |k,v|
+      self[k] = v
+    end
+    self
+  end
+  
+  #def validate_up_to(threshold, company)
+  #  divisions = []
+  #  (0..threshold).each do |n|
+  #    divisions.push company.read_attribute(DIVISIONS[n]).to_s
+  #  end
+  #  if divisions.blank? # no longer possible
+  #    true
+  #  else
+  #    logger.debug "validate_up_to #{threshold} #{divisions.join(',')}: #{Rw.exist?(*divisions).to_s}"
+  #    Rw.exist?(*divisions)
+  #  end
+  #end
+  #def validate_this(division, company)
+  #  validate_up_to(DIVISIONS.index(division), company)
+  #end
+  #def validate_higher(division, company)
+  #  return true if division == :district
+  #  validate_up_to((DIVISIONS.index(division)-1), company)
+  #end
+  
+  public
+  # Class methods
+  def self.index_of(division)
+    members.index(division) + 1
+  end
+end

data/lib/rwanda/version.rb

@@ -1,3 +1,3 @@
 class Rwanda
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/lib/rwanda/village.rb

@@ -0,0 +1,23 @@
+class Village
+  attr_accessor :province, :district, :sector, :cell, :village
+  
+  def initialize(row)
+    @province,@district,@sector,@cell,@village=row['province'],row['district'],row['sector'],row['cell'],row['village']
+  end
+  def to_s
+    "#{@province}/#{@district}/#{@sector}/#{@cell}/#{@village}"
+  end
+  def match(str)
+    matches = []
+    Rwanda::DIVISIONS.each do |div|
+      if str.downcase == self.send(div).downcase
+        matches.push div
+      end
+    end
+    matches
+  end
+  def [](n)
+    raise "Division index #{n} out of range!  Permitted indices 0 (province) to 4 (village)" unless (0..4).include? n
+    self.send(Rwanda::DIVISIONS[n])
+  end
+end

data/lib/rwanda.rb

@@ -1,47 +1,20 @@
 #!/usr/bin/env ruby
 
+require 'rwanda/array'
 require 'rwanda/version'
-#require 'rwanda/data'
+require 'rwanda/village'
+require 'rwanda/location'
+
+require 'singleton'
 require 'fuzzy_match'
 require 'csv'
 require 'pry'
 
 DATA = File.join(File.dirname(File.expand_path(__FILE__)), 'rwanda/data.csv')
 
-class Array
-  def select_first
-    self.each do |el|
-      return el if yield(el)
-    end
-    nil
-  end
-end
-
-class Village
-  attr_accessor :province, :district, :sector, :cell, :village
-  
-  def initialize(row)
-    @province,@district,@sector,@cell,@village=row['province'],row['district'],row['sector'],row['cell'],row['village']
-  end
-  def to_s
-    "#{@province}/#{@district}/#{@sector}/#{@cell}/#{@village}"
-  end
-  def match(str)
-    matches = []
-    Rwanda::DIVISIONS.each do |div|
-      if str.downcase == self.send(div).downcase
-        matches.push div
-      end
-    end
-    matches
-  end
-  def [](n)
-    raise "Division index #{n} out of range!  Permitted indices 0 (province) to 4 (village)" unless (0..4).include? n
-    self.send(Rwanda::DIVISIONS[n])
-  end
-end
-
 class Rwanda
+  include Singleton
+  
   attr_accessor :villages
   DIVISIONS=[:province,:district,:sector,:cell,:village]
   RW = {
@@ -90,6 +63,8 @@ class Rwanda
   end
   def subdivisions_of(arr)
     case arr.length
+      when 0
+        districts
       when 1
         sectors_of *arr
       when 2
@@ -97,7 +72,7 @@ class Rwanda
       when 3
         villages_of *arr
       else
-        raise "subdivisions_of requires an array of between 1 and 3 elements (do NOT include a province): received #{arr}"
+        raise "subdivisions_of requires an array of between 0 and 3 elements (do NOT include a province): received #{arr}"
     end
   end
   # )) Calleds ((

data/rwanda.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry", "~> 0.10.1"
   spec.add_runtime_dependency "fuzzy_match", "~> 2.1.0"
 end

data/spec/location_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe Location do
+  district = Location.new 'Karongi'
+  sector = Location.new 'Karongi','Bwishyura'
+  cell = Location.new 'Karongi','Bwishyura','Kiniha'
+  village = Location.new 'Karongi','Bwishyura','Kiniha','Nyarurembo'
+  none = Location.new
+  invalid = Location.new 'Karongi', 'Kiniha', 'Bwishyura', 'Nyarurembo'
+
+  describe '.top, .bottom, upto, downto' do
+    it 'can list the divisions up or down to a certain level' do
+      expect(village.top(1)).to eq ['Karongi']
+      expect(village.top(3)).to eq ['Karongi','Bwishyura','Kiniha']
+      expect(village.bottom(1)).to eq ['Nyarurembo']
+      expect(sector.bottom(1)).to eq []
+      expect(village.upto(:sector)).to eq ['Bwishyura','Kiniha','Nyarurembo'].reverse
+      expect(village.downto(:sector)).to eq ['Karongi','Bwishyura']
+    end
+  end
+
+  describe 'Location.index_of' do
+    it 'can convert a division name into a number' do
+      expect(Location.index_of(:district)).to eq 1
+      expect(Location.index_of(:sector)).to eq 2
+      expect(Location.index_of(:cell)).to eq 3
+      expect(Location.index_of(:village)).to eq 4
+    end
+  end
+  
+  describe 'valid? and validate!' do
+    it 'can tell if a location is valid, and clean invalid information' do
+      expect(cell.valid?).to eq true
+      expect(invalid.valid?).to eq false
+      
+      fixed = invalid.validate!
+      expect(fixed).to eq Location.new 'Karongi'
+    end
+  end
+  
+  describe 'first_missing' do
+    it 'can identify the first "missing" division' do
+      expect(sector.first_missing).to eq :cell
+      expect(cell.first_missing).to eq :village
+      expect(village.first_missing).to eq false
+    end
+  end
+  
+  describe 'to_s' do
+    it 'can output a location in human-readable form' do
+      expect(village.to_s).to eq 'Karongi District, Bwishyura Sector, Kiniha Cell, Nyarurembo Village'
+      expect(sector.to_s).to eq 'Karongi District, Bwishyura Sector'
+      expect(Location.new.to_s).to eq 'Unknown'
+    end
+  end
+  
+  describe 'division, division_names' do
+    it 'can list divisions and division names' do
+      expect(village.division_names).to eq [:district, :sector, :cell, :village]
+      expect(cell.divisions).to eq ['Karongi','Bwishyura','Kiniha',nil]
+      expect(district.n_divisions).to eq 4
+    end
+  end
+end

data/spec/rwanda_spec.rb

@@ -1,13 +1,8 @@
 require 'spec_helper'
-
-# Source: old national statistics document
-OLD_SECTORS=['Base', 'Bigogwe', 'Boneza', 'Bugarama', 'Bugeshi', 'Bukure', 'Bumbogo', 'Bungwe', 'Burega', 'Buruhukiro', 'Busanze', 'Busasamana', 'Busasamana', 'Busengo', 'Bushekeri', 'Bushenge', 'Bushoki', 'Busogo', 'Busoro', 'Butare', 'Butaro', 'Buyoga', 'Bweramana', 'Bweyeye', 'Bwira', 'Bwishyura', 'Bwisige', 'Byimana', 'Byumba', 'Coko', 'Cyabakamyi', 'Cyabingo', 'Cyahinda', 'Cyanika', 'Cyanika', 'Cyanzarwe', 'Cyato', 'Cyeru', 'Cyeza', 'Cyinzuzi', 'Cyumba', 'Cyungo', 'Cyuve', 'Fumbwe', 'Gacaca', 'Gacurabwenge', 'Gahanga', 'Gahara', 'Gahengeri', 'Gahini', 'Gahunga', 'Gakenke', 'Gasaka', 'Gasange', 'Gashaki', 'Gashanda', 'Gashenyi', 'Gashonga', 'Gashora', 'Gataraga', 'Gatare', 'Gatebe', 'Gatenga', 'Gatore', 'Gatsata', 'Gatsibo', 'Gatumba', 'Gatunda', 'Gihango', 'Giheke', 'Gihombo', 'Gihundwe', 'Gikomero', 'Gikondo', 'Gikonko', 'Gikundamvura', 'Gisenyi', 'Gishamvu', 'Gishari', 'Gishari', 'Gishubi', 'Gishyita', 'Gisozi', 'Gitambi', 'Gitega', 'Gitesi', 'Giti', 'Gitoki', 'Gitovu', 'Hindiro', 'Huye', 'Jabana', 'Jali', 'Janja', 'Jarama', 'Jenda', 'Jomba', 'Juru', 'Kabacuzi', 'Kabagari', 'Kabare', 'Kabarondo', 'Kabarore', 'Kabatwa', 'Kabaya', 'Kacyiru', 'Kaduha', 'Kagano', 'Kagarama', 'Kageyo', 'Kageyo', 'Kageyo', 'Kagogo', 'Kamabuye', 'Kamegeri', 'Kamembe', 'Kamubuga', 'Kanama', 'Kaniga', 'Kanjongo', 'Kanombe', 'Kansi', 'Kanyinya', 'Kanzenze', 'Karago', 'Karama', 'Karama', 'Karama', 'Karambi', 'Karambo', 'Karangazi', 'Karembo', 'Karenge', 'Karengera', 'Katabagemu', 'Kavumu', 'Kayenzi', 'Kayumbu', 'Kazo', 'Kibangu', 'Kibeho', 'Kibilizi', 'Kibirizi', 'Kibirizi', 'Kibumbwe', 'Kibungo', 'Kicukiro', 'Kigabiro', 'Kigali', 'Kigarama', 'Kigarama', 'Kigembe', 'Kigeyo', 'Kigina', 'Kigoma', 'Kigoma', 'Kimihurura', 'Kimironko', 'Kimisagara', 'Kimonyi', 'Kinazi', 'Kinazi', 'Kinigi', 'Kinihira', 'Kinihira', 'Kinoni', 'Kintobo', 'Kinyababa', 'Kinyinya', 'Kiramuruzi', 'Kirehe', 'Kirimbi', 'Kisaro', 'Kitabi', 'Kivu', 'Kivumu', 'Kivuruga', 'Kivuye', 'Kiyombe', 'Kiyumba', 'Kiziguro', 'Macuba', 'Mageragere', 'Mahama', 'Mahembe', 'Mamba', 'Manihira', 'Manyagiro', 'Maraba', 'Mareba', 'Masaka', 'Masoro', 'Mata', 'Mataba', 'Matimba', 'Matyazo', 'Mayange', 'Mbazi', 'Mbazi', 'Mbogo', 'Mbuye', 'Mimuli', 'Minazi', 'Miyove', 'Mpanga', 'Mubuga', 'Mudende', 'Mugano', 'Muganza', 'Muganza', 'Muganza', 'Mugesera', 'Mugina', 'Mugombwa', 'Mugunga', 'Muhanda', 'Muhanga', 'Muhazi', 'Muhima', 'Muhondo', 'Muhororo', 'Muhoza', 'Muhura', 'Mukama', 'Mukamira', 'Mukarange', 'Mukarange', 'Mukindo', 'Mukingo', 'Muko', 'Muko', 'Mukura', 'Mukura', 'Munini', 'Munyaga', 'Munyiginya', 'Murama', 'Murama', 'Murambi', 'Murambi', 'Murambi', 'Muringa', 'Murunda', 'Murundi', 'Murundi', 'Mururu', 'Musambira', 'Musange', 'Musanze', 'Musasa', 'Musaza', 'Musebeya', 'Musenyi', 'Musha', 'Musha', 'Musheli', 'Mushikiri', 'Mushishiro', 'Mushonyi', 'Mushubati', 'Mushubi', 'Mutenderi', 'Mutete', 'Mutuntu', 'Muyira', 'Muyongwe', 'Muyumbu', 'Muzo', 'Mwendo', 'Mwiri', 'Mwogo', 'Mwulire', 'Nasho', 'Ndaro', 'Ndego', 'Ndera', 'Ndora', 'Nduba', 'Nemba', 'Nemba', 'Ngamba', 'Ngarama', 'Ngera', 'Ngeruka', 'Ngoma', 'Ngoma', 'Ngoma', 'Ngororero', 'Niboye', 'Nkanka', 'Nkomane', 'Nkombo', 'Nkotsi', 'Nkungu', 'Ntarabana', 'Ntarama', 'Ntongwe', 'Ntyazo', 'Nyabimata', 'Nyabinoni', 'Nyabirasi', 'Nyabitekeri', 'Nyagatare', 'Nyagihanga', 'Nyagisozi', 'Nyagisozi', 'Nyakabanda', 'Nyakabuye', 'Nyakarenzo', 'Nyakariro', 'Nyakiliba', 'Nyamabuye', 'Nyamata', 'Nyamirama', 'Nyamirambo', 'Nyamiyaga', 'Nyamiyaga', 'Nyamugali', 'Nyamyumba', 'Nyange', 'Nyange', 'Nyankenke', 'Nyanza', 'Nyarubaka', 'Nyarubuye', 'Nyarugenge', 'Nyarugenge', 'Nyarugunga', 'Nyarusange', 'Nyundo', 'Nzahaha', 'Nzige', 'Rambura', 'Rangiro', 'Remera', 'Remera', 'Remera', 'Remera', 'Rilima', 'Rongi', 'Rubavu', 'Rubaya', 'Rubengera', 'Rubona', 'Rugabano', 'Rugalika', 'Ruganda', 'Rugarama', 'Rugarama', 'Rugendabari', 'Rugengabari', 'Rugera', 'Rugerero', 'Ruhango', 'Ruhango', 'Ruharambuga', 'Ruhashya', 'Ruheru', 'Ruhuha', 'Ruhunde', 'Rukara', 'Rukira', 'Rukoma', 'Rukomo', 'Rukomo', 'Rukozo', 'Rukumberi', 'Ruli', 'Runda', 'Ruramba', 'Ruramira', 'Rurembo', 'Rurenge', 'Rusarabuge', 'Rusasa', 'Rusatira', 'Rusebeya', 'Rusenge', 'Rushaki', 'Rushashi', 'Rusiga', 'Rusororo', 'Rutare', 'Rutunga', 'Ruvune', 'Rwabicuma', 'Rwamiko', 'Rwaniro', 'Rwankuba', 'Rwaza', 'Rwempasha', 'Rwerere', 'Rweru', 'Rwezamenyo', 'Rwimbogo', 'Rwimbogo', 'Rwimiyaga', 'Rwinkwavu', 'Sake', 'Save', 'Shangasha', 'Shangi', 'Shingiro', 'Shyara', 'Shyira', 'Shyogwe', 'Shyorongi', 'Simbi', 'Sovu', 'Tabagwe', 'Tare', 'Tumba', 'Tumba', 'Twumba', 'Uwinkingi', 'Zaza'].sort
-
-# Source: MINALOC via Annoncée
-SECTORS=['Base', 'Bigogwe', 'Boneza', 'Bugarama', 'Bugeshi', 'Bukure', 'Bumbogo', 'Bungwe', 'Burega', 'Buruhukiro', 'Busanze', 'Busasamana', 'Busasamana', 'Busengo', 'Bushekeri', 'Bushenge', 'Bushoki', 'Busogo', 'Busoro', 'Butare', 'Butaro', 'Buyoga', 'Bweramana', 'Bweyeye', 'Bwira', 'Bwishyura', 'Bwisige', 'Byimana', 'Byumba', 'Coko', 'Cyabakamyi', 'Cyabingo', 'Cyahinda', 'Cyanika', 'Cyanika', 'Cyanzarwe', 'Cyato', 'Cyeru', 'Cyeza', 'Cyinzuzi', 'Cyumba', 'Cyungo', 'Cyuve', 'Fumbwe', 'Gacaca', 'Gacurabwenge', 'Gahanga', 'Gahara', 'Gahengeri', 'Gahini', 'Gahunga', 'Gakenke', 'Gasaka', 'Gasange', 'Gashaki', 'Gashanda', 'Gashari', 'Gashenyi', 'Gashonga', 'Gashora', 'Gataraga', 'Gatare', 'Gatebe', 'Gatenga', 'Gatore', 'Gatsata', 'Gatsibo', 'Gatumba', 'Gatunda', 'Gihango', 'Giheke', 'Gihombo', 'Gihundwe', 'Gikomero', 'Gikondo', 'Gikonko', 'Gikundamvura', 'Gisenyi', 'Gishali', 'Gishamvu', 'Gishubi', 'Gishyita', 'Gisozi', 'Gitambi', 'Gitega', 'Gitesi', 'Giti', 'Gitoki', 'Gitovu', 'Hindiro', 'Huye', 'Jabana', 'Jali', 'Janja', 'Jarama', 'Jenda', 'Jomba', 'Juru', 'Kabacuzi', 'Kabagali', 'Kabare', 'Kabarondo', 'Kabarore', 'Kabatwa', 'Kabaya', 'Kacyiru', 'Kaduha', 'Kagano', 'Kagarama', 'Kageyo', 'Kageyo', 'Kageyo', 'Kagogo', 'Kamabuye', 'Kamegeri', 'Kamembe', 'Kamubuga', 'Kanama', 'Kaniga', 'Kanjongo', 'Kanombe', 'Kansi', 'Kanyinya', 'Kanzenze', 'Karago', 'Karama', 'Karama', 'Karama', 'Karambi', 'Karambo', 'Karangazi', 'Karembo', 'Karenge', 'Karengera', 'Katabagemu', 'Kavumu', 'Kayenzi', 'Kayumbu', 'Kazo', 'Kibangu', 'Kibeho', 'Kibilizi', 'Kibirizi', 'Kibirizi', 'Kibumbwe', 'Kibungo', 'Kicukiro', 'Kigabiro', 'Kigali', 'Kigarama', 'Kigarama', 'Kigembe', 'Kigeyo', 'Kigina', 'Kigoma', 'Kigoma', 'Kimihurura', 'Kimironko', 'Kimisagara', 'Kimonyi', 'Kinazi', 'Kinazi', 'Kinigi', 'Kinihira', 'Kinihira', 'Kinoni', 'Kintobo', 'Kinyababa', 'Kinyinya', 'Kiramuruzi', 'Kirehe', 'Kirimbi', 'Kisaro', 'Kitabi', 'Kivu', 'Kivumu', 'Kivuruga', 'Kivuye', 'Kiyombe', 'Kiyumba', 'Kiziguro', 'Macuba', 'Mageregere', 'Mahama', 'Mahembe', 'Mamba', 'Manihira', 'Manyagiro', 'Maraba', 'Mareba', 'Masaka', 'Masoro', 'Mata', 'Mataba', 'Matimba', 'Matyazo', 'Mayange', 'Mbazi', 'Mbazi', 'Mbogo', 'Mbuye', 'Mimuri', 'Minazi', 'Miyove', 'Mpanga', 'Mubuga', 'Mudende', 'Mugano', 'Muganza', 'Muganza', 'Muganza', 'Mugesera', 'Mugina', 'Mugombwa', 'Mugunga', 'Muhanda', 'Muhanga', 'Muhazi', 'Muhima', 'Muhondo', 'Muhororo', 'Muhoza', 'Muhura', 'Mukama', 'Mukamira', 'Mukarange', 'Mukarange', 'Mukindo', 'Mukingo', 'Muko', 'Muko', 'Mukura', 'Mukura', 'Munini', 'Munyaga', 'Munyiginya', 'Murama', 'Murama', 'Murambi', 'Murambi', 'Murambi', 'Muringa', 'Murunda', 'Murundi', 'Murundi', 'Mururu', 'Musambira', 'Musange', 'Musanze', 'Musasa', 'Musaza', 'Musebeya', 'Musenyi', 'Musha', 'Musha', 'Musheri', 'Mushikiri', 'Mushishiro', 'Mushonyi', 'Mushubati', 'Mushubi', 'Mutenderi', 'Mutete', 'Mutuntu', 'Muyira', 'Muyongwe', 'Muyumbu', 'Muzo', 'Mwendo', 'Mwiri', 'Mwogo', 'Mwulire', 'Nasho', 'Ndaro', 'Ndego', 'Ndera', 'Ndora', 'Nduba', 'Nemba', 'Nemba', 'Ngamba', 'Ngarama', 'Ngera', 'Ngeruka', 'Ngoma', 'Ngoma', 'Ngoma', 'Ngororero', 'Niboye', 'Nkanka', 'Nkomane', 'Nkombo', 'Nkotsi', 'Nkungu', 'Ntarabana', 'Ntarama', 'Ntongwe', 'Ntyazo', 'Nyabimata', 'Nyabinoni', 'Nyabirasi', 'Nyabitekeri', 'Nyagatare', 'Nyagihanga', 'Nyagisozi', 'Nyagisozi', 'Nyakabanda', 'Nyakabuye', 'Nyakaliro', 'Nyakarenzo', 'Nyakiriba', 'Nyamabuye', 'Nyamata', 'Nyamirama', 'Nyamirambo', 'Nyamiyaga', 'Nyamiyaga', 'Nyamugari', 'Nyamyumba', 'Nyange', 'Nyange', 'Nyankenke', 'Nyanza', 'Nyarubaka', 'Nyarubuye', 'Nyarugenge', 'Nyarugenge', 'Nyarugunga', 'Nyarusange', 'Nyundo', 'Nzahaha', 'Nzige', 'Rambura', 'Rangiro', 'Remera', 'Remera', 'Remera', 'Remera', 'Rilima', 'Rongi', 'Rubavu', 'Rubaya', 'Rubengera', 'Rubona', 'Rugabano', 'Ruganda', 'Rugarama', 'Rugarama', 'Rugarika', 'Rugendabari', 'Rugengabari', 'Rugera', 'Rugerero', 'Ruhango', 'Ruhango', 'Ruharambuga', 'Ruhashya', 'Ruheru', 'Ruhuha', 'Ruhunde', 'Rukara', 'Rukira', 'Rukoma', 'Rukomo', 'Rukomo', 'Rukozo', 'Rukumberi', 'Ruli', 'Runda', 'Ruramba', 'Ruramira', 'Rurembo', 'Rurenge', 'Rusarabuye', 'Rusasa', 'Rusatira', 'Rusebeya', 'Rusenge', 'Rushaki', 'Rushashi', 'Rusiga', 'Rusororo', 'Rutare', 'Rutunga', 'Ruvune', 'Rwabicuma', 'Rwamiko', 'Rwaniro', 'Rwankuba', 'Rwaza', 'Rwempasha', 'Rwerere', 'Rweru', 'Rwezamenyo', 'Rwimbogo', 'Rwimbogo', 'Rwimiyaga', 'Rwinkwavu', 'Sake', 'Save', 'Shangasha', 'Shangi', 'Shingiro', 'Shyara', 'Shyira', 'Shyogwe', 'Shyorongi', 'Simbi', 'Sovu', 'Tabagwe', 'Tare', 'Tumba', 'Tumba', 'Twumba', 'Uwinkingi', 'Zaza'].sort
+require 'sectors_data'
 
 describe Rwanda do
-  r = Rwanda.new
+  r = Rwanda.instance
   
   # Singular Ofs
   
@@ -177,12 +172,5 @@ describe Rwanda do
       r.where_is? 'Foobar'
     end
   end
+end  
   
-  #describe '.is_in?' do
-  #  it 'knows whether a smaller division is inside a larger division' do
-  #    expect(r.is_in?('Karongi','Gashari')).to eq true
-  #    expect(r.is_in?('Gashari','Karongi')).to eq false
-  #    expect(r.is_in?('
-  #  end
-  #end
-end

data/spec/sectors_data.rb

@@ -0,0 +1,6 @@
+# Source: old national statistics document
+OLD_SECTORS=['Base', 'Bigogwe', 'Boneza', 'Bugarama', 'Bugeshi', 'Bukure', 'Bumbogo', 'Bungwe', 'Burega', 'Buruhukiro', 'Busanze', 'Busasamana', 'Busasamana', 'Busengo', 'Bushekeri', 'Bushenge', 'Bushoki', 'Busogo', 'Busoro', 'Butare', 'Butaro', 'Buyoga', 'Bweramana', 'Bweyeye', 'Bwira', 'Bwishyura', 'Bwisige', 'Byimana', 'Byumba', 'Coko', 'Cyabakamyi', 'Cyabingo', 'Cyahinda', 'Cyanika', 'Cyanika', 'Cyanzarwe', 'Cyato', 'Cyeru', 'Cyeza', 'Cyinzuzi', 'Cyumba', 'Cyungo', 'Cyuve', 'Fumbwe', 'Gacaca', 'Gacurabwenge', 'Gahanga', 'Gahara', 'Gahengeri', 'Gahini', 'Gahunga', 'Gakenke', 'Gasaka', 'Gasange', 'Gashaki', 'Gashanda', 'Gashenyi', 'Gashonga', 'Gashora', 'Gataraga', 'Gatare', 'Gatebe', 'Gatenga', 'Gatore', 'Gatsata', 'Gatsibo', 'Gatumba', 'Gatunda', 'Gihango', 'Giheke', 'Gihombo', 'Gihundwe', 'Gikomero', 'Gikondo', 'Gikonko', 'Gikundamvura', 'Gisenyi', 'Gishamvu', 'Gishari', 'Gishari', 'Gishubi', 'Gishyita', 'Gisozi', 'Gitambi', 'Gitega', 'Gitesi', 'Giti', 'Gitoki', 'Gitovu', 'Hindiro', 'Huye', 'Jabana', 'Jali', 'Janja', 'Jarama', 'Jenda', 'Jomba', 'Juru', 'Kabacuzi', 'Kabagari', 'Kabare', 'Kabarondo', 'Kabarore', 'Kabatwa', 'Kabaya', 'Kacyiru', 'Kaduha', 'Kagano', 'Kagarama', 'Kageyo', 'Kageyo', 'Kageyo', 'Kagogo', 'Kamabuye', 'Kamegeri', 'Kamembe', 'Kamubuga', 'Kanama', 'Kaniga', 'Kanjongo', 'Kanombe', 'Kansi', 'Kanyinya', 'Kanzenze', 'Karago', 'Karama', 'Karama', 'Karama', 'Karambi', 'Karambo', 'Karangazi', 'Karembo', 'Karenge', 'Karengera', 'Katabagemu', 'Kavumu', 'Kayenzi', 'Kayumbu', 'Kazo', 'Kibangu', 'Kibeho', 'Kibilizi', 'Kibirizi', 'Kibirizi', 'Kibumbwe', 'Kibungo', 'Kicukiro', 'Kigabiro', 'Kigali', 'Kigarama', 'Kigarama', 'Kigembe', 'Kigeyo', 'Kigina', 'Kigoma', 'Kigoma', 'Kimihurura', 'Kimironko', 'Kimisagara', 'Kimonyi', 'Kinazi', 'Kinazi', 'Kinigi', 'Kinihira', 'Kinihira', 'Kinoni', 'Kintobo', 'Kinyababa', 'Kinyinya', 'Kiramuruzi', 'Kirehe', 'Kirimbi', 'Kisaro', 'Kitabi', 'Kivu', 'Kivumu', 'Kivuruga', 'Kivuye', 'Kiyombe', 'Kiyumba', 'Kiziguro', 'Macuba', 'Mageragere', 'Mahama', 'Mahembe', 'Mamba', 'Manihira', 'Manyagiro', 'Maraba', 'Mareba', 'Masaka', 'Masoro', 'Mata', 'Mataba', 'Matimba', 'Matyazo', 'Mayange', 'Mbazi', 'Mbazi', 'Mbogo', 'Mbuye', 'Mimuli', 'Minazi', 'Miyove', 'Mpanga', 'Mubuga', 'Mudende', 'Mugano', 'Muganza', 'Muganza', 'Muganza', 'Mugesera', 'Mugina', 'Mugombwa', 'Mugunga', 'Muhanda', 'Muhanga', 'Muhazi', 'Muhima', 'Muhondo', 'Muhororo', 'Muhoza', 'Muhura', 'Mukama', 'Mukamira', 'Mukarange', 'Mukarange', 'Mukindo', 'Mukingo', 'Muko', 'Muko', 'Mukura', 'Mukura', 'Munini', 'Munyaga', 'Munyiginya', 'Murama', 'Murama', 'Murambi', 'Murambi', 'Murambi', 'Muringa', 'Murunda', 'Murundi', 'Murundi', 'Mururu', 'Musambira', 'Musange', 'Musanze', 'Musasa', 'Musaza', 'Musebeya', 'Musenyi', 'Musha', 'Musha', 'Musheli', 'Mushikiri', 'Mushishiro', 'Mushonyi', 'Mushubati', 'Mushubi', 'Mutenderi', 'Mutete', 'Mutuntu', 'Muyira', 'Muyongwe', 'Muyumbu', 'Muzo', 'Mwendo', 'Mwiri', 'Mwogo', 'Mwulire', 'Nasho', 'Ndaro', 'Ndego', 'Ndera', 'Ndora', 'Nduba', 'Nemba', 'Nemba', 'Ngamba', 'Ngarama', 'Ngera', 'Ngeruka', 'Ngoma', 'Ngoma', 'Ngoma', 'Ngororero', 'Niboye', 'Nkanka', 'Nkomane', 'Nkombo', 'Nkotsi', 'Nkungu', 'Ntarabana', 'Ntarama', 'Ntongwe', 'Ntyazo', 'Nyabimata', 'Nyabinoni', 'Nyabirasi', 'Nyabitekeri', 'Nyagatare', 'Nyagihanga', 'Nyagisozi', 'Nyagisozi', 'Nyakabanda', 'Nyakabuye', 'Nyakarenzo', 'Nyakariro', 'Nyakiliba', 'Nyamabuye', 'Nyamata', 'Nyamirama', 'Nyamirambo', 'Nyamiyaga', 'Nyamiyaga', 'Nyamugali', 'Nyamyumba', 'Nyange', 'Nyange', 'Nyankenke', 'Nyanza', 'Nyarubaka', 'Nyarubuye', 'Nyarugenge', 'Nyarugenge', 'Nyarugunga', 'Nyarusange', 'Nyundo', 'Nzahaha', 'Nzige', 'Rambura', 'Rangiro', 'Remera', 'Remera', 'Remera', 'Remera', 'Rilima', 'Rongi', 'Rubavu', 'Rubaya', 'Rubengera', 'Rubona', 'Rugabano', 'Rugalika', 'Ruganda', 'Rugarama', 'Rugarama', 'Rugendabari', 'Rugengabari', 'Rugera', 'Rugerero', 'Ruhango', 'Ruhango', 'Ruharambuga', 'Ruhashya', 'Ruheru', 'Ruhuha', 'Ruhunde', 'Rukara', 'Rukira', 'Rukoma', 'Rukomo', 'Rukomo', 'Rukozo', 'Rukumberi', 'Ruli', 'Runda', 'Ruramba', 'Ruramira', 'Rurembo', 'Rurenge', 'Rusarabuge', 'Rusasa', 'Rusatira', 'Rusebeya', 'Rusenge', 'Rushaki', 'Rushashi', 'Rusiga', 'Rusororo', 'Rutare', 'Rutunga', 'Ruvune', 'Rwabicuma', 'Rwamiko', 'Rwaniro', 'Rwankuba', 'Rwaza', 'Rwempasha', 'Rwerere', 'Rweru', 'Rwezamenyo', 'Rwimbogo', 'Rwimbogo', 'Rwimiyaga', 'Rwinkwavu', 'Sake', 'Save', 'Shangasha', 'Shangi', 'Shingiro', 'Shyara', 'Shyira', 'Shyogwe', 'Shyorongi', 'Simbi', 'Sovu', 'Tabagwe', 'Tare', 'Tumba', 'Tumba', 'Twumba', 'Uwinkingi', 'Zaza'].sort
+
+# Source: MINALOC via Annoncée
+SECTORS=['Base', 'Bigogwe', 'Boneza', 'Bugarama', 'Bugeshi', 'Bukure', 'Bumbogo', 'Bungwe', 'Burega', 'Buruhukiro', 'Busanze', 'Busasamana', 'Busasamana', 'Busengo', 'Bushekeri', 'Bushenge', 'Bushoki', 'Busogo', 'Busoro', 'Butare', 'Butaro', 'Buyoga', 'Bweramana', 'Bweyeye', 'Bwira', 'Bwishyura', 'Bwisige', 'Byimana', 'Byumba', 'Coko', 'Cyabakamyi', 'Cyabingo', 'Cyahinda', 'Cyanika', 'Cyanika', 'Cyanzarwe', 'Cyato', 'Cyeru', 'Cyeza', 'Cyinzuzi', 'Cyumba', 'Cyungo', 'Cyuve', 'Fumbwe', 'Gacaca', 'Gacurabwenge', 'Gahanga', 'Gahara', 'Gahengeri', 'Gahini', 'Gahunga', 'Gakenke', 'Gasaka', 'Gasange', 'Gashaki', 'Gashanda', 'Gashari', 'Gashenyi', 'Gashonga', 'Gashora', 'Gataraga', 'Gatare', 'Gatebe', 'Gatenga', 'Gatore', 'Gatsata', 'Gatsibo', 'Gatumba', 'Gatunda', 'Gihango', 'Giheke', 'Gihombo', 'Gihundwe', 'Gikomero', 'Gikondo', 'Gikonko', 'Gikundamvura', 'Gisenyi', 'Gishali', 'Gishamvu', 'Gishubi', 'Gishyita', 'Gisozi', 'Gitambi', 'Gitega', 'Gitesi', 'Giti', 'Gitoki', 'Gitovu', 'Hindiro', 'Huye', 'Jabana', 'Jali', 'Janja', 'Jarama', 'Jenda', 'Jomba', 'Juru', 'Kabacuzi', 'Kabagali', 'Kabare', 'Kabarondo', 'Kabarore', 'Kabatwa', 'Kabaya', 'Kacyiru', 'Kaduha', 'Kagano', 'Kagarama', 'Kageyo', 'Kageyo', 'Kageyo', 'Kagogo', 'Kamabuye', 'Kamegeri', 'Kamembe', 'Kamubuga', 'Kanama', 'Kaniga', 'Kanjongo', 'Kanombe', 'Kansi', 'Kanyinya', 'Kanzenze', 'Karago', 'Karama', 'Karama', 'Karama', 'Karambi', 'Karambo', 'Karangazi', 'Karembo', 'Karenge', 'Karengera', 'Katabagemu', 'Kavumu', 'Kayenzi', 'Kayumbu', 'Kazo', 'Kibangu', 'Kibeho', 'Kibilizi', 'Kibirizi', 'Kibirizi', 'Kibumbwe', 'Kibungo', 'Kicukiro', 'Kigabiro', 'Kigali', 'Kigarama', 'Kigarama', 'Kigembe', 'Kigeyo', 'Kigina', 'Kigoma', 'Kigoma', 'Kimihurura', 'Kimironko', 'Kimisagara', 'Kimonyi', 'Kinazi', 'Kinazi', 'Kinigi', 'Kinihira', 'Kinihira', 'Kinoni', 'Kintobo', 'Kinyababa', 'Kinyinya', 'Kiramuruzi', 'Kirehe', 'Kirimbi', 'Kisaro', 'Kitabi', 'Kivu', 'Kivumu', 'Kivuruga', 'Kivuye', 'Kiyombe', 'Kiyumba', 'Kiziguro', 'Macuba', 'Mageregere', 'Mahama', 'Mahembe', 'Mamba', 'Manihira', 'Manyagiro', 'Maraba', 'Mareba', 'Masaka', 'Masoro', 'Mata', 'Mataba', 'Matimba', 'Matyazo', 'Mayange', 'Mbazi', 'Mbazi', 'Mbogo', 'Mbuye', 'Mimuri', 'Minazi', 'Miyove', 'Mpanga', 'Mubuga', 'Mudende', 'Mugano', 'Muganza', 'Muganza', 'Muganza', 'Mugesera', 'Mugina', 'Mugombwa', 'Mugunga', 'Muhanda', 'Muhanga', 'Muhazi', 'Muhima', 'Muhondo', 'Muhororo', 'Muhoza', 'Muhura', 'Mukama', 'Mukamira', 'Mukarange', 'Mukarange', 'Mukindo', 'Mukingo', 'Muko', 'Muko', 'Mukura', 'Mukura', 'Munini', 'Munyaga', 'Munyiginya', 'Murama', 'Murama', 'Murambi', 'Murambi', 'Murambi', 'Muringa', 'Murunda', 'Murundi', 'Murundi', 'Mururu', 'Musambira', 'Musange', 'Musanze', 'Musasa', 'Musaza', 'Musebeya', 'Musenyi', 'Musha', 'Musha', 'Musheri', 'Mushikiri', 'Mushishiro', 'Mushonyi', 'Mushubati', 'Mushubi', 'Mutenderi', 'Mutete', 'Mutuntu', 'Muyira', 'Muyongwe', 'Muyumbu', 'Muzo', 'Mwendo', 'Mwiri', 'Mwogo', 'Mwulire', 'Nasho', 'Ndaro', 'Ndego', 'Ndera', 'Ndora', 'Nduba', 'Nemba', 'Nemba', 'Ngamba', 'Ngarama', 'Ngera', 'Ngeruka', 'Ngoma', 'Ngoma', 'Ngoma', 'Ngororero', 'Niboye', 'Nkanka', 'Nkomane', 'Nkombo', 'Nkotsi', 'Nkungu', 'Ntarabana', 'Ntarama', 'Ntongwe', 'Ntyazo', 'Nyabimata', 'Nyabinoni', 'Nyabirasi', 'Nyabitekeri', 'Nyagatare', 'Nyagihanga', 'Nyagisozi', 'Nyagisozi', 'Nyakabanda', 'Nyakabuye', 'Nyakaliro', 'Nyakarenzo', 'Nyakiriba', 'Nyamabuye', 'Nyamata', 'Nyamirama', 'Nyamirambo', 'Nyamiyaga', 'Nyamiyaga', 'Nyamugari', 'Nyamyumba', 'Nyange', 'Nyange', 'Nyankenke', 'Nyanza', 'Nyarubaka', 'Nyarubuye', 'Nyarugenge', 'Nyarugenge', 'Nyarugunga', 'Nyarusange', 'Nyundo', 'Nzahaha', 'Nzige', 'Rambura', 'Rangiro', 'Remera', 'Remera', 'Remera', 'Remera', 'Rilima', 'Rongi', 'Rubavu', 'Rubaya', 'Rubengera', 'Rubona', 'Rugabano', 'Ruganda', 'Rugarama', 'Rugarama', 'Rugarika', 'Rugendabari', 'Rugengabari', 'Rugera', 'Rugerero', 'Ruhango', 'Ruhango', 'Ruharambuga', 'Ruhashya', 'Ruheru', 'Ruhuha', 'Ruhunde', 'Rukara', 'Rukira', 'Rukoma', 'Rukomo', 'Rukomo', 'Rukozo', 'Rukumberi', 'Ruli', 'Runda', 'Ruramba', 'Ruramira', 'Rurembo', 'Rurenge', 'Rusarabuye', 'Rusasa', 'Rusatira', 'Rusebeya', 'Rusenge', 'Rushaki', 'Rushashi', 'Rusiga', 'Rusororo', 'Rutare', 'Rutunga', 'Ruvune', 'Rwabicuma', 'Rwamiko', 'Rwaniro', 'Rwankuba', 'Rwaza', 'Rwempasha', 'Rwerere', 'Rweru', 'Rwezamenyo', 'Rwimbogo', 'Rwimbogo', 'Rwimiyaga', 'Rwinkwavu', 'Sake', 'Save', 'Shangasha', 'Shangi', 'Shingiro', 'Shyara', 'Shyira', 'Shyogwe', 'Shyorongi', 'Simbi', 'Sovu', 'Tabagwe', 'Tare', 'Tumba', 'Tumba', 'Twumba', 'Uwinkingi', 'Zaza'].sort
+

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rwanda
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Dan Hetherington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 description: 
@@ -87,17 +87,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/rwanda.rb
+- lib/rwanda/array.rb
 - lib/rwanda/data.csv
+- lib/rwanda/location.rb
 - lib/rwanda/version.rb
+- lib/rwanda/village.rb
 - rwanda.gemspec
+- spec/location_spec.rb
 - spec/rwanda_spec.rb
+- spec/sectors_data.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: http://www.minicom.gov.rw/
@@ -110,20 +115,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Access information about geographical divisions in Rwanda.
 test_files:
+- spec/location_spec.rb
 - spec/rwanda_spec.rb
+- spec/sectors_data.rb
 - spec/spec_helper.rb