cpr-client 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a78908818428f7a3b27ebd88c72e3537017cadf
-  data.tar.gz: c985dd242c57a4f05310fff7e7dac085a9babc60
+  metadata.gz: ab8c7d4ff27eab71f8a508a70ea5e82f74930fff
+  data.tar.gz: 5d35cf5c9e06f9159635bb46c0a28ce3f0cbad2b
 SHA512:
-  metadata.gz: e81272abfb112667cafd1c03df30600fdc999791411aa983f3b557a5d29b71aa5d8080ff5f06e432ce874779a46c01f1a5215c43d893a7c5626e432b3252a49c
-  data.tar.gz: 4d788c44e214ee4801f02cb3476eaa581785345428eef9b1ba8fa27849848f239572c36fcf2f7b71e3b4331ec078591ce64efe71481cc783f7121b834a30eade
+  metadata.gz: 782553d02d2cd44b8191df7623e49aef74a2e8abde9962b1b62db495180ce221583373c98b772e2afde401cdcc9067fc45f789d58b8b45a32003243f865b7b45
+  data.tar.gz: 9a0c7c4ef012d018decb90773bd5d2e194e6f1e5b41295f4f7139ec320559ec0ffd2715900a88bb47a172bb8b32ad985a542aed3ac201dcd996339e0885682b7

data/lib/cpr_client/record.rb

@@ -41,16 +41,31 @@ module CPRClient
     # The address will be a string of the fields
     # STADR, POSTNR and POSTNR's t attribute.
     #
-    # Fx. Boulevarden 101,1 mf, 6800 Varde
+    # Fx. Boulevarden 101, 1. mf, 6800 Varde
     #
     # @return string with address or nil
     def address
-      values = [ get(:stadr), get(:postnr), get(:postnr, :t) ]
-      '%s, %s %s' % values if values.all?
+      street_and_number = "#{get(:vejkod, :t)} #{get_clean(:husnr)}"
+      postal_district   = "#{get(:postnr)} #{get(:postnr, :t)}"
+      door  = get_clean(:sidedoer)
+      floor = get_clean(:etage)
+
+      if floor and door
+        "#{street_and_number}, #{floor}. #{door}, #{postal_district}"
+      elsif floor
+        "#{street_and_number}, #{floor}., #{postal_district}"
+      else
+        "#{street_and_number}, #{postal_district}"
+      end
     end
 
     private
 
+    def get_clean(name, value = 'v')
+      value = get(name, value)
+      value.sub(/^[ 0\-]*(.*?)\s*/, '\1') if value
+    end
+
     def extract_fields(xml_doc)
       Hash[xml_doc.css("Praes[r='STAMPNR'] Field").reduce([]) { |a, f|
         attrs = Hash[f.keys.zip(f.values)]

data/lib/cpr_client/version.rb

@@ -1,3 +1,3 @@
 module CPRClient
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpr-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Michael Andersen
@@ -98,9 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: CPR Client
 test_files: []
-has_rdoc: