lib/tasks/china_regions.rake in china_regions-0.0.5 vs lib/tasks/china_regions.rake in china_regions-0.1.0

@@ -6,41 +6,64 @@
   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_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
\ No newline at end of file
+
+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