chinese_cities 0.0.1 → 0.0.3

data/README.md

@@ -19,8 +19,8 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-province = ChineseCities::Province.find '北京市'
-=> <#ChineseCities::Province:0xa612128 @name="北京市">   
+province = ChineseCities::Province.where '北京市'
+=> <#ChineseCities::Province:0xa612128 @name="北京市">
 
 province.name
 => '北京市'
@@ -71,10 +71,10 @@ ChineseCities::Province.all
 ChineseCities::Province.all_names
 => [ An array of all province names ]
 
-city = ChineseCities::Cities.find '西城区'
-=> #<ChineseCities::City:0xac40464 @name="西城区">
+cities = ChineseCities::Cities.where '西城区'
+=> [#<ChineseCities::City:0xac40464 @name="西城区">]
 
-city.province
+cities.first.province
 => #<ChineseCities::Province:0xaf27808 @name="北京市"
 
 city.province_name
@@ -86,14 +86,34 @@ ChineseCities::City.all
 ChineseCities::City.all_names
 => [ An array of all cities names ]
 
-# Search provinces and cities which name like your parameter
-ChineseCities.search '京'
-=> {:provinces=>["北京市"], :cities=>["南京市", "京山县"]}
+regions = ChineseCities::Region.where('浦东区')
+=> [#<ChineseCities::Region:0x89bdb6c @id=726, @city_id=73, @name="浦东新区">]
+
+regions.first.city
+=> #<ChineseCities::City:0x89bb308 @id=73, @province_id=9, @name="黄浦区">
+
+ChineseCities::Region.all
+=> [ An array of all regions objects ]
+
+ChineseCities::Region.all_names
+=> [ An array of all regions names ]
+
+# Search provinces, cities, regions which name like your parameter
+ChineseCities.search('京')
+=> {
+     :provinces=>[#<ChineseCities::Province:0x9fee120 @id=1, @name="北京市">],
+     :cities=>[#<ChineseCities::City:0xa040b78 @id=1, @province_id=1, @name="北京市">, #<ChineseCities::City:0xa040b64 @id=74, @province_id=10, @name="南京市">],
+     :regions=>[#<ChineseCities::Region:0x9a55588 @id=817, @city_id=84, @name="京口区">, #<ChineseCities::Region:0x9a55574 @id=1567, @city_id=175, @name="京山县">]
+   }
 
 
 
 ```
 
+## Test
+
+rspec
+
 ## Contributing
 
 1. Fork it

data/lib/chinese_cities/city.rb

@@ -1,40 +1,61 @@
 module ChineseCities
   class City
-    attr_accessor :name
+    attr_accessor :id, :name, :province_id
 
-    def initialize name
-      @name = name
+    def initialize(city)
+      @id = city[:id]
+      @province_id = city[:province_id]
+      @name = city[:name]
     end
 
     def province
-      Province.find province_name
+      Province.find(province_id)
     end
 
     def province_name
-      DATABASE.find do |province|
-        province.last.include? self.name
-      end.first
+      province.name
+    end
+
+    def regions
+      Region.find_by_city_id(id)
+    end
+
+    def region_names
+      regions.map(&:name)
     end
 
     class << self
 
       private :new
 
-      def find name
-        return nil unless all_names.include? name
-        new name
+      def search(name)
+        cities = CITIES.select { |city| city[:name] =~ /#{name}/ }
+        cities.map do |city|
+          new(city)
+        end
+      end
+
+      def find_by_province_id(province_id)
+        cities = CITIES.select { |city| city[:province_id] == province_id }
+        cities.map { |city| new(city) } unless cities.nil?
+      end
+
+      def find(id)
+        city = CITIES.find { |city| city[:id] == id }
+        new(city) unless city.nil?
+      end
+
+      def where(name)
+        cities = CITIES.select { |city| city[:name] == name }
+        cities.map { |city| new(city) } unless cities.empty?
       end
 
       def all_names
-        DATABASE.map do |province|
-          province.last
-        end.flatten
+        CITIES.map { |city| city[:name] }
       end
 
       def all
-        all_names.map do |city|
-          new city 
-        end
+        CITIES.map { |city| new(city) }
       end
     end