api_postcode_nl 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/api_postcode_nl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "api_postcode_nl"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rhomeister"]
-  s.date = "2013-01-14"
+  s.date = "2013-01-15"
   s.description = "Retrieve a Dutch address based on housenumber and postcode"
   s.email = "r.stranders@gmail.com"
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/rhomeister/api_postcode_nl"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Ruby gem for interfacing with api.postcode.nl"
 
   if s.respond_to? :specification_version then

data/lib/api_postcode_nl/api.rb

@@ -7,6 +7,7 @@ require 'api_postcode_nl/invalid_postcode_exception'
 module ApiPostcodeNl
   class API
     BASE_URL = "https://api.postcode.nl/rest/addresses"
+    NIL_RESULT_CODE = "api_postcode_nl_NIL_RESULT_CODE"
     
     class << self
       def get_url(postcode, house_number, house_number_addition = nil)
@@ -37,7 +38,7 @@ module ApiPostcodeNl
         #puts result.message
         #puts result.body
       end
-
+      
       def parse(response)
         result = {}
         parsed_response = JSON.parse(response)
@@ -53,12 +54,47 @@ module ApiPostcodeNl
           address_type: parsed_response["addressType"],
           purpose: parsed_response["purpose"],
           area: parsed_response["surfaceArea"],
-          house_number_additions: parsed_response["houseNumberAdditions"]
+          house_number_additions: parsed_response["houseNumberAdditions"],
+          house_number_addition: parsed_response["houseNumberAddition"]
         }
       end
+      
+      def cache_key(postcode, house_number, house_number_addition)
+        "api_postcode_nl_#{postcode.to_s.downcase}_#{house_number.to_s.downcase}_#{house_number_addition.to_s.downcase}"
+      end
 
       def address(postcode, house_number, house_number_addition = nil)
-        parse(send(postcode, house_number, house_number_addition))
+        if house_number_addition.blank? && house_number
+          # attempt to get a house_number_addition from the house number
+          house_number = house_number.to_s
+          number = house_number.split(/[^0-9]/)[0] 
+          house_number_addition = house_number.sub(number, "")
+          house_number = number 
+        end
+        
+        if postcode.blank? || house_number.blank?
+          return nil
+        end
+        
+        key = cache_key(postcode, house_number, house_number_addition)
+        if cache && result = cache.read(key)
+          return nil if result == NIL_RESULT_CODE
+          return result
+        end
+        
+        result = parse(send(postcode, house_number, house_number_addition))
+        
+        cache.write(key, result ? result : NIL_RESULT_CODE, :expires_in => 1.week) if cache
+        
+        result
+      end
+      
+      def cache=(cache)
+        @@cache = cache
+      end
+      
+      def cache
+        @@cache ||= nil
       end
 
       def key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_postcode_nl
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2919040409656760397
+      hash: -3644844763917679694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby gem for interfacing with api.postcode.nl