taiwan_city_dists_helper 0.93 → 0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a3abe3b0a7302375b9b266062e1bebd8d7071d1e
-  data.tar.gz: f1a1cdb1df008df6809adac4b8656ad6d9116206
+SHA256:
+  metadata.gz: eab05e705bf22ad4d5c0a23840f69eb19bc2b990a8ce8c2d683aefe705b4ba52
+  data.tar.gz: 6e057c4cbac443eea3a158ecf4e09ecb9dbeb937713c6b42041bb45ceafe9cba
 SHA512:
-  metadata.gz: 25d8397ed40af440fdf8e95d1fd4395318e2913d1f27e9006f26cf2703c7feed682f8fd8c842fa967ea215f11da24cc1cb575fa6fe70850bc2cd82fa4d083be3
-  data.tar.gz: 84e57ad82dbd85262c05f7a3d5ffa6e8eb5869ba180fa9bf231f92d23537493810fe47b191b7c49a530086f576ff72bd3a87f633990295aa1910271eee6fa11a
+  metadata.gz: 39e902178e58308561cdd8cda65b80709cd6e35dec53023fac63ebb5a2f8ce0ad345f80cc84c9950b9a9096ce82299ee3f2f80516562d9fc834d519485eaf5a0
+  data.tar.gz: 49fdb51e5d440d46db709faf7d6eb648510e79d0ebc1bcf7d4d06057376457e18210de5532e002c4c06be3d96dab4e12569dcc3d3083eae39d1e7829bcba13f8

data/README.md

@@ -2,7 +2,7 @@
 
 Generate Taiwan City and Districts models with dynamic select boxes
 
-輕鬆產生台灣鄉鎮市的 model 以及動態 select box
+輕鬆產生台灣鄉鎮市的 model relation 以及動態 select box
 
 ## Installation
 
@@ -12,14 +12,14 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 ## Preparation
 
-    1. rails g taiwan_city_dists_helper:table
-    2. rake db:migrate
-    3. rake taiwan_city_dists_helper:get_cities_and_dists
-    4. add //= require taiwan_city_dists_helper to your application.js
+    1. bundle exec rails g tcdh:table
+    2. bundle exec rails db:migrate
+    3. bundle exec rails tcdh:fetch
+    4. add //= require taiwan_city_dists_helper to your application.js ( webpacker not supported )
 
 Make sure your object ( let's say Customer ) has relations with city and dist, so you have to
 add city\_id and dist\_id to your customers table, and define belongs_to in your customer.rb

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/app/models/city.rb

@@ -1,4 +1,7 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
+
+# city model
 class City < ActiveRecord::Base
+  self.table_name = 'tcdh_cities'
   has_many :dists
 end

data/app/models/dist.rb

@@ -1,4 +1,7 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
+
+# dist model
 class Dist < ActiveRecord::Base
+  self.table_name = 'tcdh_dists'
   belongs_to :city
 end

data/lib/generators/tcdh/table/table_generator.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'rails/generators/active_record/migration'
+
+module Tcdh
+  module Generators
+    # table generator
+    class TableGenerator < ::Rails::Generators::Base
+      include ::Rails::Generators::Migration
+
+      source_paths << File.join(File.dirname(__FILE__), 'templates')
+
+      def create_migration_file
+        migration_template 'migration.rb', 'db/migrate/create_cities_and_dists.rb'
+      end
+
+      def self.next_migration_number(_path)
+        @migration_number = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i.to_s
+      end
+    end
+  end
+end

data/lib/generators/tcdh/table/templates/migration.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# create cities and dists table
+class CreateCitiesAndDists < ActiveRecord::Migration[4.2]
+  def self.up
+    create_table :tcdh_cities, force: true do |table|
+      table.string :name
+      table.timestamps
+    end
+
+    create_table :tcdh_dists, force: true do |table|
+      table.string :name
+      table.integer :city_id
+      table.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :tcdh_cities
+    drop_table :tcdh_dists
+  end
+end

data/lib/taiwan_city_dists_helper.rb

@@ -1,7 +1,8 @@
-require "taiwan_city_dists_helper/version"
+# frozen_string_literal: true
 
 module TaiwanCityDistsHelper
+  # injected in rails
   module Rails
-    require "taiwan_city_dists_helper/engine"
+    require 'taiwan_city_dists_helper/engine'
   end
 end

data/lib/taiwan_city_dists_helper/engine.rb

@@ -1,9 +1,12 @@
-require "taiwan_city_dists_helper/helper"
+# frozen_string_literal: true
+
+require 'taiwan_city_dists_helper/helper'
 
 module TaiwanCityDistsHelper
   module Rails
+    # included in rails engine
     class Engine < ::Rails::Engine
-      initializer "taiwan_city_dists_helper.view_helpers" do
+      initializer 'taiwan_city_dists_helper.view_helpers' do
         ActionView::Base.send :include, TaiwanCityDistsHelper::Helper
       end
     end

data/lib/taiwan_city_dists_helper/gem_tasks.rb

@@ -0,0 +1,11 @@
+# require 'rake'
+
+# module TaiwanCityDistsHelper
+#   class GemTasks
+#     include Rake::DSL if defined? Rake::DSL
+#     def install_tasks
+#       load 'tasks/fetch.rake'
+#     end
+#   end
+# end
+# TaiwanCityDistsHelper::GemTasks.new.install_tasks

data/lib/taiwan_city_dists_helper/helper.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 module TaiwanCityDistsHelper
+  # view helpers
   module Helper
-    def render_city_select(f, cities, options={}, html_options={})
-      f.collection_select :city_id, cities, :id, :name, options, html_options
+    def render_city_select(form, cities, options = {}, html_options = {})
+      form.collection_select :city_id, cities, :id, :name, options, html_options
     end
 
-    def render_grouped_dist_select(f, cities, options={}, html_options={})
-      f.grouped_collection_select :dist_id, cities, :dists, :name, :id, :name, options, html_options
+    def render_grouped_dist_select(form, cities, options = {}, html_options = {})
+      form.grouped_collection_select :dist_id, cities, :dists, :name, :id, :name, options, html_options
     end
 
-    def render_dist_select(f, dists, options={}, html_options={})
-      f.collection_select :dist_id, dists, :id, :name, options, html_options
+    def render_dist_select(form, dists, options = {}, html_options = {})
+      form.collection_select :dist_id, dists, :id, :name, options, html_options
     end
-
   end
-end
+end

data/lib/tasks/fetch.rake

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'nokogiri'
+require 'open-uri'
+require 'fileutils'
+require 'ruby-progressbar'
+
+namespace :tcdh do
+  desc 'Fetch cities and dists from OpenData API'
+  task fetch: :environment do
+    progressbar = ProgressBar.create(total: 368, format: '%t: |%B| %c/%C')
+    county_url = 'https://api.nlsc.gov.tw/other/ListCounty'
+    town_url = 'https://api.nlsc.gov.tw/other/ListTown1/'
+    progressbar.log '連線至 https://api.nlsc.gov.tw/other/ListCounty 取得縣市資料'
+    counties = Nokogiri::XML(URI.parse(county_url).open)
+    counties.css('countyItem').each do |county|
+      city_name = county.css('countyname').text
+      city_code = county.css('countycode').text
+      progressbar.log "建立 #{city_name} 記錄"
+      city = City.create(name: city_name)
+      progressbar.log "連線至 https://api.nlsc.gov.tw/other/ListTown1/#{city_code} 取得 #{city_name} 資料"
+      towns = Nokogiri::XML(URI.parse(town_url + city_code).open)
+      towns.css('townItem').each do |dist|
+        dist_name = dist.css('townname').text
+        progressbar.log "建立 #{dist_name} 記錄"
+        Dist.create(name: dist_name, city: city)
+        progressbar.increment
+      end
+      sleep(1)
+    end
+  end
+end

data/taiwan_city_dists_helper.gemspec

@@ -1,20 +1,23 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+# gemspec
+lib = File.expand_path('/lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'taiwan_city_dists_helper/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "taiwan_city_dists_helper"
-  gem.version       = TaiwanCityDistsHelper::Rails::VERSION
-  gem.authors       = ["unayung"]
-  gem.email         = ["Unayung@gmail.com"]
-  gem.description   = %q{Generate Taiwan cities and dists model and provide dynamic select box helper}
-  gem.summary       = %q{This gem is a test}
-  gem.homepage      = "http://github.com/Unayung/taiwan_city_dists_helper"
+  gem.name          = 'taiwan_city_dists_helper'
+  gem.version       = '0.95'
+  gem.required_ruby_version = '>= 2.5.7'
+  gem.authors       = 'unayung'
+  gem.email         = 'Unayung@gmail.com'
+  gem.description   = 'Generate Taiwan cities and dists model and provide dynamic select box helper'
+  gem.summary       = 'This gem is a test'
+  gem.homepage      = 'http://github.com/Unayung/taiwan_city_dists_helper'
 
-  gem.add_dependency "nokogiri"
+  gem.add_dependency 'nokogiri'
+  gem.add_dependency 'ruby-progressbar'
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 end

data/vendor/assets/javascripts/{taiwan_city_dists_helper.js → tcdh.js}

@@ -1,16 +1,16 @@
 $(function() {
   var dists;
   dists = $('select[id*="_dist_id"]').html();
-  return $('select[id*="_city_id"]').change(function() {
+  $('select[id*="_city_id"]').change(function() {
     var city, escaped_city, options;
     city = $('select[id*="_city_id"] :selected').text();
     escaped_city = city.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
     if (dists.indexOf("optgroup") != -1){
       options = $(dists).filter("optgroup[label=" + escaped_city + "]").html();
       if (options) {
-        return $('select[id*="_dist_id"]').html(options);
+        $('select[id*="_dist_id"]').html(options);
       } else {
-        return $('select[id*="_dist_id"]').empty();
+        $('select[id*="_dist_id"]').empty();
       }
     }
   });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taiwan_city_dists_helper
 version: !ruby/object:Gem::Version
-  version: '0.93'
+  version: '0.95'
 platform: ruby
 authors:
 - unayung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,10 +24,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate Taiwan cities and dists model and provide dynamic select box
   helper
-email:
-- Unayung@gmail.com
+email: Unayung@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -39,15 +52,15 @@ files:
 - Rakefile
 - app/models/city.rb
 - app/models/dist.rb
-- lib/generators/taiwan_city_dists_helper/table/table_generator.rb
-- lib/generators/taiwan_city_dists_helper/table/templates/migration.rb
+- lib/generators/tcdh/table/table_generator.rb
+- lib/generators/tcdh/table/templates/migration.rb
 - lib/taiwan_city_dists_helper.rb
 - lib/taiwan_city_dists_helper/engine.rb
+- lib/taiwan_city_dists_helper/gem_tasks.rb
 - lib/taiwan_city_dists_helper/helper.rb
-- lib/taiwan_city_dists_helper/version.rb
-- lib/tasks/taiwan_city_dists_helper.rake
+- lib/tasks/fetch.rake
 - taiwan_city_dists_helper.gemspec
-- vendor/assets/javascripts/taiwan_city_dists_helper.js
+- vendor/assets/javascripts/tcdh.js
 homepage: http://github.com/Unayung/taiwan_city_dists_helper
 licenses: []
 metadata: {}
@@ -59,15 +72,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This gem is a test

data/lib/generators/taiwan_city_dists_helper/table/table_generator.rb

@@ -1,21 +0,0 @@
-require 'rails/generators'
-require 'rails/generators/migration'
-require 'rails/generators/active_record/migration'
-
-module TaiwanCityDistsHelper
-  module Generators
-    class TableGenerator < ::Rails::Generators::Base
-      include ::Rails::Generators::Migration
-
-      self.source_paths << File.join(File.dirname(__FILE__), 'templates')
-
-      def create_migration_file
-        migration_template "migration.rb", "db/migrate/create_cities_and_dists.rb"
-      end
-
-      def self.next_migration_number(path)
-        @migration_number = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i.to_s
-      end
-    end
-  end
-end

data/lib/generators/taiwan_city_dists_helper/table/templates/migration.rb

@@ -1,19 +0,0 @@
-class CreateCitiesAndDists < ActiveRecord::Migration
-  def self.up
-    create_table :cities, :force => true do |table|
-      table.string :name
-      table.timestamps
-    end
-
-    create_table :dists, :force => true do |table|
-      table.string :name
-      table.integer :city_id
-      table.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :cities
-    drop_table :dists
-  end
-end

data/lib/taiwan_city_dists_helper/version.rb

@@ -1,5 +0,0 @@
-module TaiwanCityDistsHelper
-  module Rails
-    VERSION = "0.93"
-  end
-end

data/lib/tasks/taiwan_city_dists_helper.rake

@@ -1,67 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'nokogiri'
-require 'open-uri'
-require "fileutils"
-
-namespace :taiwan_city_dists_helper do
-
-  desc "Copy city.rb and dist.rb"
-  task :copy => :environment do
-    source_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-    puts "Copy City.rb and Dist.rb to your app/models ..."
-    FileUtils.cp_r("#{source_root}/app/models/.", "#{Rails.root}/app/models", { :preserve => true })
-    puts "============================================================"
-    puts "Don't forget require taiwan_city_dists_helper js file in your application.js"
-  end
-
-  desc "Grab cities and dists from wikipedia"
-  task :get_cities_and_dists => :environment do
-    url = "https://zh.wikipedia.org/wiki/%E4%B8%AD%E8%8F%AF%E6%B0%91%E5%9C%8B%E8%87%BA%E7%81%A3%E5%9C%B0%E5%8D%80%E9%84%89%E9%8E%AE%E5%B8%82%E5%8D%80%E5%88%97%E8%A1%A8"
-    begin
-      doc = Nokogiri::HTML(open(url))
-      puts "We got data from wikipedia, now processing ..."
-      #直轄市
-      doc.search("//table[@class='wikitable'][3]//tr").each do |tr|
-        city_name = tr.search("td[1]").text
-        if city_name != ""
-          @city = City.create(:name => "#{city_name}")
-          dist_string = tr.search("td[3]").text
-          dists = dist_string.split("、")
-          dists.each do |dist_name|
-            Dist.create(:name => "#{dist_name}", :city_id => @city.id)
-          end
-        end
-      end
-      #市
-      doc.search("//table[@class='wikitable'][4]//tr").each do |tr|
-        city_name = tr.search("td[1]").text
-        if city_name != ""
-          @city = City.create(:name => "#{city_name}")
-          dist_string = tr.search("td[3]").text
-          dists = dist_string.split("、")
-          dists.each do |dist_name|
-            Dist.create(:name => "#{dist_name}", :city_id => @city.id)
-          end
-        end
-      end
-      #縣
-      doc.search("//table[@class='wikitable'][5]//tr").each do |tr|
-        city_name = tr.search("td[1]").text
-        if city_name != ""
-          @city = City.create(:name => "#{city_name}")
-          dist_string = tr.search("td[3]").text
-          dists = dist_string.split("、")
-          dists.each do |dist_name|
-            Dist.create(:name => "#{dist_name}", :city_id => @city.id)
-          end
-        end
-      end
-    rescue Exception => e
-      puts "Please check your network connection, we can't connect wikipedia :("
-      puts "maybe try later ?"
-    end
-
-  end
-
-
-end