rwanda 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a00b6d65c44a7f85e5a71b0dddb5841bbf92659
-  data.tar.gz: c9b1891159f33205c1f522834549ac970db920b7
+  metadata.gz: a8fcd2d987c04671d739e62c9e910669046860b9
+  data.tar.gz: 89fb5f38046645dbc3197dd67024a24a4cf151d8
 SHA512:
-  metadata.gz: 423d6dc096c803a290c1e485a88d4ec086d93de02c843a119432b755f661bd288a8cd34061b6f104ba53b2efa210a38bf10f9f02ac0607f5a69910d76f99d472
-  data.tar.gz: 829894ae447be99a0c6123e955db6c071866333ae7a9cd5043ce582cb2f78009ba4d0c99aee3cf53ac7214ba4b0f8a1b54d27e0e8e90a9cc5e6bef4782d5aa57
+  metadata.gz: 557b747e34beed787334854a043d9996afb91fa641807fafc3c7da04927fb88d3f717dadc31b8cf5cc8d2cd214212c0edc64cd9318837803130a9df06e47d6ae
+  data.tar.gz: b8ee160322159c11117afdcabd5bf248f3b619d5c37f0982ae9670847d9285d40fabc7f92a9ff2490020faa0c0a26543bfca03d3c3341e9434dd7c95ec3111cf

data/.gitignore

@@ -14,3 +14,4 @@
 mkmf.log
 kigali-sez.txt
 .ruby-version
+.~lock*

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.0
+
+ * Fix .district_of when sector belongs to multiple districts (#2)
+
 ## 0.7.2
 
  * Add Coveralls and Travis CI

data/README.md

@@ -34,9 +34,9 @@ Then you can try it on the command line:
 ## Usage
 
 ```ruby
-[2] pry(main)> rw=Rwanda.instance
+pry(main)> rw=Rwanda.instance
 => #<Rwanda:0x007f00ea48cf28 ... >
-[3] pry(main)> rw.where_is? 'Gasabo'
+pry(main)> rw.where_is? 'Gasabo'
 Rwanda has 1 district, 0 sectors, 1 cell, and 8 villages called Gasabo:
   Gasabo is a village in Kimaranzara Cell, Rilima Sector, Bugesera District, Eastern Province
   Gasabo is a village in Butiruka Cell, Remera Sector, Gatsibo District, Eastern Province
@@ -49,27 +49,29 @@ Rwanda has 1 district, 0 sectors, 1 cell, and 8 villages called Gasabo:
   Gasabo is a village in Kabeza Cell, Kanombe Sector, Kicukiro District, Kigali City
   Gasabo is a village in Kabuguru II Cell, Rwezamenyo Sector, Nyarugenge District, Kigali City
 => nil
-[4] pry(main)> rw.provinces
+pry(main)> rw.provinces
 => ["Eastern Province", "Kigali City", "Northern Province", "Southern Province", "Western Province"]
-[5] pry(main)> rw.sectors_of 'Gasabo'
+pry(main)> rw.sectors_of 'Gasabo'
 => ["Bumbogo", "Gatsata", "Gikomero", "Gisozi", "Jabana", "Jali", "Kacyiru", "Kimihurura", "Kimironko", "Kinyinya", "Ndera", "Nduba", "Remera", "Rusororo", "Rutunga"]
-[6] pry(main)> rw.district_of 'Giheke'
+pry(main)> rw.district_of 'Giheke'
 => "Rusizi"
-[7] pry(main)> rw.sector_like 'Rukuma'
+pry(main)> rw.district_of 'Busasamana' # returns array if multiple
+=> ["Nyanza", "Rubavu"]
+pry(main)> rw.sector_like 'Rukuma'
 RuntimeError: can't modify frozen #<Class:#<Rwanda:0x007f00ea48cf28>>
 from /home/slack/vendor/bundle/gems/rwanda-0.7.1/lib/rwanda.rb:87:in `sectors'
-[8] pry(main)> rw.is_district? 'Karongi'
+pry(main)> rw.is_district? 'Karongi'
 => true
-[9] pry(main)> rw.is_sector? 'Gashari'
+pry(main)> rw.is_sector? 'Gashari'
 => true
-[10] pry(main)> rw.is_cell? 'Musasa'
+pry(main)> rw.is_cell? 'Musasa'
 => true
-[11] pry(main)> rw.is_village? 'Kaduha'
+pry(main)> rw.is_village? 'Kaduha'
 => true
-[12] pry(main)> # Rwanda#exist?(district, sector, cell, village)
-[13] pry(main)> rw.exist?('Karongi','Bwishyura','Kiniha','Nyarurembo')
+pry(main)> # Rwanda#exist?(district, sector, cell, village)
+pry(main)> rw.exist?('Karongi','Bwishyura','Kiniha','Nyarurembo')
 => true
-[14] pry(main)> rw.exist?('Karongi','Bwishyura','Nyarurembo')
+pry(main)> rw.exist?('Karongi','Bwishyura','Nyarurembo')
 => false
 ```
 

data/lib/rwanda.rb

@@ -42,8 +42,15 @@ class Rwanda
     end
   end
   def district_of(sector)
-    village = @villages.select_first {|v| v.sector.downcase == sector.downcase}
-    village ? village.district : nil
+    villages = @villages.select {|v| v.sector.downcase == sector.downcase}.collect {|v| { sector: v.sector, district: v.district } }.uniq
+    case villages.length
+      when 0
+        nil
+      when 1
+        villages[0][:district]
+      else
+        villages.collect {|v| v[:district] }.sort
+    end
   end
   # )) Plural Ofs ((
   def districts_of(province)

data/lib/rwanda/version.rb

@@ -1,3 +1,3 @@
 class Rwanda
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/spec/rwanda_spec.rb

@@ -7,10 +7,16 @@ describe Rwanda do
   # Singular Ofs
   
   describe '.district_of' do
-    it 'knows the distict of a sector' do
+    it 'knows the distict(s) of a sector' do
+      # Unfortunately, there are multiple sectors with the same name in different districts
+      # so this cannot give a unique response all of the time
+      # e.g. Busasamana in Nyanza and Rubavu
       expect(r.district_of('Jali')).to eq 'Gasabo'
       expect(r.district_of('jAlI')).to eq 'Gasabo'
       
+      # Returns districts in alphabetical order
+      expect(r.district_of('Busasamana')).to eq [ 'Nyanza', 'Rubavu' ].sort
+      
       expect(r.district_of('Foobar')).to eq nil
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rwanda
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Dan Hetherington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler