chinese_cities 0.0.1 → 0.0.3

data/lib/chinese_cities/province.rb

@@ -1,42 +1,47 @@
 module ChineseCities
   class Province
-    attr_accessor :name
-    
-    def initialize name
-      @name = name
+    attr_accessor :id, :name
+
+    def initialize(province)
+      @id = province[:id]
+      @name = province[:name]
     end
 
     def cities
-      city_names.map do |city|
-        City.find city 
-      end
+      City.find_by_province_id(id)
     end
 
     def city_names
-      DATABASE.find do |province|
-        province.first == name
-      end.last
+      cities.map(&:name)
     end
 
     class << self
 
       private :new
 
-      def find name
-        return nil unless all_names.include? name
-        new name
+      def search(name)
+        provinces = PROVINCES.select { |province| province[:name] =~ /#{name}/ }
+        provinces.map do |province|
+          new(province)
+        end
+      end
+
+      def find(id)
+        province = PROVINCES.find { |province| province[:id] == id }
+        new(province) unless province.nil?
+      end
+
+      def where(name)
+        province = PROVINCES.find { |province| province[:name] == name }
+        new(province) if province
       end
 
       def all_names
-        DATABASE.map do |province|
-          province.first
-        end
+        PROVINCES.map { |province| province[:name] }
       end
 
       def all
-        all_names.map do |province|
-          new province
-        end
+        PROVINCES.map { |province| new(province) }
       end
     end
 

data/lib/chinese_cities/region.rb

@@ -0,0 +1,54 @@
+module ChineseCities
+  class Region
+    attr_accessor :id, :name, :city_id
+
+    def initialize(region)
+      @id = region[:id]
+      @city_id = region[:city_id]
+      @name = region[:name]
+    end
+
+    def city
+      City.find(city_id)
+    end
+
+    def city_name
+      city.name
+    end
+
+    class << self
+      private :new
+
+      def search(name)
+        regions = REGIONS.select { |region| region[:name] =~ /#{name}/ }
+        regions.map do |region|
+          new(region)
+        end
+      end
+
+      def find_by_city_id(city_id)
+        regions = REGIONS.select { |region| region[:city_id] == city_id }
+        regions.map { |region| new(region) }
+      end
+
+      def find(id)
+        region = REGIONS.find { |region| region[:id] == id }
+        new(region) unless region.nil?
+      end
+
+      def where(name)
+        regions = REGIONS.select { |region| region[:name] == name }
+        regions.map { |region| new(region) } unless regions.empty?
+      end
+
+      def all_names
+        REGIONS.map { |region| region[:name] }
+      end
+
+      def all
+        REGIONS.map { |region| new(region) }
+      end
+
+    end
+  end
+end

data/lib/chinese_cities/version.rb

@@ -1,3 +1,3 @@
 module ChineseCities
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/chinese_cities.rb

@@ -1,24 +1,20 @@
-# encoding: utf-8
- 
 require "chinese_cities/version"
+require "chinese_cities/database"
 
 module ChineseCities
-  autoload :DATABASE, 'chinese_cities/database'
   autoload :Province, 'chinese_cities/province'
-  autoload :City, 'chinese_cities/city'
+  autoload :City,     'chinese_cities/city'
+  autoload :Region,   'chinese_cities/region'
 
-  def self.search name
-    hash = Hash.new
+  def self.search(name)
+    provinces = Province.search(name)
+    cities    = City.search(name)
+    regions   = Region.search(name)
 
-    hash[:provinces] = Province.all_names.find_all do |province|
-                         province.include? name
-                       end
-
-    hash[:cities] = City.all_names.find_all do |city|
-                      city.include? name
-                    end
-
-    hash
+    {
+      provinces: provinces,
+      cities: cities,
+      regions: regions
+    }
   end
-
 end

data/spec/chinese_cities/city_spec.rb

@@ -7,7 +7,7 @@ module ChineseCities
 
   describe City do
     before :all do
-      @city = City.find '西城区'
+      @city = City.find(1)
     end
 
     context '#province' do
@@ -24,20 +24,34 @@ module ChineseCities
       end
     end
 
+    context '#regions' do
+      it 'should have regions' do
+        result = @city.regions
+        result.should_not be_empty
+      end
+    end
+
+    context '#region_name' do
+      it 'should have result_names' do
+        result = @city.region_names
+        result.should_not be_empty
+      end
+    end
+
     context '.new' do
       it 'should be a private method' do
-        lambda { City.new '西城区' }.should raise_error
+        lambda { City.new(CITIES.first)}.should raise_error
       end
     end
 
     context '.find' do
       it 'should find a city' do
-        result = City.find '西城区'
+        result = City.find(1)
         result.should_not be_nil
       end
 
       it 'should not find a city' do
-        result = City.find '啊啊啊'
+        result = City.find(0)
         result.should be_nil
       end
     end
@@ -56,5 +70,24 @@ module ChineseCities
       end
     end
 
+    context '.where' do
+      it 'should get some cities' do
+        result = City.where('北京市')
+        result.should_not be_empty
+      end
+
+      it 'should not get city' do
+        result = City.where('哈哈')
+        result.should be_nil
+      end
+    end
+
+    context '.find_by_province_id' do
+      it 'should find by province_id' do
+        result = City.find_by_province_id(1)
+        result.should_not be_empty
+      end
+    end
+
   end
 end

data/spec/chinese_cities/province_spec.rb

@@ -7,7 +7,7 @@ module ChineseCities
 
   describe Province do
     before :all do
-      @province = Province.find '北京市'
+      @province = Province.find(1)
     end
 
     context '#cities' do
@@ -26,18 +26,18 @@ module ChineseCities
 
     context '.new' do
       it 'should be a private method' do
-        lambda { Province.new '北京市' }.should raise_error
+        lambda { Province.new(PROVINCES.first) }.should raise_error
       end
     end
 
     context '.find' do
       it 'should find a province' do
-        result = Province.find '天津市'
+        result = Province.find(1)
         result.should_not be_nil
       end
 
       it 'should not find a province' do
-        result = Province.find '啊啊啊'
+        result = Province.find(0)
         result.should be_nil
       end
     end
@@ -56,5 +56,17 @@ module ChineseCities
       end
     end
 
+    context '.where' do
+      it 'should get a province' do
+        result = Province.where('北京市')
+        result.should_not nil
+      end
+
+      it 'should not get any province' do
+        result = Province.where('哈哈')
+        result.should nil
+      end
+    end
+
   end
 end

data/spec/chinese_cities/region_spec.rb

@@ -0,0 +1,78 @@
+# encoding: utf-8
+
+require 'rspec'
+require 'chinese_cities/region'
+
+module ChineseCities
+  describe Region do
+    before :all do
+      @region = Region.find(1)
+    end
+
+    context '#city' do
+      it 'should have city' do
+        result = @region.city
+        result.should_not be_nil
+      end
+    end
+
+    context '#city_name' do
+      it 'should have city_name' do
+        result = @region.city_name
+        result.should_not be_nil
+      end
+    end
+
+    context '.new' do
+      it 'should be a private method' do
+        lambda { Region.new(REGIONS)}.should raise_error
+      end
+    end
+
+    context '.find' do
+      it 'should find a region' do
+        result = Region.find(1)
+        result.should_not be_nil
+      end
+
+      it 'should not find a region' do
+        result = Region.find(0)
+        result.should be_nil
+      end
+    end
+
+    context '.all' do
+      it 'should get all region' do
+        result = Region.all
+        result.should_not be_empty
+      end
+    end
+
+    context '.all_names' do
+      it 'should get all region names' do
+        result = Region.all_names
+        result.should_not be_empty
+      end
+    end
+
+    context '.where' do
+      it 'should get some region' do
+        result = Region.where('东城区')
+        result.should_not be_empty
+      end
+
+      it 'should not get region' do
+        result = Region.where('哈哈')
+        result.should be_nil
+      end
+    end
+
+    context '.find_by_city_id' do
+      it 'should find by city_id' do
+        result = Region.find_by_city_id(1)
+        result.should_not be_empty
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chinese_cities
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,9 +44,11 @@ files:
 - lib/chinese_cities/city.rb
 - lib/chinese_cities/database.rb
 - lib/chinese_cities/province.rb
+- lib/chinese_cities/region.rb
 - lib/chinese_cities/version.rb
 - spec/chinese_cities/city_spec.rb
 - spec/chinese_cities/province_spec.rb
+- spec/chinese_cities/region_spec.rb
 - spec/chinese_cities_spec.rb
 homepage: https://github.com/zhouguangming/chinese_cities
 licenses: []
@@ -68,11 +70,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Chinese provinces and cities collection
 test_files:
 - spec/chinese_cities/city_spec.rb
 - spec/chinese_cities/province_spec.rb
+- spec/chinese_cities/region_spec.rb
 - spec/chinese_cities_spec.rb