cmsso 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac809938e2e7364ea5d93ad84426a27d12df85b5
-  data.tar.gz: 6110071fcf44c5ad71ca6b334296aebe882007e2
+  metadata.gz: 7fde1467dc3524963e6eb47ac7168d14a20b59cf
+  data.tar.gz: c3ad81bdc2c080c15ea786a02825aca687d2f5de
 SHA512:
-  metadata.gz: 05dde6cb2b9bf2ea09e8b7fb8c0a6afbd8b458da1d8d2fbf4bdc3c4b68b80ad7ff6c3bfed44e511a583f58f677c980030a533009cca095f462e98247ca4ba6c6
-  data.tar.gz: 1459c22f1f853b401dade6067feec6c786c28e082ab6a1bce0da81434439b9479cae0cb214cd62af4b38aab32247a2daa1f81477b61dfd0aad946ab0aa380d07
+  metadata.gz: 29b8d73739d689075cfb34021a659c8f15ead83cf257554ce8176ea15aa0f1cf19ec08aafc7562393204b7eef4812a7392f467ff18909ed5ead1aa81f86fc726
+  data.tar.gz: d6536da3195ad08f36442982b48e6b902a35c26493a115477f471ddbc136bae37cb931d0a33af861500a574f7998e9b5accef3121c90b35a93c30fcc9369426d

data/app/models/cmsso/member.rb

@@ -6,7 +6,6 @@ module Cmsso
     @@note = nil
 
     attr_accessor :id
-    attr_accessor :full_name
     attr_accessor :first_name
     attr_accessor :last_name
     attr_accessor :email
@@ -24,7 +23,6 @@ module Cmsso
       # assign and format
       @id               = new_args[:person_id]
       @reference        = new_args[:person_reference]
-      @full_name        = new_args[:full_name]
       @first_name       = new_args[:first_name]
       @last_name        = new_args[:last_name]
       @email            = new_args[:email]
@@ -38,6 +36,10 @@ module Cmsso
       @roles.include?(method[0..-2].to_sym)  
     end
 
+    def full_name
+      [self.last_name,self.first_name].join(" ")
+    end
+
     def self.type
       @@type
     end
@@ -146,18 +148,14 @@ module Cmsso
         return nil
       else 
         person.reference  = headers["HTTP_NIBR521"].downcase
-        if headers["HTTP_NIBRFULL"] && headers["HTTP_NIBRFULL"] !~ /null null/i
-          person.full_name  = headers["HTTP_NIBRFULL"].titlecase 
-        else
-          person.full_name  = person.reference
-        end  
-        
-        # take all parts of full name except last for first name
-        person.first_name = person.full_name.split(' ')[0..-2].join(' ')
-
-        # take last part of full name only
-        person.last_name  = person.full_name.split(' ')[-1] 
-      
+        person.first_name = headers["HTTP_NIBRFIRST"]
+
+        if headers["HTTP_NIBRLAST"].nil? || headers["HTTP_NIBRLAST"].size == 0 || headers["HTTP_NIBRLAST"] =~ /^null$/
+          person.last_name  = person.reference
+        else  
+          person.last_name  = headers["HTTP_NIBRLAST"]
+        end
+
         person.email      = headers["HTTP_NIBREMAIL"].downcase if headers["HTTP_NIBREMAIL"] && headers["HTTP_NIBREMAIL"] !~ /^null$/i
       end
 
@@ -168,7 +166,7 @@ module Cmsso
       now = Time.now
       data = {}
       data[:header] = { id: SecureRandom.uuid, action: "Compound Management.Core.Person", version: "1.0.0", date: (now.strftime("%Y-%m-%d") + 'T' + now.strftime("%H:%M:%S.000%:z"))}
-      data[:request] = { persons: [{person_reference: person.reference, full_name: person.full_name, first_name: person.first_name, last_name: person.last_name, email: person.email, module_key: module_key}]}
+      data[:request] = { persons: [{person_reference: person.reference, first_name: person.first_name, last_name: person.last_name, email: person.email, time_zone: person.time_zone, module_key: module_key}]}
       data.to_json
     end
 

data/lib/cmsso/version.rb

@@ -1,3 +1,3 @@
 module Cmsso
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmsso
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Thomas Steiner