clwy_china_city 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d609d017cdb6ae6e183777f5b81cb6fbc14287dfc07a9850e676b67e163650a
-  data.tar.gz: 9afe8e8966f17f47f67e5c31a41141c5fdf716d73ef6d5ee1648f06d736e59d6
+  metadata.gz: 39734bd5ea18bc83cf4b2ca3e445934846714d389a2958dfacf42f6a60cf62e5
+  data.tar.gz: 4d34b085ef06ad4fdc63417aca321afa3e56f11b202b96986af0d2f6bd9532e0
 SHA512:
-  metadata.gz: d15e10ba5dc94622e34cc95bd8c473b5a682137bb3e0a067b1b82db9d9a1aa56cf203d34504e78a6360f762a10fc3375afd5522b1ec7f894353430eebb9a51c5
-  data.tar.gz: b7f83a90edc1ff5959718217be4d95ff5258dda9ce6b90e105dd6e73d58663b61a68b10d76613b33cab5a92488c1ed1e973f82f5cbd92bc2e2a449010b2b5010
+  metadata.gz: 0a26bb9de5350ca3641208ebb6676597e48a60d42278fad1a15f41e04f37790430f531ea2f9bb735ebc6f0cf28b4f9b87c08a95b5f9759c69c076f4777a19ab4
+  data.tar.gz: 84e0c1f0bfae39338e7060ad22af49a3698d124bc7a63c93a79651a6f474260c49c5cfc5a3f247306a7cf79187236904b37331fa0e6257cd6b57e9672413aa1e

data/Rakefile

@@ -9,7 +9,7 @@ require 'appraisal'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ChinaCity'
+  rdoc.title    = 'ClwyChinaCity'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
@@ -28,4 +28,4 @@ desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
-load 'lib/china_city_tasks.rake'
+load 'lib/clwy_china_city_tasks.rake'

data/app/assets/javascripts/clwy_china_city/application.js

@@ -0,0 +1,3 @@
+//= require jquery
+//= require clwy_china_city/jquery.clwy_china_city
+//= require_tree .

data/app/assets/javascripts/{china_city/jquery.china_city.js → clwy_china_city/jquery.clwy_china_city.js}

@@ -1,5 +1,5 @@
 (function() {
-    $.fn.china_city = function() {
+    $.fn.clwy_china_city = function() {
         return this.each(function() {
             var selects;
             selects = $(this).find('.city-select');
@@ -9,7 +9,7 @@
                 next_selects = selects.slice(selects.index(this) + 1);
                 $("option:gt(0)", next_selects).remove();
                 if (next_selects.first()[0] && $this.val()) {
-                    return $.get("/china_city/" + ($(this).val()), function(data) {
+                    return $.get("/clwy_china_city/" + ($(this).val()), function(data) {
                         var i, len, option, results;
                         results = [];
                         for (i = 0, len = data.length; i < len; i++) {
@@ -24,7 +24,7 @@
     };
 
     $(document).on("turbolinks:load", function() {
-        return $('.city-group').china_city();
+        return $('.city-group').clwy_china_city();
     });
 
 }).call(this);

data/app/controllers/{china_city → clwy_china_city}/application_controller.rb

@@ -1,4 +1,4 @@
-module ChinaCity
+module ClwyChinaCity
   class ApplicationController < ActionController::Base
   end
 end

data/app/controllers/{china_city → clwy_china_city}/data_controller.rb

@@ -1,9 +1,9 @@
-require_dependency "china_city/application_controller"
+require_dependency "clwy_china_city/application_controller"
 
-module ChinaCity
+module ClwyChinaCity
   class DataController < ApplicationController
     def show
-      data = ChinaCity.list(params[:id])
+      data = ClwyChinaCity.list(params[:id])
       render json: data, layout: nil
     end
 

data/app/helpers/{china_city → clwy_china_city}/application_helper.rb

@@ -1,4 +1,4 @@
-module ChinaCity
+module ClwyChinaCity
   module ApplicationHelper
   end
 end

data/app/views/{china_city → clwy_china_city}/data/index.html.erb

@@ -3,10 +3,10 @@
   city     = '440300'
   district = '440305'
   street   = '440305001'
-  provinces  = ChinaCity.list
-  cities     = ChinaCity.list(province)
-  districtes = ChinaCity.list(city)
-  streets    = ChinaCity.list(district)
+  provinces  = ClwyChinaCity.list
+  cities     = ClwyChinaCity.list(province)
+  districtes = ClwyChinaCity.list(city)
+  streets    = ClwyChinaCity.list(district)
 %>
 <h2>Rails Helper</h2>
 <div class='rails-helper city-group'>
@@ -20,7 +20,7 @@
 <div class='html-tag city-group'>
   <select class='city-select city-province'>
     <option>--省份--</option>
-    <%= options_for_select(ChinaCity.list, province) %>
+    <%= options_for_select(ClwyChinaCity.list, province) %>
   </select>
   <select class='city-select city-city'>
     <option>--城市--</option>

data/app/views/layouts/clwy_china_city/application.html.erb

@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+  <head>
+    <title>ClwyChinaCity</title>
+    <%= stylesheet_link_tag    "clwy_china_city/application", media: "all" %>
+    <%= javascript_include_tag "clwy_china_city/application" %>
+    <%= csrf_meta_tags %>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/config/routes.rb

@@ -1,4 +1,4 @@
-ChinaCity::Engine.routes.draw do
+ClwyChinaCity::Engine.routes.draw do
   root to: 'data#index'
   get ':id', to: 'data#show'
 end

data/lib/{china_city.rb → clwy_china_city.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
-require "china_city/engine"
+require "clwy_china_city/engine"
 
-module ChinaCity
+module ClwyChinaCity
   CHINA = '000000' # 全国
   PATTERN = /(\d{2})(\d{2})(\d{2})/
 

data/lib/{china_city → clwy_china_city}/engine.rb

@@ -1,6 +1,6 @@
-module ChinaCity
+module ClwyChinaCity
   class Engine < ::Rails::Engine
-    isolate_namespace ChinaCity
+    isolate_namespace ClwyChinaCity
 
     config.generators do |g|
       g.test_framework      :rspec,        fixture: false

data/lib/clwy_china_city/version.rb

@@ -0,0 +1,3 @@
+module ClwyChinaCity
+  VERSION = "0.0.7"
+end

data/spec/controllers/{china_city → clwy_china_city}/data_controller_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe ChinaCity::DataController do
+describe ClwyChinaCity::DataController do
 
   describe "GET 'show'" do
     it "returns http success" do
-      get 'show', id: '000000', use_route: 'china_city'
+      get 'show', id: '000000', use_route: 'clwy_china_city'
       response.should be_success
     end
   end

data/spec/dummy/app/assets/javascripts/application.js

@@ -10,5 +10,5 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //= require 'jquery'
-//= require 'china_city/jquery.china_city'
+//= require 'clwy_china_city/jquery.clwy_china_city'
 //= require_tree .

data/spec/dummy/config/application.rb

@@ -8,7 +8,7 @@ require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
-require "china_city"
+require "clwy_china_city"
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
 
-  mount ChinaCity::Engine => "/china_city"
+  mount ClwyChinaCity::Engine => "/clwy_china_city"
 end

data/spec/features/china_city_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 feature 'china city', js: true do
   scenario 'select' do
-    visit '/china_city'
+    visit '/clwy_china_city'
     within '.rails-helper' do
       select '广东省'
       select '深圳市'
@@ -18,7 +18,7 @@ feature 'china city', js: true do
 
   describe 'clean' do
     before do
-      visit '/china_city'
+      visit '/clwy_china_city'
       within '.rails-helper' do
         select '广东省'
         select '深圳市'

data/spec/lib/clwy_china_city_spec.rb

@@ -0,0 +1,64 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe ClwyChinaCity do
+  it 'should be list' do
+    # 省
+    ClwyChinaCity.list.should eql [["北京市", "110000"], ["天津市", "120000"], ["河北省", "130000"], ["山西省", "140000"], ["内蒙古自治区", "150000"], ["辽宁省", "210000"], ["吉林省", "220000"], ["黑龙江省", "230000"], ["上海市", "310000"], ["江苏省", "320000"], ["浙江省", "330000"], ["安徽省", "340000"], ["福建省", "350000"], ["江西省", "360000"], ["山东省", "370000"], ["河南省", "410000"], ["湖北省", "420000"], ["湖南省", "430000"], ["广东省", "440000"], ["广西壮族自治区", "450000"], ["海南省", "460000"], ["重庆市", "500000"], ["四川省", "510000"], ["贵州省", "520000"], ["云南省", "530000"], ["西藏自治区", "540000"], ["陕西省", "610000"], ["甘肃省", "620000"], ["青海省", "630000"], ["宁夏回族自治区", "640000"], ["新疆维吾尔自治区", "650000"]]
+
+    ClwyChinaCity.list(nil, show_all: true).should eql [["北京市", "110000"], ["天津市", "120000"], ["河北省", "130000"], ["山西省", "140000"], ["内蒙古自治区", "150000"], ["辽宁省", "210000"], ["吉林省", "220000"], ["黑龙江省", "230000"], ["上海市", "310000"], ["江苏省", "320000"], ["浙江省", "330000"], ["安徽省", "340000"], ["福建省", "350000"], ["江西省", "360000"], ["山东省", "370000"], ["河南省", "410000"], ["湖北省", "420000"], ["湖南省", "430000"], ["广东省", "440000"], ["广西壮族自治区", "450000"], ["海南省", "460000"], ["重庆市", "500000"], ["四川省", "510000"], ["贵州省", "520000"], ["云南省", "530000"], ["西藏自治区", "540000"], ["陕西省", "610000"], ["甘肃省", "620000"], ["青海省", "630000"], ["宁夏回族自治区", "640000"], ["新疆维吾尔自治区", "650000"], ["台湾省", "710000"], ["香港特别行政区", "810000"], ["澳门特别行政区", "820000"]]
+
+    #市
+    ClwyChinaCity.list('440000').should eql [["广州市", "440100"], ["韶关市", "440200"], ["深圳市", "440300"], ["珠海市", "440400"], ["汕头市", "440500"], ["佛山市", "440600"], ["江门市", "440700"], ["湛江市", "440800"], ["茂名市", "440900"], ["肇庆市", "441200"], ["惠州市", "441300"], ["梅州市", "441400"], ["汕尾市", "441500"], ["河源市", "441600"], ["阳江市", "441700"], ["清远市", "441800"], ["东莞市", "441900"], ["中山市", "442000"], ["潮州市", "445100"], ["揭阳市", "445200"], ["云浮市", "445300"]]
+
+    #区
+    ClwyChinaCity.list('440300').should eql [["市辖区", "440301"], ["罗湖区", "440303"], ["福田区", "440304"], ["南山区", "440305"], ["宝安区", "440306"], ["龙岗区", "440307"], ["盐田区", "440308"]]
+
+    #街道
+    ClwyChinaCity.list('440305').should eql [["南头街道", "440305001"], ["南山街道", "440305002"], ["沙河街道", "440305003"], ["蛇口街道", "440305005"], ["招商街道", "440305006"], ["粤海街道", "440305007"], ["桃源街道", "440305008"], ["西丽街道", "440305009"]]
+  end
+
+  it 'should be get' do
+    ClwyChinaCity.get('440000').should eql '广东省'
+    ClwyChinaCity.get('440300').should eql '深圳市'
+    ClwyChinaCity.get('440305').should eql '南山区'
+    ClwyChinaCity.get('440000'   , prepend_parent: true).should eql '广东省'
+    ClwyChinaCity.get('440300'   , prepend_parent: true).should eql '广东省深圳市'
+    ClwyChinaCity.get('440305'   , prepend_parent: true).should eql '广东省深圳市南山区'
+    ClwyChinaCity.get('440305001', prepend_parent: true).should eql '广东省深圳市南山区南头街道'
+  end
+
+  it 'should be parse' do # 可以直接获取省、市
+    ClwyChinaCity.province('440000').should eql '440000' # 省
+    ClwyChinaCity.city('440000').should eql '440000'
+    ClwyChinaCity.district('440000').should eql '440000'
+    ClwyChinaCity.province('440300').should eql '440000' # 市
+    ClwyChinaCity.city('440300').should eql '440300'
+    ClwyChinaCity.district('440300').should eql '440300'
+    ClwyChinaCity.province('440305').should eql '440000' # 区
+    ClwyChinaCity.city('440305').should eql '440300'
+    ClwyChinaCity.district('440305').should eql '440305'
+  end
+
+  it 'should has children' do    # 省市区都有子记录
+    data = ClwyChinaCity.data
+
+    # 省
+    empty_provinces = data.select{|k, v| v[:children].empty?}
+    # empty_provinces.should be_empty
+    # 港澳台暂时没有子记录
+    empty_provinces.keys.should eql ["710000", "810000", "820000"]
+
+    # 市
+    cities = {}
+    data.each {|k, v| v[:children].each{|ck, cv| cities[ck] = cv}}
+    empty_cities = cities.select{|k, v| v[:children].empty?}
+    empty_cities.should be_empty
+
+    # 区
+    districts = {}
+    cities.each {|k, v| v[:children].each{|ck, cv| districts[ck] = cv}}
+    empty_districts = districts.select{|k, v| v[:children].nil?}
+    empty_districts.should be_empty
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clwy_china_city
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dong Liu
@@ -179,22 +179,22 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
-- app/assets/javascripts/china_city/application.js
-- app/assets/javascripts/china_city/jquery.china_city.js
-- app/assets/stylesheets/china_city/application.css
-- app/controllers/china_city/application_controller.rb
-- app/controllers/china_city/data_controller.rb
-- app/helpers/china_city/application_helper.rb
-- app/views/china_city/data/index.html.erb
-- app/views/layouts/china_city/application.html.erb
+- app/assets/javascripts/clwy_china_city/application.js
+- app/assets/javascripts/clwy_china_city/jquery.clwy_china_city.js
+- app/assets/stylesheets/clwy_china_city/application.css
+- app/controllers/clwy_china_city/application_controller.rb
+- app/controllers/clwy_china_city/data_controller.rb
+- app/helpers/clwy_china_city/application_helper.rb
+- app/views/clwy_china_city/data/index.html.erb
+- app/views/layouts/clwy_china_city/application.html.erb
 - config/routes.rb
 - db/areas.json
 - db/district_gb2260_taobao.yml
-- lib/china_city.rb
-- lib/china_city/engine.rb
-- lib/china_city/version.rb
-- lib/china_city_tasks.rake
-- spec/controllers/china_city/data_controller_spec.rb
+- lib/clwy_china_city.rb
+- lib/clwy_china_city/engine.rb
+- lib/clwy_china_city/version.rb
+- lib/clwy_china_city_tasks.rake
+- spec/controllers/clwy_china_city/data_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -228,9 +228,9 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/features/china_city_spec.rb
-- spec/lib/china_city_spec.rb
+- spec/lib/clwy_china_city_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/clwy-cn/china_city
+homepage: https://github.com/clwy-cn/clwy_china_city
 licenses:
 - MIT
 metadata: {}
@@ -288,5 +288,5 @@ test_files:
 - spec/dummy/public/404.html
 - spec/dummy/README.rdoc
 - spec/features/china_city_spec.rb
-- spec/lib/china_city_spec.rb
-- spec/controllers/china_city/data_controller_spec.rb
+- spec/lib/clwy_china_city_spec.rb
+- spec/controllers/clwy_china_city/data_controller_spec.rb

data/app/assets/javascripts/china_city/application.js

@@ -1,3 +0,0 @@
-//= require jquery
-//= require china_city/jquery.china_city
-//= require_tree .

data/app/views/layouts/china_city/application.html.erb

@@ -1,12 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>ChinaCity</title>
-    <%= stylesheet_link_tag    "china_city/application", media: "all" %>
-    <%= javascript_include_tag "china_city/application" %>
-    <%= csrf_meta_tags %>
-
-  <body>
-    <%= yield %>
-  </body>
-</html>

data/lib/china_city/version.rb

@@ -1,3 +0,0 @@
-module ChinaCity
-  VERSION = "0.0.6"
-end

data/spec/lib/china_city_spec.rb

@@ -1,64 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe ChinaCity do
-  it 'should be list' do
-    # 省
-    ChinaCity.list.should eql [["北京市", "110000"], ["天津市", "120000"], ["河北省", "130000"], ["山西省", "140000"], ["内蒙古自治区", "150000"], ["辽宁省", "210000"], ["吉林省", "220000"], ["黑龙江省", "230000"], ["上海市", "310000"], ["江苏省", "320000"], ["浙江省", "330000"], ["安徽省", "340000"], ["福建省", "350000"], ["江西省", "360000"], ["山东省", "370000"], ["河南省", "410000"], ["湖北省", "420000"], ["湖南省", "430000"], ["广东省", "440000"], ["广西壮族自治区", "450000"], ["海南省", "460000"], ["重庆市", "500000"], ["四川省", "510000"], ["贵州省", "520000"], ["云南省", "530000"], ["西藏自治区", "540000"], ["陕西省", "610000"], ["甘肃省", "620000"], ["青海省", "630000"], ["宁夏回族自治区", "640000"], ["新疆维吾尔自治区", "650000"]]
-
-    ChinaCity.list(nil, show_all: true).should eql [["北京市", "110000"], ["天津市", "120000"], ["河北省", "130000"], ["山西省", "140000"], ["内蒙古自治区", "150000"], ["辽宁省", "210000"], ["吉林省", "220000"], ["黑龙江省", "230000"], ["上海市", "310000"], ["江苏省", "320000"], ["浙江省", "330000"], ["安徽省", "340000"], ["福建省", "350000"], ["江西省", "360000"], ["山东省", "370000"], ["河南省", "410000"], ["湖北省", "420000"], ["湖南省", "430000"], ["广东省", "440000"], ["广西壮族自治区", "450000"], ["海南省", "460000"], ["重庆市", "500000"], ["四川省", "510000"], ["贵州省", "520000"], ["云南省", "530000"], ["西藏自治区", "540000"], ["陕西省", "610000"], ["甘肃省", "620000"], ["青海省", "630000"], ["宁夏回族自治区", "640000"], ["新疆维吾尔自治区", "650000"], ["台湾省", "710000"], ["香港特别行政区", "810000"], ["澳门特别行政区", "820000"]]
-
-    #市
-    ChinaCity.list('440000').should eql [["广州市", "440100"], ["韶关市", "440200"], ["深圳市", "440300"], ["珠海市", "440400"], ["汕头市", "440500"], ["佛山市", "440600"], ["江门市", "440700"], ["湛江市", "440800"], ["茂名市", "440900"], ["肇庆市", "441200"], ["惠州市", "441300"], ["梅州市", "441400"], ["汕尾市", "441500"], ["河源市", "441600"], ["阳江市", "441700"], ["清远市", "441800"], ["东莞市", "441900"], ["中山市", "442000"], ["潮州市", "445100"], ["揭阳市", "445200"], ["云浮市", "445300"]]
-
-    #区
-    ChinaCity.list('440300').should eql [["市辖区", "440301"], ["罗湖区", "440303"], ["福田区", "440304"], ["南山区", "440305"], ["宝安区", "440306"], ["龙岗区", "440307"], ["盐田区", "440308"]]
-
-    #街道
-    ChinaCity.list('440305').should eql [["南头街道", "440305001"], ["南山街道", "440305002"], ["沙河街道", "440305003"], ["蛇口街道", "440305005"], ["招商街道", "440305006"], ["粤海街道", "440305007"], ["桃源街道", "440305008"], ["西丽街道", "440305009"]]
-  end
-
-  it 'should be get' do
-    ChinaCity.get('440000').should eql '广东省'
-    ChinaCity.get('440300').should eql '深圳市'
-    ChinaCity.get('440305').should eql '南山区'
-    ChinaCity.get('440000'   , prepend_parent: true).should eql '广东省'
-    ChinaCity.get('440300'   , prepend_parent: true).should eql '广东省深圳市'
-    ChinaCity.get('440305'   , prepend_parent: true).should eql '广东省深圳市南山区'
-    ChinaCity.get('440305001', prepend_parent: true).should eql '广东省深圳市南山区南头街道'
-  end
-
-  it 'should be parse' do # 可以直接获取省、市
-    ChinaCity.province('440000').should eql '440000' # 省
-    ChinaCity.city('440000').should eql '440000'
-    ChinaCity.district('440000').should eql '440000'
-    ChinaCity.province('440300').should eql '440000' # 市
-    ChinaCity.city('440300').should eql '440300'
-    ChinaCity.district('440300').should eql '440300'
-    ChinaCity.province('440305').should eql '440000' # 区
-    ChinaCity.city('440305').should eql '440300'
-    ChinaCity.district('440305').should eql '440305'
-  end
-
-  it 'should has children' do    # 省市区都有子记录
-    data = ChinaCity.data
-
-    # 省
-    empty_provinces = data.select{|k, v| v[:children].empty?}
-    # empty_provinces.should be_empty
-    # 港澳台暂时没有子记录
-    empty_provinces.keys.should eql ["710000", "810000", "820000"]
-
-    # 市
-    cities = {}
-    data.each {|k, v| v[:children].each{|ck, cv| cities[ck] = cv}}
-    empty_cities = cities.select{|k, v| v[:children].empty?}
-    empty_cities.should be_empty
-
-    # 区
-    districts = {}
-    cities.each {|k, v| v[:children].each{|ck, cv| districts[ck] = cv}}
-    empty_districts = districts.select{|k, v| v[:children].nil?}
-    empty_districts.should be_empty
-  end
-end