iarea 0.4.2 → 0.5.0

data/lib/iarea/area.rb

@@ -22,15 +22,11 @@ module Iarea
       # Find area by <tt>areacode</tt>
       def find(areacode)
         if area = @@areas[areacode]
-          return area
+          area
+        elsif area_data = DB['area'][areacode]
+          @@areas[areacode] ||= new(area_data)
         else
-          if area_data = DB['area'][areacode]
-            area = new(area_data)
-            @@areas[areacode] = area
-            return area
-          else
-            return nil
-          end
+          nil
         end
       end
 

data/lib/iarea/prefecture.rb

@@ -16,7 +16,13 @@ module Iarea
     class << self
       # Find a prefecture by <tt>id</tt>
       def find(id)
-        @@prefectures[id.to_i] ||= new DB['prefecture'][id.to_i]
+        if prefecture = @@prefectures[id.to_i]
+          prefecture
+        elsif prefecture_data = DB['prefecture'][id.to_i]
+          @@prefectures[id.to_i] ||= new(prefecture_data)
+        else
+          nil
+        end
       end
 
       # All prefectures

data/lib/iarea/version.rb

@@ -1,3 +1,3 @@
 module Iarea
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/lib/iarea/zone.rb

@@ -15,7 +15,13 @@ module Iarea
     class << self
       # Find a zone by <tt>id</tt>
       def find(id)
-        @@zones[id.to_i] ||= new DB['zone'][id.to_i]
+        if zone = @@zones[id.to_i]
+          zone
+        elsif zone_data = DB['zone'][id.to_i]
+          @@zones[id.to_i] ||= new(zone_data)
+        else
+          nil
+        end
       end
 
       # All zones

data/spec/iarea/area_spec.rb

@@ -58,4 +58,10 @@ describe Iarea::Area do
     subject { Iarea::Area.find("06304") }
     its(:name) { should == "新宿１〜２丁目" }
   end
+
+  context 'finding by invalid id' do
+    it do
+      Iarea::Area.find(-1).should be_nil
+    end
+  end
 end

data/spec/iarea/prefecture_spec.rb

@@ -35,4 +35,10 @@ describe Iarea::Prefecture do
   it '#all' do
     Iarea::Prefecture.all.should == (1..47).map {|i| Iarea::Prefecture.find(i)}
   end
+
+  context 'finding by invalid id' do
+    it do
+      Iarea::Prefecture.find(-1).should be_nil
+    end
+  end
 end

data/spec/iarea/zone_spec.rb

@@ -35,4 +35,10 @@ describe Iarea::Zone do
   it '#all' do
     Iarea::Zone.all.should == (1..9).map {|i| Iarea::Zone.find(i)}
   end
+
+  context 'finding by invalid id' do
+    it do
+      Iarea::Zone.find(-1).should be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iarea
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-06 00:00:00.000000000 +09:00
-default_executable: 
+date: 2011-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &2157575000 !ruby/object:Gem::Requirement
+  requirement: &2158142580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157575000
+  version_requirements: *2158142580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157574580 !ruby/object:Gem::Requirement
+  requirement: &2158142160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157574580
+  version_requirements: *2158142160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157574160 !ruby/object:Gem::Requirement
+  requirement: &2158141740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157574160
+  version_requirements: *2158141740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157573740 !ruby/object:Gem::Requirement
+  requirement: &2158141320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157573740
+  version_requirements: *2158141320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157573320 !ruby/object:Gem::Requirement
+  requirement: &2158140900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157573320
+  version_requirements: *2158140900
 description: A library for DoCoMo Open Iarea.
 email:
 - dara@shidara.net
@@ -99,7 +98,6 @@ files:
 - spec/iarea/zone_spec.rb
 - spec/spec_helper.rb
 - tools/generate.rb
-has_rdoc: true
 homepage: http://github.com/darashi/iarea
 licenses: []
 post_install_message: 
@@ -120,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iarea
-rubygems_version: 1.6.1
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: A library for DoCoMo Open Iarea.