china_regions 0.0.2 → 0.0.3

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.DS_Store
 Gemfile.lock
 pkg/*
 doc

data/README.md

@@ -1,12 +1,16 @@
 # ChinaRegions
 
-中国省份，城市，地区［地级市］. 紧支持 Ruby on Rails 程序.
+中国省份，城市，地区［地级市］. 紧支持 Ruby on Rails 程序. Ruby Version ( > 1.9.x ) Rails Version ( > 3.2.x )
        
 
 ## How to use it
 
 添加一下代码到你的 Gemfile:
 
+gem 'china_regions'
+
+or
+
 gem 'china_regions',    :git => 'git://github.com/encoreshao/china_regions.git'
 
 bundle install
@@ -16,13 +20,14 @@ bundle install
     rails g china_regions:install
    
    随后你可以看到控制台:
-   * 复制 数据源cities 到 config 目录.  config/cities.yml
-   * 创建 migration 文件到db/migrate 目录 db/migrate/create_china_regions_tables.rb
+   * 创建 migration 文件到db/migrate 目录 db/migrate/xxxxxxxxxxx_create_china_regions_tables.rb
+   * 创建 数据源 cities.yml 到 config 目录.  config/cities.yml
+   * 创建 regions.en.yml 和 regions.zh.yml 文件到 config/locales 文件下
    * 执行 `rake db:migrate` 添加三张表(provinces, cities, districts).
    * 执行 `rake china_regions:import` 导入数据.
 
 
-此时 你可能需要添加三个model[`Province`, `City`, `District`]到你应用中:
+此时 你可能需要添加三个 models[`Province`, `City`, `District`] 到你应用中:
     
     你可以执行 `rails g` 查看到 generator LIST.
 

data/config/locales/en.yml

@@ -0,0 +1,26 @@
+en:
+  activerecord:
+    models:
+      province: Province
+      city: City
+      district: District
+
+    attributes:
+      province:
+        name: Name
+        name_en: English Name
+        name_abbr: Short Name
+      city:
+        name: Name
+        province_id: Province
+        province: Province
+        name_en: English Name
+        name_abbr: Short Name
+        zip_code: Zip
+        level: Level
+      district:
+        name: Name
+        city_id: City
+        city: City
+        name_en: English Name
+        name_abbr: Short Name

data/config/locales/zh.yml

@@ -0,0 +1,26 @@
+zh:
+  activerecord:
+    models:
+      province: 省份
+      city: 城市
+      district: 区县
+
+    attributes:
+      province:
+        name: 名称
+        name_en: 拼音
+        name_abbr: 简称
+      city:
+        name: 名称
+        province_id: 省份
+        province: 省份
+        name_en: 拼音
+        name_abbr: 简称
+        zip_code: 邮编
+        level: 等级
+      district:
+        name: 名称
+        city_id: 城市
+        city: 城市
+        name_en: 拼音
+        name_abbr: 简称

data/lib/china_regions/action_view/extension.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module ChinaRegions
   module ActionView
     module Extension

data/lib/china_regions/version.rb

@@ -1,3 +1,3 @@
 module ChinaRegions
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/china_regions/{install/install_generator.rb → install_generator.rb}

@@ -5,14 +5,24 @@ module ChinaRegions
     include Rails::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
 
-    def capy_migration_file
+    def copy_migration
+      system("rm db/migrate/*_china_regions_tables.rb")
       migration_template "migration.rb", "db/migrate/create_china_regions_tables.rb"
     end
     
-    def capy_cities_file
-      copy_file 'cities.yml', 'config/cities.yml'
+    def copy_cities
+      copy_file('cities.yml', 'config/cities.yml') unless File::exists?("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
+    end
+
     def execute_migrate
       rake("db:migrate")
     end

data/lib/generators/china_regions/{regions/regions_generator.rb → regions_generator.rb}

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 module ChinaRegions
-  class ResgionsGenerator < Rails::Generators::NamedBase
-    source_root File.expand_path('../../../../../app', __FILE__)
+  class RegionsGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('../../../../app', __FILE__)
 
     def copy_models_file
       copy_file "models/province.rb", "app/models/province.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: china_regions
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -44,15 +44,17 @@ files:
 - app/models/district.rb
 - app/models/province.rb
 - china_regions.gemspec
+- config/locales/en.yml
+- config/locales/zh.yml
 - config/routes.rb
 - lib/china_regions.rb
 - lib/china_regions/action_view/extension.rb
 - lib/china_regions/engine.rb
 - lib/china_regions/version.rb
-- lib/generators/china_regions/install/install_generator.rb
-- lib/generators/china_regions/install/templates/cities.yml
-- lib/generators/china_regions/install/templates/migration.rb
-- lib/generators/china_regions/regions/regions_generator.rb
+- 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: []