china_regions 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd71beadef1880c9f002ead5302f05619ac90b3b
-  data.tar.gz: e5bbe35869c2e8e91e57999f463e7738a1810055
+SHA256:
+  metadata.gz: 355fcf16235b294a0555cd4e759320ee12486509cef20405672bdaaedbf958bd
+  data.tar.gz: 4fdcee628fb6af5057cb20771a05b5bd2f4ab13b100715473d3d567d917f4504
 SHA512:
-  metadata.gz: 0aa1c5abb2ac0bf8e100dcbb9f2c35edd7a94b6208a4cb595017a6baeafc7f9820a2ef00888890e98934f8897e00d739abbecbe07acdc527ad92aad7b6c057ed
-  data.tar.gz: ad06057a462ce2cda7b8569439d5306352b8a1d07016a6a0aebf071ab1579275b7e3199f8267f1330ee0b90231f29a125d8178cb833783708cb339daf7efb1bf
+  metadata.gz: a433388666d30dcf2177653ade0bd6523e5a50151d2f54b3f06d6d553f4a21df8d9ec63eb066e7bbc64694d772456868f6d5fae937d27cc805130b006f19c37f
+  data.tar.gz: a26988d21b27a1898b6f17ccefd2cadbb5af352cc00205294954f02afa3f01b741f76e9cd10d7fe9dd16e3d7f033fd9e964eeeb1c030c063628eb2ca5d56f267

data/.rubocop.yml

@@ -0,0 +1,88 @@
+# This is the configuration used to check the rubocop source code.
+
+AllCops:
+  DisplayCopNames: true
+  TargetRubyVersion: 2.5.1
+  Exclude:
+    - '**/*.yml'
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'doc/**/*'
+    - 'deployment/**/*'
+    - 'bin/**/*'
+    - 'tmp/**/*'
+    - 'lib/china_regions/helpers/form_helper.rb'
+
+Style/StringLiterals:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+Style/FormatString:
+  Enabled: false
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Style/NumericLiterals:
+  Exclude:
+    - 'spec/**/*'
+
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+  IndentOneStep: false
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Lint/UselessAssignment:
+  Enabled: false
+
+Style/NumericLiterals:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 56
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/ModuleLength:
+  Max: 156
+
+Metrics/PerceivedComplexity:
+  Max: 15
+
+Metrics/LineLength:
+  Max: 160
+
+Metrics/MethodLength:
+  Max: 24
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Max: 10
+
+Metrics/BlockLength:
+  Max: 100
+
+Security/MarshalLoad:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in china_regions.gemspec

data/README.md

@@ -1,53 +1,62 @@
 # ChinaRegions
 
-中国省份，城市，地区［地级市］
-Ruby on Rails 程式代码, Ruby ( > 1.9.x ) And Rails (> 4.0)
+中国省份，城市，地区［地级市］Ruby on Rails 程式代码, Ruby (> 1.9.x) And Rails (> 4.0)
 
-## How to update
+## 如何更新数据文件
 
 If you are using ChinaRegions version 0.1.x be sure to run:
 
-    rails g china_regions:regions
+    >> rails g china_regions:regions
 
 to have the javascript file copied over into your project.
 
-## How to use it
+## 如何引入china_regions到你的项目
 
 添加以下代码到你的 Gemfile:
 
-gem 'china_regions'
+    gem 'china_regions'
 
 OR
 
-gem 'china_regions',  github: 'encoreshao/china_regions'
+    gem 'china_regions',  github: 'encoreshao/china_regions'
 
-bundle install
+安装:
 
-执行:
+    >> bundle install
 
-    rails g china_regions:install
+### 开始构建城市数据
+
+复制所需文件到你的项目中:
+
+    >> rails g china_regions:install
 
    随后你可以看到控制台发生的变化:
    * 复制 db/migrate/xxxxxxxxxxx_create_china_regions_tables.rb 文件到db/migrate 目录
    * 复制 数据源 cities.yml 到 config 目录.  config/cities.yml
    * 复制 regions.en.yml 和 regions.zh.yml 文件到 config/locales 目录
-   * 执行 `rake db:migrate` 创建所需的表 (provinces, cities, districts).
-   * 执行 `rake china_regions:import` 导入数据.
+
+创建所需的表 (provinces, cities, districts):
+
+    >> rake db:migrate
+
+导入数据到对应表中:
+
+    >> rake china_regions:import
 
 
-此时 你可能需要添加三个 models[`Province`, `City`, `District`] 到你应用中:
+将所需的模型(Models) [`Province`, `City`, `District`] 到您的应用程式中:
 
     你可以执行 `rails g` 查看到 generator LIST.
 
-    执行 rails g china_regions:regions
+     >> rails g china_regions:regions
 
-   查看 app/models:
+查看 app/models:
 
     create  app/models/province.rb
     create  app/models/city.rb
     create  app/models/district.rb
 
-## How to view
+## 如何在View中使用
 
 范例:
 
@@ -76,7 +85,7 @@ bundle install
       = f.region_select [:province, :city, :district], :prefix => "work"
 
 
-Preselect Province:
+预选则省份:
 
     = form_for @article do |f|
 
@@ -86,7 +95,7 @@ Preselect Province:
 
       = f.region_select [:province, :city, :district], province: "重庆市"
 
-Prioritize Choice:
+优先选择:
 
     = form_for @article do |f|
 

data/Rakefile

@@ -1,2 +1,4 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'

data/app/controllers/china_regions/fetch_options_controller.rb

@@ -1,31 +1,31 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module ChinaRegions
   class FetchOptionsController < ::ActionController::Metal
-
     def index
-      if params_valid?(params) and parent_klass = params[:parent_klass].classify.safe_constantize.find(params[:parent_id])
+      if params_valid?(params) && (parent_klass = params[:parent_klass].classify.safe_constantize.find(params[:parent_id]))
         table_name = params[:klass].tableize
         regions = parent_klass.__send__(table_name).select("#{table_name}.id, #{table_name}.name")
-        if has_level_column?(params[:klass])
-          regions = regions.order('level ASC')
+        regions = if level_column?(params[:klass])
+          regions.order('level ASC')
         else
-          regions = regions.order('name ASC')
+          regions.order('name ASC')
         end
-        self.response_body = regions.to_json
       else
-        self.response_body = [].to_json
+        regions = []
       end
+
+      self.response_body = regions.to_json
     end
 
     protected
-    def has_level_column?(klass_name)
+
+    def level_column?(klass_name)
       klass_name.classify.safe_constantize.try(:column_names).to_a.include?('level')
     end
 
     def params_valid?(params)
-      params[:klass].present? and params[:parent_klass] =~ /^province|city$/i and params[:parent_id].present?
+      params[:klass].present? && params[:parent_klass] =~ /^province|city$/i && params[:parent_id].present?
     end
-
   end
 end

data/app/models/city.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class City < ActiveRecord::Base
-
   belongs_to :province
   has_many :districts, dependent: :destroy
 
@@ -12,7 +11,6 @@ class City < ActiveRecord::Base
   end
 
   def siblings
-    @siblings ||= where(nil).with_province(self.province_id)
+    @siblings ||= where(nil).with_province(province_id)
   end
-
 end

data/app/models/district.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class District < ActiveRecord::Base
-
   belongs_to :city
 
   scope :with_city, ->(city) { where(city_id: city) }
@@ -15,7 +14,6 @@ class District < ActiveRecord::Base
   end
 
   def siblings
-    @siblings ||= where(nil).with_city(self.city_id)
+    @siblings ||= where(nil).with_city(city_id)
   end
-
 end

data/app/models/province.rb

@@ -1,8 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class Province < ActiveRecord::Base
-
   has_many :cities, dependent: :destroy
   has_many :districts, through: :cities
-
 end

data/china_regions.gemspec

@@ -1,19 +1,23 @@
-# encoding: utf-8
-require File.expand_path('../lib/china_regions/version', __FILE__)
+
+# frozen_string_literal: true
+
+require File.expand_path('lib/china_regions/version', __dir__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Encore Shao", "Trey Springer"]
-  gem.email         = ["encore.shao@gmail.com", "dspringer@enova.com"]
-  gem.description   = %q{ China regions Ruby on rails interface }
-  gem.summary       = %q{ Rails 4 version of dropdowns for all provinces, cities, and districts in China. }
-  gem.homepage      = "http://github.com/encoreshao"
+  gem.authors       = ['Encore Shao']
+  gem.email         = ['encore.shao@gmail.com']
+  gem.description   = 'China regions Ruby on rails interface'
+  gem.summary       = 'Rails 4 version of dropdowns for all provinces, cities,
+                       and districts in China.'
+  gem.homepage      = 'http://github.com/encoreshao'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "china_regions"
-  gem.require_paths = ["lib"]
+  gem.name          = 'china_regions'
+  gem.require_paths = ['lib']
   gem.version       = ChinaRegions::VERSION
 
   gem.add_dependency 'jquery-rails'
+  gem.add_development_dependency 'rubocop'
 end

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   match '/china_regions/fetch_options' => ChinaRegions::FetchOptionsController.action(:index), via: [:get]
 end

data/lib/china_regions/engine.rb

@@ -1,7 +1,9 @@
-require "rails"
+# frozen_string_literal: true
+
+require 'rails'
 
 module ChinaRegions
-  if ::Rails.version > "3.1"
+  if ::Rails.version > '3.1'
     class Engine < ::Rails::Engine; end
   else
     class Railtie < ::Rails::Railtie

data/lib/china_regions/helpers/form_helper.rb

@@ -1,22 +1,24 @@
-# encoding: utf-8
+
+# frozen_string_literal: true
+
 module ChinaRegions
   module Helpers
     module FormHelper
       def region_select(object_name, methods, options = {}, html_options = {})
         output = ''
 
-        preselected_choices = set_regions_options(options)
+        preselected_choices = setup_regions_options(options)
 
         html_options[:class] ?
-          (html_options[:class].prepend('region_select ')) :
+          html_options[:class].prepend('region_select ') :
             (html_options[:class] = 'region_select')
 
-        dropdown_prefix = options[:prefix] ? options[:prefix].to_s + "_" : ""
+        dropdown_prefix = options[:prefix] ? options[:prefix].to_s + '_' : ''
 
-        if Array === methods
+        if Array == methods
           methods.each_with_index do |method, index|
             if region_klass = method.to_s.classify.safe_constantize
-              choices = get_choices(region_klass, method, preselected_choices, index)
+              choices = fetch_choices(region_klass, method, preselected_choices, index)
               choices = prioritize_choices(options[:priority][method], choices) if options[:priority].try(:[], method)
 
               next_method = methods.at(index + 1)
@@ -28,28 +30,26 @@ module ChinaRegions
                 options[:selected] = options[:default][method] if options[:default][method]
               end
 
-              output << select(object_name, "#{dropdown_prefix}#{method.to_s}_id", choices, options, html_options)
+              output << select(object_name, "#{dropdown_prefix}#{method}_id", choices, options, html_options)
             else
               raise "Method '#{method}' is not a vaild attribute of #{object_name}"
             end
           end
         else
-          _methods = unless methods.to_s.include?('_id')
-            (methods.to_s + ('_id')).to_sym
-          else
-            _methods = methods
+          inner_methods = if methods.to_s.include?('_id')
+            inner_methods = methods
             methods = methods.to_s.gsub(/(_id)$/, '')
-            _methods
+            inner_methods
+          else
+            (methods.to_s + '_id').to_sym
           end
 
           if region_klass = methods.to_s.classify.safe_constantize
             options[:prompt] = region_prompt(region_klass)
 
-            if methods == :province && preselected_choices[:province_id]
-              options[:selected] = preselected_choices[:province_id]
-            end
+            options[:selected] = preselected_choices[:province_id] if methods == :province && preselected_choices[:province_id]
 
-            output << select(object_name, _methods, region_klass.where(nil).collect {|p| [ p.name, p.id ] }, options = options, html_options = html_options)
+            output << select(object_name, inner_methods, region_klass.where(nil).collect { |p| [p.name, p.id] }, options = options, html_options = html_options)
           else
             raise "Method '#{method}' is not a vaild attribute of #{object_name}"
           end
@@ -58,15 +58,11 @@ module ChinaRegions
       end
 
       private
-
-      def get_choices(region_klass, method, preselected_choices, index)
+      def fetch_choices(region_klass, method, preselected_choices, index)
         return preselected_choices[method] if preselected_choices[method]
+        return [] unless index.zero?
 
-        if index == 0
-          region_klass.where(nil).collect { |p| [p.name, p.id] }
-        else
-          []
-        end
+        region_klass.where(nil).collect { |p| [p.name, p.id] }
       end
 
       def prioritize_choices(priorities, choices)
@@ -90,27 +86,26 @@ module ChinaRegions
         priority_choices.compact + temp_choices
       end
 
-      def set_regions_options(options)
+      def setup_regions_options(options)
         return {} unless options[:default] && options[:default][:province]
 
-        #TODO: Add validator to check if the passed province, city or district exists within the models
-
+        # TODO: Add validator to check if the passed province, city or district exists within the models
         province_id = get_province_id(options[:default][:province])
         cities = City.where(province_id: province_id)
         districts = District.where(city_id: cities)
 
         {
           province_id: province_id,
-          city:        cities.collect { |c| [ c.name, c.id ] },
-          district:    districts.collect { |d| [ d.name, d.id ] }
+          city:        cities.collect { |c| [c.name, c.id] },
+          district:    districts.collect { |d| [d.name, d.id] }
         }
       end
 
       def set_prompt(method, options, region_klass)
-        if respond_to?("#{method}_select_prompt")
-          options[:prompt] = __send__("#{method}_select_prompt")
+        options[:prompt] = if respond_to?("#{method}_select_prompt")
+          __send__("#{method}_select_prompt")
         else
-          options[:prompt] = region_prompt(region_klass)
+          region_prompt(region_klass)
         end
       end
 
@@ -120,11 +115,11 @@ module ChinaRegions
       end
 
       def set_html_options(object_name, method, html_options, next_region, prefix)
-        html_options[:data] ? (html_options[:data][:region_klass] = "#{method.to_s}") : (html_options[:data] = { region_klass: "#{method.to_s}" })
+        html_options[:data] ? (html_options[:data][:region_klass] = method.to_s) : (html_options[:data] = { region_klass: method.to_s })
         if next_region
-          object_name = object_name.dup.gsub(/\[/, '_')
-          object_name = object_name.dup.gsub(/\]/, '')
-          html_options[:data].merge!(region_target: "#{object_name}_#{prefix}#{next_region.to_s}_id", region_target_klass: next_region.to_s)
+          object_name = object_name.dup.tr('[', '_')
+          object_name = object_name.dup.delete(']')
+          html_options[:data].merge!(region_target: "#{object_name}_#{prefix}#{next_region}_id", region_target_klass: next_region.to_s)
         else
           html_options[:data].delete(:region_target)
           html_options[:data].delete(:region_target_klass)
@@ -141,7 +136,6 @@ module ChinaRegions
         @template.region_select(@object_name.to_s, methods, options = options, html_options = html_options)
       end
     end
-
   end
 end
 

data/lib/china_regions/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChinaRegions
-  VERSION = "0.4.3"
+  VERSION = '0.4.4'
 end

data/lib/china_regions.rb

@@ -1,5 +1,7 @@
-require "china_regions/version"
+# frozen_string_literal: true
+
+require 'china_regions/version'
 require 'china_regions/engine' if defined? Rails
-require "china_regions/helpers/form_helper"
+require 'china_regions/helpers/form_helper'
 
-module ChinaRegions;end
+module ChinaRegions; end

data/lib/custom_tasks/china_regions.rake

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+namespace :china_regions do
+  desc 'Import regions to database from config/cities.yml'
+  task import: :environment do
+    file_path = File.join(Rails.root, 'config', 'cities.yml')
+    data = File.open(file_path) { |file| YAML.safe_load(file) }
+    remove_china_regions && load_to_db(data)
+
+    puts "\n China's provinces, city, region data import is complete."
+  end
+
+  def remove_china_regions
+    Province.delete_all && City.delete_all && District.delete_all
+  end
+
+  def load_to_db(data)
+    data.each do |province_name, province_hash|
+      province = creating_province(province_name, province_hash)
+
+      province_hash['cities'].each do |city_name, city_hash|
+        city = creating_city(province.id, city_name, city_hash)
+
+        creating_districts(city.id, city_hash)
+      end
+      print '.'
+    end
+  end
+
+  def creating_province(province_name, province_hash)
+    province_parameters = province_params(
+      name:       province_name,
+      name_en:    province_hash['name_en'],
+      name_abbr:  province_hash['name_abbr']
+    )
+
+    Province.create(province_parameters)
+  end
+
+  def creating_city(province_id, city_name, city_hash)
+    city_parameters = city_params(
+      province_id:  province_id,
+      name:         city_name,
+      name_en:      city_hash['name_en'],
+      name_abbr:    city_hash['name_abbr'],
+      zip_code:     city_hash['zip_code'],
+      level:        city_hash['level'] || 4
+    )
+
+    City.create(city_parameters)
+  end
+
+  def creating_districts(city_id, city_hash)
+    districts_hash = city_hash['districts']
+
+    districts_hash.each do |district_name, district_hash|
+      creating_district(city_id, district_name, district_hash)
+    end
+  end
+
+  def creating_district(city_id, district_name, district_hash)
+    district_parameters = district_params(
+      city_id:    city_id,
+      name:       district_name,
+      name_en:    district_hash['name_en'],
+      name_abbr:  district_hash['name_abbr']
+    )
+    District.create(district_parameters)
+  end
+
+  private
+  def province_params(raw_parameters)
+    parameters = ActionController::Parameters.new(raw_parameters)
+    parameters.permit(:name, :name_en, :name_abbr)
+  end
+
+  def city_params(raw_parameters)
+    parameters = ActionController::Parameters.new(raw_parameters)
+    parameters.permit(:province_id, :name, :name_en, :name_abbr, :zip_code, :level)
+  end
+
+  def district_params(raw_parameters)
+    parameters = ActionController::Parameters.new(raw_parameters)
+    parameters.permit(:city_id, :name, :name_en, :name_abbr)
+  end
+end

data/lib/generators/china_regions/install_generator.rb

@@ -1,49 +1,46 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module ChinaRegions
   class InstallGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     def copy_migration
-      Dir["db/migrate/*_china_regions_tables.rb"].each{ |file| File.delete(file) }
+      Dir['db/migrate/*_china_regions_tables.rb'].each { |file| File.delete(file) }
 
-      migration_template "migration.rb", "db/migrate/create_china_regions_tables.rb"
+      migration_template 'migration.rb', 'db/migrate/create_china_regions_tables.rb'
     end
 
     def copy_cities
-      copy_file('cities.yml', 'config/cities.yml') unless File::exists?("config/cities.yml")
+      copy_file('cities.yml', 'config/cities.yml') unless File.exist?('config/cities.yml')
     end
 
     def copy_locales
-      unless File::exists?("config/locales/regions.en.yml")
-        copy_file "../../../../config/locales/en.yml", "config/locales/regions.en.yml"
-      end
-      unless File::exists?("config/locales/regions.zh.yml")
-        copy_file "../../../../config/locales/zh.yml", "config/locales/regions.zh.yml"
-      end
+      copy_file '../../../../config/locales/en.yml', 'config/locales/regions.en.yml' unless File.exist?('config/locales/regions.en.yml')
+      copy_file '../../../../config/locales/zh.yml', 'config/locales/regions.zh.yml' unless File.exist?('config/locales/regions.zh.yml')
     end
 
     def copy_rake_tasks
-      unless File::exists?("lib/tasks/china_regions.rake")
-        copy_file "../../../../lib/tasks/china_regions.rake", "lib/tasks/china_regions.rake"
-      end
-    end
-
-    def execute_migrate
-      rake("db:migrate")
-    end
-
-    def import_cities_to_database
-      rake('china_regions:import')
+      copy_file '../../../../lib/custom_tasks/china_regions.rake', 'lib/tasks/china_regions.rake' unless File.exist?('lib/tasks/china_regions.rake')
     end
 
     def self.next_migration_number(dirname)
       if ActiveRecord::Base.timestamped_migrations
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
+        Time.now.utc.strftime('%Y%m%d%H%M%S')
       else
-        "%.3d" % (current_migration_number(dirname) + 1)
+        format('%.3d', (current_migration_number(dirname) + 1))
       end
     end
+
+    def add_rails_version_for_migration
+      rails_version = Gem.loaded_specs["activesupport"].version
+      return if rails_version < Gem::Version.create('4.0')
+
+      migration_version = rails_version.to_s.split(/\./)[0..1].join('.')
+      filename  = 'db/migrate/*create_china_regions_tables.rb'
+      kclass    = 'ActiveRecord::Migration'
+
+      system(`grep -rl "#{kclass}$" #{filename} | xargs sed -i "" "s/#{kclass}/#{kclass}[#{migration_version}]/g"`)
+    end
   end
 end

data/lib/generators/china_regions/regions_generator.rb

@@ -1,17 +1,17 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module ChinaRegions
   class RegionsGenerator < Rails::Generators::Base
-    source_root File.expand_path('../../../../app', __FILE__)
+    source_root File.expand_path('../../../app', __dir__)
 
     def copy_models_file
-      copy_file "models/province.rb", "app/models/province.rb"
-      copy_file "models/city.rb",     "app/models/city.rb"
-      copy_file "models/district.rb", "app/models/district.rb"
+      copy_file 'models/province.rb', 'app/models/province.rb'
+      copy_file 'models/city.rb',     'app/models/city.rb'
+      copy_file 'models/district.rb', 'app/models/district.rb'
     end
 
     def copy_js_file
-      copy_file "assets/javascripts/region_select.js", "app/assets/javascripts/region_select.js"
+      copy_file 'assets/javascripts/region_select.js', 'app/assets/javascripts/region_select.js'
     end
   end
 end

data/lib/generators/china_regions/templates/migration.rb

@@ -1,44 +1,48 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class CreateChinaRegionsTables < ActiveRecord::Migration
   def change
-    unless table_exists? 'provinces'
-      create_table :provinces do |t|
-        t.string :name
-        t.string :name_en
-        t.string :name_abbr
+    setup_provinces unless table_exists? 'provinces'
+    setup_citites   unless table_exists? 'cities'
+    setup_districts unless table_exists? 'districts'
+  end
 
-        t.timestamps
-      end
+  def setup_provinces
+    create_table :provinces do |t|
+      t.string :name
+      t.string :name_en
+      t.string :name_abbr
 
-      add_index :provinces, :name
+      t.timestamps
     end
 
-    unless table_exists? 'cities'
-      create_table :cities do |t|
-        t.string :name
-        t.integer :province_id
-        t.integer :level
-        t.string :zip_code
-        t.string :name_en
-        t.string :name_abbr
+    add_index :provinces, :name
+  end
 
-        t.timestamps
-      end
+  def setup_citites
+    create_table :cities do |t|
+      t.string :name
+      t.integer :province_id
+      t.integer :level
+      t.string :zip_code
+      t.string :name_en
+      t.string :name_abbr
 
-      add_index :cities, :name
+      t.timestamps
     end
 
-    unless table_exists? 'districts'
-      create_table :districts do |t|
-        t.string :name
-        t.integer :city_id
-        t.string :name_en
-        t.string :name_abbr
+    add_index :cities, :name
+  end
+
+  def setup_districts
+    create_table :districts do |t|
+      t.string :name
+      t.integer :city_id
+      t.string :name_en
+      t.string :name_abbr
 
-        t.timestamps
-      end
-      add_index :districts, :name
+      t.timestamps
     end
+    add_index :districts, :name
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: china_regions
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Encore Shao
-- Trey Springer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -25,15 +24,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: " China regions Ruby on rails interface "
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: China regions Ruby on rails interface
 email:
 - encore.shao@gmail.com
-- dspringer@enova.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -51,11 +64,11 @@ files:
 - lib/china_regions/engine.rb
 - lib/china_regions/helpers/form_helper.rb
 - lib/china_regions/version.rb
+- lib/custom_tasks/china_regions.rake
 - lib/generators/china_regions/install_generator.rb
 - lib/generators/china_regions/regions_generator.rb
 - lib/generators/china_regions/templates/cities.yml
 - lib/generators/china_regions/templates/migration.rb
-- lib/tasks/china_regions.rake
 homepage: http://github.com/encoreshao
 licenses: []
 metadata: {}
@@ -75,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails 4 version of dropdowns for all provinces, cities, and districts in

data/lib/tasks/china_regions.rake

@@ -1,70 +0,0 @@
-# encoding: utf-8
-
-require 'yaml'
-
-namespace :china_regions do
-  desc "Import regions to database from config/cities.yml"
-
-  task :import => :environment do
-    file_path = File.join(Rails.root, 'config', 'cities.yml')
-    data = File.open(file_path) { |file| YAML.load(file) }
-    remove_china_regions && load_to_db(data)
-
-    puts "\n China's provinces, city, region data import is complete."
-  end
-
-  def remove_china_regions
-    Province.delete_all && City.delete_all && District.delete_all
-  end
-
-  def load_to_db(data)
-    data.each do |province_name, province_hash|
-      province_parameters = province_params({
-        name:       province_name,
-        name_en:    province_hash['name_en'],
-        name_abbr:  province_hash['name_abbr']
-      })
-      province = Province.create(province_parameters)
-
-      province_hash['cities'].each do |city_name, city_hash|
-        city_parameters = city_params({
-          province_id:  province.id,
-          name:         city_name,
-          name_en:      city_hash['name_en'],
-          name_abbr:    city_hash['name_abbr'],
-          zip_code:     city_hash['zip_code'],
-          level:        city_hash['level'] || 4
-        })
-        city = City.create(city_parameters)
-
-        districts_hash = city_hash['districts']
-        districts_hash.each do |district_name, district_hash|
-          district_parameters = district_params({
-            city_id:    city.id,
-            name:       district_name,
-            name_en:    district_hash['name_en'],
-            name_abbr:  district_hash['name_abbr']
-          })
-          District.create(district_parameters)
-        end
-      end
-      print "."
-    end
-  end
-
-private
-  def province_params(raw_parameters)
-    parameters = ActionController::Parameters.new(raw_parameters)
-    parameters.permit(:name, :name_en, :name_abbr)
-  end
-
-  def city_params(raw_parameters)
-    parameters = ActionController::Parameters.new(raw_parameters)
-    parameters.permit(:province_id, :name, :name_en, :name_abbr, :zip_code, :level)
-  end
-
-  def district_params(raw_parameters)
-    parameters = ActionController::Parameters.new(raw_parameters)
-    parameters.permit(:city_id, :name, :name_en, :name_abbr)
-  end
-end