china_regions 0.0.5 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 42ebe2926674e82aeebf73c5111a62a20e182eda
+  data.tar.gz: d7ef3319973190e74f2e17d70a656db38d22a133
+SHA512:
+  metadata.gz: 389e838506bd0821046b6879a11fe63fa8d996afb8f32c03fec9347d8aba079e48d2f3e30f4aeb4e99366e18751e717c5d82cc2cd8207c3a822c83b6dfb2cdcb
+  data.tar.gz: a2924b8c593fbb8a9f6044d29dc84b8b8b5d091daf3e77a1e33fbce5f490633d4dd7dc500d8a29a0146ffb573a190ed3260a1581347a79f5a87fa9e210daf420

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in lean.gemspec
-gemspec
+# Specify your gem's dependencies in china_regions.gemspec
+gemspec

data/README.md

@@ -59,6 +59,13 @@ bundle install
       = region_select :article, :district
       
       = f.submit class: 'btn'
+
+添加前缀名:
+
+    = form_for @article do |f|
+
+      = f.region_select [:province, :city, :district], :prefix => "home"
+      = f.region_select [:province, :city, :district], :prefix => "work"
    
 
 ## Contributing

data/app/controllers/china_regions/fetch_options_controller.rb

@@ -1,6 +1,6 @@
 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])
         table_name = params[:klass].tableize
@@ -15,16 +15,14 @@ module ChinaRegions
         self.response_body = [].to_json
       end
     end
-    
-  
-    protected  
+
+    protected
       def has_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?
       end
-      
   end
-end
+end

data/app/models/city.rb

@@ -1,9 +1,6 @@
 # encoding: utf-8
 
 class City < ActiveRecord::Base
-  
-  attr_accessible :name, :province_id, :level, :zip_code, :name_en, :name_abbr
-  
   belongs_to :province
   has_many :districts, dependent: :destroy
 
@@ -14,7 +11,7 @@ class City < ActiveRecord::Base
   end
 
   def siblings
-    @siblings ||= scoped.with_province(self.province_id)
+    @siblings ||= where(nil).with_province(self.province_id)
   end
 
 end

data/app/models/district.rb

@@ -1,23 +1,20 @@
 # encoding: utf-8
 
 class District < ActiveRecord::Base
-	
-  attr_accessible :name, :city_id, :name_en, :name_abbr
-  
-	belongs_to :city
+  belongs_to :city
 
-	scope :with_city, ->(city) { where(city_id: city) }
+  scope :with_city, ->(city) { where(city_id: city) }
 
-	def province
-		city.province
-	end
+  def province
+    city.province
+  end
+
+  def short_name
+    @short_name ||= name.gsub(/区|县|市|自治县/, '')
+  end
+
+  def siblings
+    @siblings ||= where(nil).with_city(self.city_id)
+  end
 
-	def short_name
-		@short_name ||= name.gsub(/区|县|市|自治县/, '')
-	end
-	
-	def siblings
-		@siblings ||= scoped.with_city(self.city_id)
-	end
-	
 end

data/app/models/province.rb

@@ -1,10 +1,6 @@
 # encoding: utf-8
 
 class Province < ActiveRecord::Base
-
-  attr_accessible :name, :name_en, :name_abbr
-  
   has_many :cities, dependent: :destroy
   has_many :districts, through: :cities
-
-end
+end

data/china_regions.gemspec

@@ -2,10 +2,10 @@
 require File.expand_path('../lib/china_regions/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Encore Shao"]
-  gem.email         = ["encore.shao@gmail.com"]
+  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{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.files         = `git ls-files`.split($\)
@@ -14,6 +14,6 @@ Gem::Specification.new do |gem|
   gem.name          = "china_regions"
   gem.require_paths = ["lib"]
   gem.version       = ChinaRegions::VERSION
-  
+
   gem.add_dependency 'jquery-rails'
 end

data/config/routes.rb

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

data/lib/china_regions/engine.rb

@@ -7,7 +7,7 @@ module ChinaRegions
     class Railtie < ::Rails::Railtie
       ActiveSupport.on_load(:action_view) do
         ::ActionView::Base.send :include, ChinaRegions::Helpers::FormHelper
-      end  
+      end
     end
   end
-end
+end

data/lib/china_regions/helpers/form_helper.rb

@@ -3,24 +3,25 @@
 module ChinaRegions
   module Helpers
     module FormHelper
-      
       def region_select(object, methods, options = {}, html_options = {})
         output = ''
 
         html_options[:class] ? 
           (html_options[:class].prepend('region_select ')) : 
             (html_options[:class] = 'region_select')
-            
+
+        dropdown_prefix = options[:prefix].to_s + "_" || ""
+
         if Array === methods
           methods.each_with_index do |method, index|
             if region_klass = method.to_s.classify.safe_constantize
-              choices = (index == 0 ? region_klass.scoped.collect {|p| [ p.name, p.id ] } : [])
+              choices = (index == 0 ? region_klass.where(nil).collect {|p| [ p.name, p.id ] } : [])
               next_method = methods.at(index + 1)
-              
+
               set_options(method, options, region_klass)
-              set_html_options(object, method, html_options, next_method)
-              
-              output << select(object, "#{method.to_s}_id", choices, options = options, html_options = html_options)
+              set_html_options(object, method, html_options, next_method, dropdown_prefix)
+
+              output << select(object, "#{dropdown_prefix}#{method.to_s}_id", choices, options = options, html_options = html_options)
             else
               raise "Method '#{method}' is not a vaild attribute of #{object}"
             end
@@ -37,20 +38,20 @@ module ChinaRegions
 
           if region_klass = methods.to_s.classify.safe_constantize
             options[:prompt] = region_prompt(region_klass)
-            
-            output << select(object, _methods, region_klass.scoped.collect {|p| [ p.name, p.id ] }, options = options, html_options = html_options)
+
+            output << select(object, _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}"
           end
         end
-        
+
         output << javascript_tag(js_output)
         output.html_safe
       end
-    
-    
+
+
       private
-      
+
       def set_options(method, options, region_klass)
         if respond_to?("#{method}_select_prompt")
           options[:prompt] = __send__("#{method}_select_prompt")
@@ -58,44 +59,49 @@ module ChinaRegions
           options[:prompt] = region_prompt(region_klass)
         end
       end
-      
-      def set_html_options(object, method, html_options, next_region)
+
+      def set_html_options(object, 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}" })
         if next_region
-          html_options[:data].merge!(region_target: "#{object}_#{next_region.to_s}_id", region_target_kalss: next_region.to_s)
+          html_options[:data].merge!(region_target: "#{object}_#{prefix}#{next_region.to_s}_id", region_target_klass: next_region.to_s)
         else
           html_options[:data].delete(:region_target)
-          html_options[:data].delete(:region_target_kalss)
+          html_options[:data].delete(:region_target_klass)
         end
       end
-        
+
       def region_prompt(region_klass)
         t('views.select', model: region_klass.model_name.human)
       end
-      
+
       def js_output
         %~
           $(function(){
             $('body').on('change', '.region_select', function(event) {
-              var self, targetDom;
-              self = $(event.currentTarget);
-              targetDom = $('#' + self.data('region-target'));
+              var changedObj, targetDom;
+              changedObj = $(event.currentTarget);
+              targetDom = $('#' + changedObj.data('region-target'));
               if (targetDom.size() > 0) {
-                $.getJSON('/china_regions/fetch_options', {klass: self.data('region-target-kalss'), parent_klass: self.data('region-klass'), parent_id: self.val()}, function(data) {
+                $.getJSON('/china_regions/fetch_options', {klass: changedObj.data('region-target-klass'), parent_klass: changedObj.data('region-klass'), parent_id: changedObj.val()}, function(data) {
                   $('option[value!=""]', targetDom).remove();
                   $.each(data, function(index, value) {
                     targetDom.append("<option value='" + value.id + "'>" + value.name + "</option>");
                   });
                 })
+                // just clear out the second dropdown if it exists, they should start from the beginning
+                secondTargetDom = $('#' + targetDom.data('region-target'));
+                if (secondTargetDom.size() > 0) {
+                  $('option[value!=""]', secondTargetDom).remove();
+                }
               }
             });
           });
         ~
       end
-  
+
     end
-    
-    
+
+
     module FormBuilder
       def region_select(methods, options = {}, html_options = {})
         @template.region_select(@object_name, methods, options = options, html_options = html_options)
@@ -106,4 +112,4 @@ module ChinaRegions
 end
 
 ActionView::Base.send :include, ChinaRegions::Helpers::FormHelper
-ActionView::Helpers::FormBuilder.send :include, ChinaRegions::Helpers::FormBuilder
+ActionView::Helpers::FormBuilder.send :include, ChinaRegions::Helpers::FormBuilder

data/lib/china_regions/version.rb

@@ -1,3 +1,3 @@
 module ChinaRegions
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/generators/china_regions/install_generator.rb

@@ -6,14 +6,14 @@ module ChinaRegions
     source_root File.expand_path('../templates', __FILE__)
 
     def copy_migration
-      system("rm db/migrate/*_china_regions_tables.rb")
+      Dir["db/migrate/*_china_regions_tables.rb"].each{ |file| File.delete(file) }
       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")
     end
-    
+
     def copy_locales
       unless File::exists?("config/locales/regions.en.yml")
         copy_file "../../../../config/locales/en.yml", "config/locales/regions.en.yml"
@@ -23,10 +23,16 @@ module ChinaRegions
       end
     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')
     end

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

@@ -9,12 +9,12 @@ class CreateChinaRegionsTables < ActiveRecord::Migration
         t.string :name_abbr
         t.timestamps
       end
-      
+
       add_index :provinces, :name
       add_index :provinces, :name_en
       add_index :provinces, :name_abbr
     end
-    
+
     unless table_exists? 'cities'
       create_table :cities do |t|
         t.string :name
@@ -32,7 +32,7 @@ class CreateChinaRegionsTables < ActiveRecord::Migration
       add_index :cities, :name_en
       add_index :cities, :name_abbr
     end
-    
+
     unless table_exists? 'districts'  
       create_table :districts do |t|
         t.string :name
@@ -47,4 +47,4 @@ class CreateChinaRegionsTables < ActiveRecord::Migration
       add_index :districts, :name_abbr
     end
   end
-end
+end

data/lib/tasks/china_regions.rake

@@ -8,39 +8,62 @@ namespace :china_regions do
   task :import => :environment do
     file_path = File.join(Rails.root, 'config', 'cities.yml')
     data = File.open(file_path) { |file| YAML.load(file) }
-    remove_china_regins && load_to_db(data)
-    puts "Data import is done."
+    remove_china_regions && load_to_db(data)
+    puts "\n China's provinces, city, region data import is complete."
   end
-  
-  def remove_china_regins
+
+  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 = Province.create({ 
+      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 = province.cities.create({ 
-          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_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
         })
-        districts_hash = city_hash['districts']
+        city = City.create(city_parameters)
 
+        districts_hash = city_hash['districts']
         districts_hash.each do |district_name, district_hash|
-          city.districts.create({ 
-            name: district_name, 
-            name_en: district_hash['name_en'], 
-            name_abbr: district_hash['name_abbr']
+          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
-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

metadata

@@ -1,40 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: china_regions
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Encore Shao
+- Trey Springer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -58,26 +57,26 @@ files:
 - lib/tasks/china_regions.rake
 homepage: http://github.com/encoreshao
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0.rc.1
 signing_key: 
-specification_version: 3
-summary: China regions Ruby on rails interface
+specification_version: 4
+summary: Rails 4 version of dropdowns for all provinces, cities, and districts in
+  China.
 test_files: []