rwanda 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7935155fa37e92a3cc84b95cfaf5f93459fae59
-  data.tar.gz: 2d48de8bcdc1cdb1cd01c2ef39c5a15cf8d80e47
+  metadata.gz: de04553007e96f17ba5c64c47121ec6f1ba9f70d
+  data.tar.gz: 10bff714e5cd301c7321add3af0f28e34097f713
 SHA512:
-  metadata.gz: 5eb13f9ecb7c632554936fe85200e82fd9148e19c5b6515dc88a5d99bbb4979b50321a5ae27034d4b51dac3c22262b2a5315c911411e602df46ef703c0ffc327
-  data.tar.gz: 102598987dfa3b05c9b2c24374e23e75a9bc4a336c0aba9665b2f497c76bd5bb6158f006717e35a38d27fb3f6626f3104878d299a9c6dc88ac434c160f5ce161
+  metadata.gz: e6eb6509e493a026f1b98b978ea599eafd2440d2b7b1d76b861f244468a7e33e55d13643ddce21d3a7b04af86771c40547ee2589e69d52d248e432e3b9bc3db8
+  data.tar.gz: 97fee3c176396e3ec7fcf3a3f7de1b85012c3ad634cac34ce7354d18ffc18bb8d50a36e381d6cfa65513e1bb4d401f855954d391b7e7a3d56f1ecb5a0a661a09

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.0
+
+ * Add .valid? because the Rails interface needs to accept an empty location as being "like" an .exist?ing one
+
 ## 0.6.0
 
  * Addition of Location class (moved out of rails app)

data/README.md

@@ -24,6 +24,10 @@ Then you can try it on the command line:
     > gem 'rwanda'
     > require 'rwanda'
 
+## Status
+
+[![Gem Version](https://badge.fury.io/rb/rwanda.svg)](http://badge.fury.io/rb/rwanda)
+
 ## Usage
 
 ```ruby

data/lib/rwanda/version.rb

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

data/lib/rwanda.rb

@@ -113,7 +113,7 @@ class Rwanda
   end
   def exist?(district=false, sector=false, cell=false, village=false)
     villages = @villages.dup
-    return nil unless district
+    return false unless district
     {district: district, sector: sector, cell: cell, village: village}.each_pair do |division_name,division|
       #binding.pry
       return true unless division
@@ -123,6 +123,11 @@ class Rwanda
     true    
   end
   def exists?(*p); exist?(*p); end
+  def valid?(*p)
+    # Is this location either (a) real, or (b) nil (both of which are valid if an object's address can be null)
+    return true if p.reject{|i| i.nil?}.empty? # all nils is fine
+    exist? *p
+  end
   
   # )) Translation ((
   def translate(province)

data/rwanda.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 1.9.3'
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

data/spec/rwanda_spec.rb

@@ -138,6 +138,7 @@ describe Rwanda do
 
       expect(r.exist?('karongi','bwishyura','kiniha','nyarurembo')).to eq true
       expect(r.exist?('karongi','bwishyura','nyarurembo')).to eq false
+      expect(r.exist?(nil,nil,'',nil)).to eq false
       expect(r.exist?('karongi')).to eq true
 
       # .exists? is an acceptable synonym
@@ -146,6 +147,16 @@ describe Rwanda do
     end
   end
   
+  describe '.valid?' do
+    it 'knows whether a chain of divisions is valid, which an empty set is' do
+      expect(r.valid?('Karongi','Bwishyura','Kiniha','Nyarurembo')).to eq true
+      expect(r.valid?(nil,nil,nil)).to eq true
+      
+      expect(r.valid?('Karongi','Bwishyura','Nyarurembo')).to eq false
+      expect(r.valid?(nil,nil,'',nil)).to eq false
+    end
+  end
+  
   describe '.translate' do
     it 'can translate a province from English to Kinyarwanda' do
       expect(r.translate('Northern Province')).to eq 'Amajyaruguru'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwanda
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Dan Hetherington
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="