GB2260 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: febcce9dda36cd75c751136957fb3f7fee0d5ef6
-  data.tar.gz: fb00da230871eccb96690841e2c6a5050fd7c70b
+  metadata.gz: 6ea442b5ff290bddd262959fbfd393bd99d4566d
+  data.tar.gz: d59bd38a70b408ab7cce6d04979088701a5e4505
 SHA512:
-  metadata.gz: ff25d3eefd41715e4c071b7d14f138f6e133b42bbfa51681902d543357af23dbbc2463edc7a865d6c53df83891a2314785341fef4ea3ad4eca56c6c8edcdc145
-  data.tar.gz: 0a1b3337e5af8c1c85f17c0cd8539ed0181c986dcd09af7e494453fea5e5b4c48774bf32ab34a4120e0a0e303df403e75d778a75a1704ec166927b2046c92625
+  metadata.gz: f6e0f72fdb5b48a45a42c156cf603e633184c38a63c1ee1bfe3ff98be383e38b784afa7a436dfa0357cc9dbab44ac91ae304f29f9890756b9cac6ae8c2e10031
+  data.tar.gz: 85d70fda6f5129ff51639200cf75ebf494b21b909d4e9746ab076eb82533cedeefe109f8f2728d8d159fd3751e1dd1174332541fdce7b9a74b90fc096642a7a1

data/CHANGELOG.md

@@ -6,12 +6,18 @@ GB2260.rb is in a pre-1.0 state. This means that its APIs and behavior are subje
 
 ## [Unreleased]
 
-* Your contribution here!
+Your contribution here!
+
+## 0.2.1 (2016-01-05)
+
+* Return nil when the division is inexistent (https://github.com/cn/GB2260.rb/pull/4)
+* Improve child divisions query performance (https://github.com/cn/GB2260.rb/pull/8)
+* Add `#description` method to return human readable description (https://github.com/cn/GB2260.rb/pull/7)
 
 ## 0.2.0 (2015-11-11)
 
-* Implement spec 0.2
-* Deprecate `#year` of `Division` 
+* Implement spec 0.2 (https://github.com/cn/GB2260/blob/v0.2/spec.md)
+* Deprecate `#year` of `Division`
 
 ## 0.1.1 (2015-09-12)
 
@@ -22,4 +28,4 @@ GB2260.rb is in a pre-1.0 state. This means that its APIs and behavior are subje
 * Initial release
 
 [Semver]: http://semver.org
-[Unreleased]: https://github.com/cn/GB2260.rb/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/cn/GB2260.rb/compare/v0.2.1...HEAD

data/README.md

@@ -1,10 +1,10 @@
 # GB2260
 
-[![GB/T 2260](http://img.shields.io/badge/GB%2FT-2260-blue.svg?style=flat)](https://github.com/cn/GB2260)
+[![GB/T 2260](https://img.shields.io/badge/GB%2FT%202260-v0.2-blue.svg)](https://github.com/cn/GB2260/blob/v0.2/spec.md)
 [![Gem Version](https://badge.fury.io/rb/GB2260.svg)](http://badge.fury.io/rb/GB2260)
 [![Build Status](https://travis-ci.org/cn/GB2260.rb.svg?branch=master)](https://travis-ci.org/cn/GB2260.rb)
 [![Code Climate](https://codeclimate.com/github/cn/GB2260.rb/badges/gpa.svg)](https://codeclimate.com/github/cn/GB2260.rb)
-[![Coverage Status](https://coveralls.io/repos/wolflee/GB2260.rb/badge.svg?branch=master&service=github)](https://coveralls.io/github/wolflee/GB2260.rb?branch=master)
+[![Coverage Status](https://coveralls.io/repos/wolflee/GB2260.rb/badge.svg?branch=master&service=github)](https://coveralls.io/github/cn/GB2260.rb?branch=master)
 
 The Ruby implementation for looking up the Chinese administrative divisions.
 
@@ -38,7 +38,7 @@ puts division  # => <GB2260-2014 江西省/九江市/德安县>
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/wolflee/GB2260.rb. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/cn/GB2260.rb. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/GB2260.rb

@@ -3,11 +3,8 @@ require "GB2260/constants"
 require "GB2260/deprecation"
 require "GB2260/data"
 require "GB2260/division"
-require "GB2260/array"
 
 class GB2260
-  using ArrayExtensions
-
   def self.revisions
     Data.data.keys.reverse
   end
@@ -21,25 +18,27 @@ class GB2260
   end
 
   def all_code
-    Data.data[@revision].keys
+    @all_code ||= Data.data[@revision].keys.freeze
   end
 
   def provinces
-    Division.batch all_code.select_end_with(PROVINCE_SUFFIX), @revision
+    Division.batch all_code.select { |c| c.end_with? PROVINCE_SUFFIX }, @revision
   end
 
   def prefectures(province_code)
-    Division.batch(all_code
-      .select_start_with(province_code.to_s[0,2])
-      .select_end_with(PREFECTURE_SUFFIX)
-      .reject_end_with(PROVINCE_SUFFIX),
-    @revision)
+    province_prefix = province_code.to_s[0,2].freeze
+    Division.batch(all_code.lazy
+      .select { |c| c.start_with? province_prefix }
+      .select { |c| c.end_with? PREFECTURE_SUFFIX }
+      .reject { |c| c.end_with? PROVINCE_SUFFIX }
+      .force, @revision)
   end
 
   def counties(prefecture_code)
-    Division.batch(all_code
-      .select_start_with(prefecture_code.to_s[0,4])
-      .reject_end_with(PREFECTURE_SUFFIX),
-    @revision)
+    prefecture_prefix = prefecture_code.to_s[0,4].freeze
+    Division.batch(all_code.lazy
+      .select { |c| c.start_with? prefecture_prefix }
+      .reject { |c| c.end_with? PREFECTURE_SUFFIX }
+      .force, @revision)
   end
 end

data/lib/GB2260/division.rb

@@ -6,11 +6,12 @@ class GB2260
     deprecate :year, :revision
 
     def self.get(code, revision=nil)
-      new(code, Data.search(code, revision), revision)
+      name = Data.search(code, revision)
+      name && new(code, name, revision)
     end
 
     def self.batch(codes, revision=nil)
-      codes.map { |code| get(code, revision) }
+      codes.map { |code| get(code, revision) }.compact
     end
 
     def initialize(code, name, revision=nil)
@@ -27,8 +28,12 @@ class GB2260
       code == other.code && revision == other.revision
     end
 
+    def description(separator = '/')
+      [province, prefecture, county].compact.map(&:name).join(separator)
+    end
+
     def to_s
-      "<GB2260-#{@revision} #{@code} #{[province, prefecture, county].compact.map(&:name).join('/')}>"
+      "<GB2260-#{revision} #{code} #{description}>"
     end
 
     def hash

data/lib/GB2260/version.rb

@@ -1,3 +1,3 @@
 class GB2260
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: GB2260
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - WolfLee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,6 @@ files:
 - data/GB2260-2013.txt
 - data/GB2260-2014.txt
 - lib/GB2260.rb
-- lib/GB2260/array.rb
 - lib/GB2260/constants.rb
 - lib/GB2260/data.rb
 - lib/GB2260/deprecation.rb
@@ -131,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Ruby implementation for looking up the Chinese administrative divisions.

data/lib/GB2260/array.rb

@@ -1,11 +0,0 @@
-module ArrayExtensions
-  refine Array do
-    [:select, :reject].each do |action|
-      [:start, :end].each do |position|
-        define_method "#{action}_#{position}_with".to_sym do |predicate|
-          self.send(action) { |c| c.send("#{position}_with?".to_sym, predicate) }
-        end
-      end
-    end
-  end
-end