From 5e4a987e5c97da664aa807a9b9c3b77ef701e01c Mon Sep 17 00:00:00 2001 From: k-motoyan Date: Wed, 30 Mar 2016 12:29:08 +0900 Subject: [PATCH 1/3] Added spec for prefecture find given empty value and nil case. --- spec/prefecture_spec.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spec/prefecture_spec.rb b/spec/prefecture_spec.rb index a2b7fc0..2f361eb 100644 --- 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 From 535b271fcb9ca74fe7b8e6896f79a7b113f9f05b Mon Sep 17 00:00:00 2001 From: k-motoyan Date: Wed, 30 Mar 2016 12:38:20 +0900 Subject: [PATCH 2/3] Appdend gurd to JpPrefecture::Prefecture.find_code_by_name. --- lib/jp_prefecture/prefecture.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/jp_prefecture/prefecture.rb b/lib/jp_prefecture/prefecture.rb index de7213d..aef9fb2 100644 --- a/lib/jp_prefecture/prefecture.rb +++ b/lib/jp_prefecture/prefecture.rb @@ -115,6 +115,9 @@ def self.all # @return [Integer] 見つかった場合は都道府県コード # @return [nil] 見つからない場合は nil def self.find_code_by_name(name) + # nameがnil、空文字の場合は見つからないと判断してnilを返す。 + return nil if name.nil? || name.empty? + name = name.downcase Mapping.data.each do |m| From 38db914bec5feb7f324326d0ab469f98b1d6550d Mon Sep 17 00:00:00 2001 From: k-motoyan Date: Wed, 30 Mar 2016 13:56:44 +0900 Subject: [PATCH 3/3] Removed comment: description for empty value and nil. --- lib/jp_prefecture/prefecture.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/jp_prefecture/prefecture.rb b/lib/jp_prefecture/prefecture.rb index aef9fb2..0152169 100644 --- a/lib/jp_prefecture/prefecture.rb +++ b/lib/jp_prefecture/prefecture.rb @@ -115,7 +115,6 @@ def self.all # @return [Integer] 見つかった場合は都道府県コード # @return [nil] 見つからない場合は nil def self.find_code_by_name(name) - # nameがnil、空文字の場合は見つからないと判断してnilを返す。 return nil if name.nil? || name.empty? name = name.downcase