jp_prefecture 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 151ed52704cd41c8b9fb1a240bd441306ef38133
-  data.tar.gz: 661515a372f6075e08dd954c43eb5ead8cb14ebb
+  metadata.gz: 39053050aa747aa80a7e3375ae5de13f46430390
+  data.tar.gz: 9b833787a8c06c93430a03eedc4705c9736620b4
 SHA512:
-  metadata.gz: 8a9bef0061e91d081adbe2a557e1cd768555ec21970e595ddfe443420aba9ec5877f43ad5c2406800cada9fef99094e1e5d3aa02a0e1a79db2a652e810e8f05d
-  data.tar.gz: 38747b5b15cb93374e0c2508639fa6d43b34b5139d07ce63721a05a6f2c665f7d88f4efe60eef73bf268394fd25c8130ae82ad53c67d3477ff5f024180713782
+  metadata.gz: 689fb7be7b194e1706f7448324c3b3f4d3c9633c659475eee51a8b45e7c8ce5e1e74ef3aa9687eb791de059bc78f18261805b34f63e4afba11bae42a5d921290
+  data.tar.gz: c7e225554165eca1fccc483a6f881fccc40e4f969ca9b576f6f2a776b2b3b6c23e53c17aa12647bc44d17ff702b43ce243855651b363088bd9596c0e2dc2dc04

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1

data/CHANGELOG.md

@@ -1,10 +1,15 @@
+## 0.6.0 (Mar 10, 2014)
+
+* 都道府県名を前方一致で検索できるようにした (PR [#11](https://github.com/chocoby/jp_prefecture/pull/11)/[@yuuna](https://github.com/yuuna))
+* 都道府県名の検索ロジックを高速化
+
 ## 0.5.0 (Nov 30, 2013)
 
-* 郵便番号から都道府県を検索する機能の追加 (PR #9/@fruwe)
+* 郵便番号から都道府県を検索する機能の追加 (PR [#9](https://github.com/chocoby/jp_prefecture/pull/9)/[@fruwe](https://github.com/fruwe))
 
 ## 0.4.0 (Jul 08, 2013)
 
-* 都道府県のマッピングを変更する機能の追加 (PR #8/@mizoR)
+* 都道府県のマッピングを変更する機能の追加 (PR [#8](https://github.com/chocoby/jp_prefecture/pull/8)/[@mizoR](https://github.com/mizoR))
 
 ## 0.3.2 (Jun 12, 2013)
 

data/README.md

@@ -81,6 +81,9 @@ JpPrefecture::Prefecture.find name: "Tokyo"
 
 JpPrefecture::Prefecture.find name: "tokyo"
 # => #<JpPrefecture::Prefecture:0x007f965c0c5a40 @code=13, @name="東京都", @name_e="Tokyo">
+
+JpPrefecture::Prefecture.find name: "東京"
+# => #<JpPrefecture::Prefecture:0x007fe8b2b6f678 @code=13, @name="東京都", @name_e="Tokyo">
 ```
 
 ### 都道府県の一覧を取得
@@ -176,7 +179,7 @@ GitHub の [Issues](https://github.com/chocoby/jp_prefecture/issues) を参照
 
 ## 対象バージョン
 
-* Ruby: 1.9.3 / 2.0.0
+* Ruby: 1.9.3 / 2.0 / 2.1
 * Rails: 3.2.x / 4.0.x
 
 ## Contributing

data/Rakefile

@@ -1,4 +1,5 @@
 #!/usr/bin/env rake
+# coding: utf-8
 require "bundler/gem_tasks"
 
 task :default => [:spec]
@@ -11,6 +12,7 @@ begin
 rescue LoadError => e
 end
 
+desc 'zip.yml を作成します'
 task :create_zips do
   require 'csv'
   require 'jp_prefecture'
@@ -27,10 +29,12 @@ task :create_zips do
   zips = []
 
   # read CSV
-  CSV.foreach(file_name, headers: false){|line| zips << [line[2],line[6]]}
+  CSV.foreach(file_name, headers: false) { |line| zips << [line[2], line[6]] }
 
   # create sorted list of zips -> prefecture_code
-  zips = zips.collect{|zip, prefecture|[zip.to_i, JpPrefecture::Prefecture.find(name: prefecture).code]}.sort{|x,y| x[0]<=>y[0] }
+  zips = zips
+    .collect { |zip, prefecture| [zip.to_i, JpPrefecture::Prefecture.find(name: prefecture).code] }
+    .sort{ |x, y| x[0] <=> y[0] }
 
   # prepare calculation
   ranged_zips = []
@@ -54,7 +58,7 @@ task :create_zips do
 
   ranged_zips.each do |r0, r1, code|
     prefectures_to_zip[code] ||= []
-    prefectures_to_zip[code] << [r0,r1]
+    prefectures_to_zip[code] << [r0, r1]
   end
 
   prefectures_to_zip = Hash[*prefectures_to_zip.sort.flatten(1)]
@@ -67,4 +71,4 @@ task :create_zips do
 
   # delete temporary file
   `rm #{file_name}`
-end
+end

data/data/zip.yml

@@ -131,8 +131,6 @@
 - - 5200461
   - 5200465
 - - 6000000
-  - 6170857
-- - 6180000
   - 6180000
 - - 6180071
   - 6293579
@@ -142,8 +140,6 @@
 - - 5640000
   - 5998276
 - - 6180000
-  - 6180000
-- - 6180001
   - 6180024
 - - 6300271
   - 6300272

data/lib/jp_prefecture/prefecture.rb

@@ -19,14 +19,14 @@ module JpPrefecture
     # @param name_e [String] 都道府県名(英語表記)
     # @param zips [Array] 郵便番号の配列 (array of ranges, can be used in ARel, e.g. User.where(zip: prefecture.zips))
     def self.build(code, name, name_e)
-      p = self.new
+      pref = self.new
 
-      p.code    = code
-      p.name    = name
-      p.name_e  = name_e.capitalize
-      p.zips    = ZipMapping.data[code]
+      pref.code    = code
+      pref.name    = name
+      pref.name_e  = name_e.capitalize
+      pref.zips    = ZipMapping.data[code]
 
-      p
+      pref
     end
 
     # 都道府県を検索
@@ -39,6 +39,9 @@ module JpPrefecture
     #   # 都道府県名から検索
     #   JpPrefecture::Prefecture.find(name: '北海道')
     #
+    #   # 都道府県名から検索(先頭一致)
+    #   JpPrefecture::Prefecture.find(name: '東京')
+    #
     #   # 英語表記の都道府県名から検索
     #   JpPrefecture::Prefecture.find(name: 'Hokkaido')
     #   JpPrefecture::Prefecture.find(name: 'hokkaido')
@@ -96,15 +99,23 @@ module JpPrefecture
 
   protected
 
-    # 名前から都道府県コードを検索
+    # 名前から都道府県コードを先頭一致で検索
+    #
+    # @param name [String] 検索する都道府県名
+    # @return [Integer] 見つかった場合は都道府県コード
+    # @return [nil] 見つからない場合は nil
     def self.find_code_by_name(name)
-      result = Mapping.data.select { |_, v|
-        v.has_value?(name.downcase)
-      }.first
+      name = name.downcase
 
-      return if result.nil?
+      Mapping.data.each do |m|
+        m[1].values.each do |v|
+          if v.start_with?(name)
+            return m[0]
+          end
+        end
+      end
 
-      result[0]
+      nil
     end
 
   end

data/lib/jp_prefecture/version.rb

@@ -1,3 +1,3 @@
 module JpPrefecture
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/jp_prefecture/zip_mapping.rb

@@ -2,7 +2,7 @@
 require 'yaml'
 
 module JpPrefecture
-  # コードと都道府県のマッピング
+  # コードと郵便番号のマッピング
   module ZipMapping
 
     filepath = File.join(File.dirname(__FILE__), '../../data/zip.yml')

data/spec/prefecture_spec.rb

@@ -55,6 +55,27 @@ describe JpPrefecture::Prefecture do
         it_behaves_like "都道府県が見つかる", name: "hokkaido"
         it_behaves_like "都道府県が見つからない", name: "udon"
       end
+
+      describe '都道府県名(先頭一致)' do
+        let(:pref) { JpPrefecture::Prefecture.find(name: '東京') }
+        it { expect(pref.name).to eq '東京都' }
+
+        let(:pref2) { JpPrefecture::Prefecture.find(name: '京都') }
+        it { expect(pref2.name).to eq '京都府' }
+
+        context 'マッチする都道府県が複数あった場合' do
+          let(:pref) { JpPrefecture::Prefecture.find(name: '宮') }
+          it { expect(pref.name).to eq '宮城県' }
+        end
+
+        context 'マッチする都道府県が複数あった場合(英語表記)' do
+          let(:pref) { JpPrefecture::Prefecture.find(name: 'miya') }
+          it { expect(pref.name_e).to eq 'Miyagi' }
+
+          let(:pref2) { JpPrefecture::Prefecture.find(name: 'Miya') }
+          it { expect(pref2.name_e).to eq 'Miyagi' }
+        end
+      end
     end
 
     describe '渡した変数について' do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: jp_prefecture
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - chocoby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Convert japan prefecture code(JIS X 0402 based) into prefecture name.
@@ -73,10 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Convert japan prefecture code into prefecture name