adiwg-mdtranslator 1.4.0.beta5 → 1.4.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ba17196aff8c229217d2fdb3833a63487c9a23c
-  data.tar.gz: f1293feb09446c035d88d913484b93bfe0c0b3e4
+  metadata.gz: fd64a08f18bf344a63ac59b192ff2431e79dec0e
+  data.tar.gz: 18f203870e0a7b5b2165d01bbe3213d9fa61761c
 SHA512:
-  metadata.gz: 287a5ce6c2deb0dcb23e7fa5245d38117264a07b8d96a4955dd96884a18df6664e5369a71cf4e8e1fdbe3340c20bd76f79dab9343bd656599dddf9ac73818acc
-  data.tar.gz: f3d1240d864b30151760b636ca00c00721aae70e386a5cc36e74de705f0266aacaeb0155115a00dde0eea5aca72f731184189027a6299370c156d2c326958a1c
+  metadata.gz: 174c184b9001a96b532e639fb1eeebef05541520569f20d81d3908646b4533470e4ec79f8591af0c582232b260b1d827f19e6e855c87e3ea29fa71cf7379c038
+  data.tar.gz: 5175d7ce45f5b3d5cc52297a83e613754701987fc144424d3b181ba8a221f7eb465a738fa941945c995f1b8569faa4670f47b7a026b69c7c00941dcf48d9e47f

data/lib/adiwg/mdtranslator/version.rb

@@ -61,6 +61,6 @@
 module ADIWG
     module Mdtranslator
         # current mdtranslator version
-        VERSION = "1.4.0.beta5"
+        VERSION = "1.4.0.beta6"
     end
 end

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_contact.rb

@@ -14,24 +14,26 @@ module ADIWG
                 json.name intObj[:indName] || intObj[:orgName]
                 json.contactType type
                 json.email intObj[:address][:eMailList][0] unless intObj[:address].empty?
-                json.organization type == 'person' ? intObj[:orgName] : nil
+                json.organization type == 'person' ? {:displayText => intObj[:orgName]} : nil
                 json.primaryLocation do
                   json.officePhone intObj[:phones].collect { |ph|
-                    ph[:phoneNumber] if ph[:phoneServiceType] == 'voice' }.reject(&:nil?).first
+                    ph[:phoneNumber] if ph[:phoneServiceType] == 'voice'
+                  }.reject(&:nil?).first
                   json.faxPhone intObj[:phones].collect { |ph|
-                    ph[:phoneNumber] if ph[:phoneServiceType] == 'fax' }.reject(&:nil?).first
+                    ph[:phoneNumber] if ph[:phoneServiceType] == 'fax'
+                  }.reject(&:nil?).first
+                  json.streetAddress do
+                    add = intObj[:address]
+                    unless [:deliveryPoints].empty?
+                      json.line1 add[:deliveryPoints][0]
+                      json.line2 add[:deliveryPoints][1]
+                    end
+                    json.city add[:city]
+                    json.state add[:adminArea]
+                    json.zip add[:postalCode]
+                    json.country add[:country]
+                  end unless intObj[:address].empty?
                 end
-                json.streetAddress do
-                  add = intObj[:address]
-                  unless[:deliveryPoints].empty?
-                    json.line1 add[:deliveryPoints][0]
-                    json.line2 add[:deliveryPoints][1]
-                  end
-                  json.city add[:city]
-                  json.state add[:adminArea]
-                  json.zip add[:postalCode]
-                  json.country add[:country]
-                end unless intObj[:address].empty?
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 1.4.0.beta5
+  version: 1.4.0.beta6
 platform: ruby
 authors:
 - Stan Smith