rwanda 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8fcd2d987c04671d739e62c9e910669046860b9
-  data.tar.gz: 89fb5f38046645dbc3197dd67024a24a4cf151d8
+  metadata.gz: 9eb49bda9660b07247da012084427c95db096c59
+  data.tar.gz: ced4996fa49ade4d65d45c2ca2c683aa0bef0122
 SHA512:
-  metadata.gz: 557b747e34beed787334854a043d9996afb91fa641807fafc3c7da04927fb88d3f717dadc31b8cf5cc8d2cd214212c0edc64cd9318837803130a9df06e47d6ae
-  data.tar.gz: b8ee160322159c11117afdcabd5bf248f3b619d5c37f0982ae9670847d9285d40fabc7f92a9ff2490020faa0c0a26543bfca03d3c3341e9434dd7c95ec3111cf
+  metadata.gz: 3a6f6fae7b405baa87d56a8f1d23c5c152264033f32c9e9be0cb59ef3c1e98e4a66b57d90fd070d736f764eda9234ef610e3e6806e2d2074cbda4234cbb54187
+  data.tar.gz: 1ae1caed1a6ed98f1ae502cd3ed727ceb3b05f2b2397b0334ffcf51a2181f4a97781d3d7d3d7574c98a98f0dc988473f4cf107620e0bd4e83f3b653e5bfbcea9

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.0
   - 2.2.1
   - ruby-head
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.1
+
+ * Make pry a runtime dependency
+
 ## 0.8.0
 
  * Fix .district_of when sector belongs to multiple districts (#2)

data/lib/rwanda.rb

@@ -67,6 +67,7 @@ class Rwanda
   end
   def villages_of(district, sector, cell)
     @villages.select {|v| v.district.downcase == district.downcase and v.sector.downcase == sector.downcase and v.cell.downcase == cell.downcase}.collect {|v| v.village}
+    #@villages.select {|v| v.to_h(:district, :sector, :cell).to_a.sort == { district: district, sector: sector, cell: cell }.to_a.collect{|v| [v[0],v[1].downcase] }.collect {|v| v.village}
   end
   def subdivisions_of(arr)
     case arr.length
@@ -87,8 +88,8 @@ class Rwanda
   #  @villages
   #end
   # )) Lists ((
-  def provinces; @villages.collect{|v| v.province}.uniq; end
-  def districts; @villages.collect{|v| v.district}.uniq; end
+  def provinces; @villages.collect{|v| v.province}.uniq.sort; end
+  def districts; @villages.collect{|v| v.district}.uniq.sort; end
   # already introduces ambiguity from sectors down: 37 districts are duplicate names
   def sectors
     @sectors ||= @villages.collect {|v| [v.district, v.sector] }.uniq.collect {|ds| ds[1]}.sort
@@ -111,7 +112,6 @@ class Rwanda
   end
   
   # )) Testing ((
-  #def is_province?(province); @villages.any? {|v| v.province == province}; end
   # is_division?
   DIVISIONS.each do |division|
     define_method("is_#{division}?") do |argument|
@@ -143,36 +143,42 @@ class Rwanda
     eng = RW.find { |eng,kin| kin.downcase == province.downcase }
     return eng[0] if eng
     nil
-    #if RW.has_key? province
-    #  RW[province]
-    #elsif RW.has_value? province
-    #  RW.key province
-    #else
-    #  nil
-    #end
+  end
+  
+  # )) To help with testing ((
+  def first
+    @villages.first
   end
   
   # )) Where is...? ((
   def where_is?(division)
-    matching = { province: [], district: [], sector: [], cell: [], village: [] }
+    #matching = { province: [], district: [], sector: [], cell: [], village: [] }
     lines = []
     @villages.each do |village|
       matches = village.match(division)
       unless matches.empty?
         matches.each do |div|
-          matching[div].push village
-          # convert villages into lines
-          new_line = "  #{village.send(div)} is a #{div}#{' in' unless div==:province}"
-          unless div == :province
-            (0...Rwanda::DIVISIONS.index(div)).to_a.reverse.each do |n|
-              new_line << " #{village[n]}#{' '+Rwanda::DIVISIONS[n].to_s.capitalize+',' unless n==0}"
-            end
-          end
-          lines << new_line
+          #matching[div].push village
+          # convert each match into a line
+          lines << create_line(village, div)
         end
       end
     end
     lines.uniq!
+    print_result(lines, division)
+  end
+  
+  private
+  def create_line(village, div)
+    new_line = "  #{village.send(div)} is a #{div}#{' in' unless div==:province}"
+    unless div == :province
+      (0...Rwanda::DIVISIONS.index(div)).to_a.reverse.each do |n|
+        new_line << " #{village[n]}#{' '+Rwanda::DIVISIONS[n].to_s.capitalize+',' unless n==0}"
+      end
+    end
+    new_line
+  end
+  def print_result(lines, division)
     output = ''
     
     # summary line

data/lib/rwanda/version.rb

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

data/lib/rwanda/village.rb

@@ -20,4 +20,12 @@ class Village
     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
+  def to_h(*options)
+    options = [:province, :district, :sector, :cell, :village] if options.empty?
+    # this use of Array#to_h is only available from 2.1.0 onwards
+    options.collect {|l| [ l, instance_variable_get("@#{l}") ] }.to_h
+  end
+  def ==(other)
+    to_h == other.to_h
+  end
 end

data/rwanda.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.1.0'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry", "~> 0.10.1"
   spec.add_development_dependency "coveralls"
   
-  spec.add_runtime_dependency "fuzzy_match", "~> 2.1.0"
+  spec.add_runtime_dependency "fuzzy_match", "~> 2.1"
+  spec.add_runtime_dependency "pry", ">= 0.10.1"
 end

data/spec/rwanda_spec.rb

@@ -34,8 +34,8 @@ describe Rwanda do
   
   describe '.districts_of' do
     it 'knows all the districts of each province' do
-      expect(r.districts_of('Kigali City').sort).to eq ["Gasabo", "Kicukiro", "Nyarugenge"].sort
-      expect(r.districts_of('kigali city').sort).to eq ["Gasabo", "Kicukiro", "Nyarugenge"].sort
+      expect(r.districts_of('Kigali City')).to eq ["Gasabo", "Kicukiro", "Nyarugenge"].sort
+      expect(r.districts_of('kigali city')).to eq ["Gasabo", "Kicukiro", "Nyarugenge"].sort
       expect(r.districts_of('Foobar')).to eq nil
     end
   end
@@ -66,9 +66,10 @@ describe Rwanda do
   end
   
   describe '.subdivisions_of' do
-    it 'knows the sub-divisions of a district, sector or cell' do
+    it 'knows the sub-divisions of Rwanda, or a district, sector or cell' do
       expect(r.subdivisions_of(['Ruhango', 'Ruhango', 'Gikoma'])).to eq ['Gatengeri', 'Gikumba', 'Karama', 'Murambi', 'Nangurugomo', 'Nyarusange', 'Rebero', 'Rubiha', 'Rurembo', 'Ryabonyinka', 'Wimana']
-      expect(r.subdivisions_of(['RuhANgo', 'RUHANGO', 'GIKOMA'])).to eq ['Gatengeri', 'Gikumba', 'Karama', 'Murambi', 'Nangurugomo', 'Nyarusange', 'Rebero', 'Rubiha', 'Rurembo', 'Ryabonyinka', 'Wimana']    
+      expect(r.subdivisions_of(['RuhANgo', 'RUHANGO', 'GIKOMA'])).to eq ['Gatengeri', 'Gikumba', 'Karama', 'Murambi', 'Nangurugomo', 'Nyarusange', 'Rebero', 'Rubiha', 'Rurembo', 'Ryabonyinka', 'Wimana']
+      expect(r.subdivisions_of([])).to eq r.districts.sort
     end
   end
   
@@ -189,5 +190,13 @@ describe Rwanda do
       r.where_is? 'Foobar'
     end
   end
+  
+  describe '#first' do
+    it 'can provide the first village in the list' do
+      row = {'province' => "Eastern Province", 'district' => "Bugesera", 'sector' => "Gashora", 'cell' => "Biryogo", 'village' => "Bidudu"}
+      v = Village.new(row)
+      expect(r.first).to eq v
+    end
+  end
 end  
   

data/spec/village_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Village do
+  r = Rwanda.instance
+  v = r.first
+  v_full_hash = {:province => "Eastern Province", :district => "Bugesera", :sector => "Gashora", :cell => "Biryogo", :village => "Bidudu"}
+  v_limited_hash = {:district => "Bugesera", :sector => "Gashora", :cell => "Biryogo"}
+
+  describe '#to_h' do
+    it 'can convert the contents of village to a customised hash' do
+      expect(v.to_h).to eq v_full_hash
+      expect(v.to_h(:district, :sector, :cell)).to eq v_limited_hash
+    end
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rwanda
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Dan Hetherington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-16 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'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !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
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: 
 email:
 - dan.hetherington@gmail.com
@@ -119,6 +119,7 @@ files:
 - spec/rwanda_spec.rb
 - spec/sectors_data.rb
 - spec/spec_helper.rb
+- spec/village_spec.rb
 - tasks/rspec.rake
 homepage: http://www.minicom.gov.rw/
 licenses:
@@ -132,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -149,3 +150,4 @@ test_files:
 - spec/rwanda_spec.rb
 - spec/sectors_data.rb
 - spec/spec_helper.rb
+- spec/village_spec.rb