Merge pull request #19 from k-motoyan/issue_18

JpPrefecture::Prefecture.find(name: xxx)の挙動を修正
chocoby · Mar 30, 2016 · 31c506a · 31c506a
2 parents 84ba9dd + 38db914
commit 31c506a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lib/jp_prefecture/prefecture.rb b/lib/jp_prefecture/prefecture.rb
@@ -115,6 +115,8 @@ def self.all
     # @return [Integer] 見つかった場合は都道府県コード
     # @return [nil] 見つからない場合は nil
     def self.find_code_by_name(name)
+      return nil if name.nil? || name.empty?
+
       name = name.downcase
 
       Mapping.data.each do |m|

diff --git a/spec/prefecture_spec.rb b/spec/prefecture_spec.rb
@@ -127,6 +127,20 @@
           JpPrefecture::Prefecture.find(name: name)
           expect(name).to eq 'hokkaido'
         end
+
+        context '空の文字列が与えられた場合' do
+          it 'nilを返すこと' do
+            actual = JpPrefecture::Prefecture.find(name: '')
+            expect(actual).to be_nil
+          end
+        end
+
+        context 'nilが与えられた場合' do
+          it 'nilを返すこと' do
+            actual = JpPrefecture::Prefecture.find(name: nil)
+            expect(actual).to be_nil
+          end
+        end
       end
 
       context 'zip の場合' do