china_region_fu 0.0.3 → 0.0.4

data/app/controllers/china_region_fu/fetch_options_controller.rb

@@ -5,6 +5,11 @@ module ChinaRegionFu
       if params_valid?(params) and parent_klass = params[:parent_klass].classify.safe_constantize.find(params[:parent_id])
         table_name = params[:klass].tableize
         regions = parent_klass.__send__(table_name).select("#{table_name}.id, #{table_name}.name")
+        if has_level_column?(params[:klass])
+          regions = regions.order('level ASC')
+        else
+          regions = regions.order('name ASC')
+        end
         self.response_body = regions.to_json
       else
         self.response_body = [].to_json
@@ -14,6 +19,10 @@ module ChinaRegionFu
     
     private
     
+    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

data/lib/china_region_fu.rb

@@ -1,8 +1,6 @@
 require "china_region_fu/version"
 require 'china_region_fu/engine' if defined? Rails
 
-module ChinaRegionFu
-  YAML_FILE = File.expand_path('../../config/regions.yml', __FILE__)
-end
+module ChinaRegionFu;end
 
 require 'china_region_fu/helper'

data/lib/china_region_fu/version.rb

@@ -1,3 +1,3 @@
 module ChinaRegionFu
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/generators/china_region_fu/install/templates/regions.yml

@@ -7478,6 +7478,12 @@
         中沙群岛的岛礁及其海域:
           pinyin: zhongshaqundaodedaojiaojiqihaiyu
           pinyin_abbr: zsqdddjjqhy
+    三沙市:
+      pinyin: sansha
+      pinyin_abbr: ss
+      zip_code: '000000'
+      level: 4
+      districts: {}
 重庆市:
   pinyin: chongqing
   pinyin_abbr: cq

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: china_region_fu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails