jp_zip_code 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e290002e137bf4cd02f53d7d2cda45d86924b9c5
-  data.tar.gz: bd03bbebc89e81b7ce2b5a59efe2b7aa8cee414e
+  metadata.gz: 3524bca9cdb88daacd1f053247ee11406cd2f17b
+  data.tar.gz: 443ff9193fb193f70ea0ad3bde73964b0fe06c57
 SHA512:
-  metadata.gz: 784451997f12f43e7074d3dbdadf6402a2add0f5b888b93072ceb6efb113e31b46760c5bff1035b64a4c0665579de012b292865a515864ba68a7ecb18e8687b2
-  data.tar.gz: bfbfd1b7a7984a508e3cae9c3176b0a2c58b1a12c889fa6007ac628178e4d77a6a9e696f20da33ec63641e74bafe940f45c79c914eb33a702cc2040db9e75b3f
+  metadata.gz: 3aeebe5cbf4017997fd2c0f2f9373419ce4516288bc8998d57972c273a35937c8ed4f0ad05d867323d5ed3a7bb23d71c3e51607e1f26942a789151f140b2a39e
+  data.tar.gz: f5eb9d87aecf55f4b14d3088c68fdd7722c7bfe4fb31fcee98861c7e2b6f7ca3b3e683170ea61a229c98161ddca5f7eb532d9ac4e18ed8cfc84e163adbeb4a13

data/lib/jp_zip_code/filer.rb

@@ -0,0 +1,91 @@
+require 'open-uri'
+require 'zip'
+require 'yaml'
+
+module JpZipCode
+  class Filer
+    def initialize(type)
+      @type = type.to_sym
+    end
+
+    def download_url
+      case @type
+      when :jp
+        'http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip'
+      when :roman
+        'http://www.post.japanpost.jp/zipcode/dl/roman/ken_all_rome.zip'
+      end
+    end
+
+    def fetch_data
+      download_file
+      unzip_file_and_get_data
+    end
+
+    def zip_file_name
+      File.basename(download_url)
+    end
+
+    def download_file
+      open(zip_file_name, 'wb') do |file|
+        open(download_url) do |data|
+          file.write(data.read)
+        end
+      end
+    end
+
+    def unzip_file_and_get_data
+      hash = {}
+      unzip(zip_file_name) do |file|
+        get_row(file).each do |row|
+          row_data = to_hash(row.split(',').map(&:strip))
+          hash[row_data[:zip_code]] = row_data
+        end
+      end
+      hash
+    end
+
+    def unzip(file_name)
+      Zip::File.open(file_name) do |csv_files|
+        csv_files.each do |file|
+          yield(file)
+        end
+      end
+    end
+
+    def get_row(file)
+      file.get_input_stream.read.encode('utf-8', 'cp932').delete('"').split("\n")
+    end
+
+    def to_hash(datas)
+      case @type
+      when :jp
+        {
+          code:         datas[0],
+          old_zip_code: datas[1],
+          zip_code:     datas[2],
+          pref_kana:    datas[3],
+          city_kana:    datas[4],
+          town_kana:    datas[5],
+          pref_kanji:   datas[6],
+          city_kanji:   datas[7],
+          town_kanji:   datas[8]
+        }
+      when :roman
+        {
+          zip_code:   datas[0],
+          pref_kanji: datas[1],
+          city_kanji: datas[2],
+          town_kanji: datas[3],
+          pref_roman: datas[4],
+          city_roman: datas[5],
+          town_roman: datas[6]
+        }
+      end
+    end
+
+    def clean
+      File.delete(zip_file_name) if File.exist?(zip_file_name)
+    end
+  end
+end

data/lib/jp_zip_code/updater.rb

@@ -2,8 +2,8 @@ module JpZipCode
   class Updater
     def initialize(dry_run = true)
       @dry_run = dry_run
-      @jp_filer = JpZipCode::Filer::Jp.new
-      @roman_filer = JpZipCode::Filer::Roman.new
+      @jp_filer = JpZipCode::Filer.new(:jp)
+      @roman_filer = JpZipCode::Filer.new(:roman)
     end
 
     def execute

data/lib/jp_zip_code/version.rb

@@ -1,3 +1,3 @@
 module JpZipCode
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/lib/jp_zip_code.rb

@@ -1,8 +1,6 @@
 require 'jp_zip_code/version'
 require 'jp_zip_code/updater'
-require 'jp_zip_code/filer/base'
-require 'jp_zip_code/filer/jp'
-require 'jp_zip_code/filer/roman'
+require 'jp_zip_code/filer'
 require 'json'
 require 'rash'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jp_zip_code
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - kimromi
@@ -1726,9 +1726,7 @@ files:
 - data/zip_code/9998.json
 - jp_zip_code.gemspec
 - lib/jp_zip_code.rb
-- lib/jp_zip_code/filer/base.rb
-- lib/jp_zip_code/filer/jp.rb
-- lib/jp_zip_code/filer/roman.rb
+- lib/jp_zip_code/filer.rb
 - lib/jp_zip_code/updater.rb
 - lib/jp_zip_code/version.rb
 homepage: http://kimromi.hatenablog.jp/

data/lib/jp_zip_code/filer/base.rb

@@ -1,55 +0,0 @@
-require 'open-uri'
-require 'zip'
-require 'yaml'
-
-module JpZipCode
-  module Filer
-    class Base
-      attr_accessor :download_url
-
-      def fetch_data
-        download_file
-        unzip_file_and_get_data
-      end
-
-      def zip_file_name
-        File.basename(download_url)
-      end
-
-      def download_file
-        open(zip_file_name, 'wb') do |file|
-          open(download_url) do |data|
-            file.write(data.read)
-          end
-        end
-      end
-
-      def unzip_file_and_get_data
-        hash = {}
-        unzip(zip_file_name) do |file|
-          get_row(file).each do |row|
-            row_data = to_hash(row)
-            hash[row_data[:zip_code]] = row_data
-          end
-        end
-        hash
-      end
-
-      def unzip(file_name)
-        Zip::File.open(file_name) do |csv_files|
-          csv_files.each do |file|
-            yield(file)
-          end
-        end
-      end
-
-      def get_row(file)
-        file.get_input_stream.read.encode('utf-8', 'cp932').delete('"').split("\n")
-      end
-
-      def clean
-        File.delete(zip_file_name) if File.exist?(zip_file_name)
-      end
-    end
-  end
-end

data/lib/jp_zip_code/filer/jp.rb

@@ -1,29 +0,0 @@
-require 'open-uri'
-require 'zip'
-require 'yaml'
-
-module JpZipCode
-  module Filer
-    class Jp < Base
-      def initialize
-        self.download_url = 'http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip'
-      end
-
-      def to_hash(row)
-        datas = row.split(',').map(&:strip)
-        {
-          code:         datas[0],
-          old_zip_code: datas[1],
-          zip_code:     datas[2],
-          pref_kana:    datas[3],
-          city_kana:    datas[4],
-          town_kana:    datas[5],
-          pref_kanji:   datas[6],
-          city_kanji:   datas[7],
-          town_kanji:   datas[8]
-        }
-      end
-
-    end
-  end
-end

data/lib/jp_zip_code/filer/roman.rb

@@ -1,26 +0,0 @@
-require 'open-uri'
-require 'zip'
-require 'yaml'
-
-module JpZipCode
-  module Filer
-    class Roman < Base
-      def initialize
-        self.download_url = 'http://www.post.japanpost.jp/zipcode/dl/roman/ken_all_rome.zip'
-      end
-
-      def to_hash(row)
-        datas = row.split(',').map(&:strip)
-        {
-          zip_code:   datas[0],
-          pref_kanji: datas[1],
-          city_kanji: datas[2],
-          town_kanji: datas[3],
-          pref_roman: datas[4],
-          city_roman: datas[5],
-          town_roman: datas[6]
-        }
-      end
-    end
-  end
-end