area_cn 0.0.6 → 0.0.7

data/README.md

@@ -18,30 +18,30 @@ Or install it yourself as:
 
 ## Usage
 
-  # Find by name or code
+### Find by name or code
 
-  zhejiang = AreaCN.areas.find_by_name("浙江省")
-  zhejiang.code # => "330000"
-  zhejiang.children == zhejiang.cities # => [{:name => "杭州市", :code => "330100"}, {}, {}, ...]
+    zhejiang = AreaCN.areas.find_by_name("浙江省")
+    zhejiang.code # => "330000"
+    zhejiang.children == zhejiang.cities # => [{:name => "杭州市", :code => "330100"}, {}, {}, ...]
 
-  
-  hangzhou = AreaCN.areas.find_by_code("330100")
-  hangzhou.code # => "330100"
-  hangzhou.name # => "杭州市"
-  hangzhou.children == hangzhou.districts # => [{:name => "滨江区", :code => "330108"}, {}, {}, ...]
+    
+    hangzhou = AreaCN.areas.find_by_code("330100")
+    hangzhou.code # => "330100"
+    hangzhou.name # => "杭州市"
+    hangzhou.children == hangzhou.districts # => [{:name => "滨江区", :code => "330108"}, {}, {}, ...]
 
-  # Return all provinces
+### Return all provinces
 
-  AreaCN.provinces
-  AreaCN.areas.provinces
+    AreaCN.provinces
+    AreaCN.areas.provinces
 
-  # Code methods
+### Code methods
 
-  zhejiang.code.prefix # => return '33'
-  hangzhou.code.parent # => return '330000'
+    zhejiang.code.prefix # => return '33'
+    hangzhou.code.parent # => return '330000'
 
-  zhejiang.ancestor?(hangzhou) # => return true
-  hangzhou.child?(zhejiang)    # => return true
+    zhejiang.ancestor?(hangzhou) # => return true
+    hangzhou.child?(zhejiang)    # => return true
 
 
 ## Contributing

data/area_cn.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
 
-  gem.add_dependency 'json', '~> 1.7.5'
-  gem.add_dependency 'activesupport', '~> 3.2.6'
+  gem.add_dependency 'json'
+  gem.add_dependency 'activesupport'
 
 end

data/lib/area_cn/area.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'area_cn/code'
 
 module AreaCN
@@ -14,6 +15,13 @@ module AreaCN
       @children = []
     end
 
+    # 有很多省(省会城市),市下面有"市辖区", 单纯的"市辖区"不能分辨是哪个地区的
+    #   
+    # 如果是"市辖区"的地区返回带上级的名字
+    def sense_name
+      @sense_name ||= name == "市辖区" ? parent.name + "辖区" : name
+    end
+
     def parent_code
       @code.parent
     end

data/lib/area_cn/areas.rb

@@ -14,6 +14,11 @@ module AreaCN
 
       @all = @provinces + @cities + @districts
 
+      @map = @all.inject({}) do |map, area|
+        map[area.code] = area
+        map
+      end
+
       locate_areas
     end
 
@@ -27,9 +32,13 @@ module AreaCN
       scope.detect { |area| area.name == name }
     end
 
+    # def find_by_code(code, area_level = nil)
+    #   scope = area_level ? instance_variable_get("@#{area_level.to_s.pluralize}") : all
+    #   scope.detect { |area| area.code == code }
+    # end
+
     def find_by_code(code, area_level = nil)
-      scope = area_level ? instance_variable_get("@#{area_level.to_s.pluralize}") : all
-      scope.detect { |area| area.code == code }
+      @map[code]
     end
     alias_method :get, :find_by_code
 

data/lib/area_cn/version.rb

@@ -1,3 +1,3 @@
 module AreaCN
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: area_cn
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -48,33 +48,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '0'
 description: 中国地区数据查询
 email:
 - chenhb2@qqw.com.cn