Merge pull request #3 from bandwidthcom/develop

Fixed issues with serializing of arrays to xml

Author: Daniel Tolbert

lib/bandwidth-iris/client.rb

@@ -120,7 +120,7 @@ def create_connection()
     end
 
     def build_xml(data)
-       doc = build_doc(data)
+       doc = build_doc(data, data.keys.first.to_s().camelcase(:upper))
        doc.values.first.to_xml({:root => doc.keys.first, :skip_types => true, :indent => 0 })
     end
 
@@ -163,15 +163,19 @@ def parse_xml(xml)
       process_parsed_doc(doc.values.first)
     end
 
-    def build_doc(v)
+    def build_doc(v, name)
       case
         when v.is_a?(Array)
-          v.map {|i| build_doc(i)}
+          list = v.map {|i| build_doc(i, name)}
+          list.extend(XmlArraySerializer)
+          list.element_name = name
+          list
         when v.is_a?(Hash)
           result = {}
           v.each do |k, val|
             if k[0] != '_'
-              result[v["_#{k}XmlElement"] || (k.to_s().camelcase(:upper))] = build_doc(val)
+              element_name = v["_#{k}XmlElement"] || (k.to_s().camelcase(:upper))
+              result[element_name] = build_doc(val, element_name)
             end
           end
           result
@@ -229,4 +233,23 @@ def find_first_descendant v, name
       result
     end
   end
+
+  module XmlArraySerializer
+    def element_name=(name)
+      @element_name = name
+    end
+
+    def to_xml(options = {})
+      builder = options[:builder]
+      self.map do |item|
+        if item.class.method_defined?(:to_xml)
+          builder << item.to_xml({skip_instruct: true, root: @element_name, skip_types: true, indent:0})
+        else
+          builder << "<#{@element_name}>#{item}</#{@element_name}>"
+        end
+      end
+      builder
+    end
+  end
 end
+

lib/bandwidth-iris/lnp_checker.rb

@@ -5,9 +5,10 @@ class LnpChecker
     extend ClientWrapper
 
     def self.check(client, numbers, full_check = false)
+      list = if numbers.is_a?(Array) then numbers else [numbers] end
       data = {
         :number_portability_request => {
-          :tn_list => {:tn => numbers}
+          :tn_list => {:tn => list}
         }
       }
       client.make_request(:post, "#{client.concat_account_path(LNP_CHECKER_PATH)}?fullCheck=#{full_check}", data)[0]

lib/bandwidth-iris/version.rb

@@ -1,4 +1,4 @@
 module BandwidthIris
   # Version of this gem
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

spec/bandwidth-iris/client_spec.rb

@@ -123,3 +123,17 @@
     end
   end
 end
+
+describe '#build_xml' do
+  client = nil
+  before :each do
+    client = Helper.get_client()
+  end
+
+  it 'should generate valid XML' do
+    expect(client.build_xml({root: {item: {value: '123'}}})).to eql('<?xml version="1.0" encoding="UTF-8"?><Root><Item><Value>123</Value></Item></Root>')
+    expect(client.build_xml({root: {item: [1,2,3]}})).to eql('<?xml version="1.0" encoding="UTF-8"?><Root><Item>1</Item><Item>2</Item><Item>3</Item></Root>')
+    expect(client.build_xml({root: {item: [{value: '111'}, {value: '222'}]}})).to eql('<?xml version="1.0" encoding="UTF-8"?><Root><Item><Value>111</Value></Item><Item><Value>222</Value></Item></Root>')
+    expect(client.build_xml({root: {item: [{value: [1,2,3]}, {value: '222'}]}})).to eql('<?xml version="1.0" encoding="UTF-8"?><Root><Item><Value>1</Value><Value>2</Value><Value>3</Value></Item><Item><Value>222</Value></Item></Root>')
+  end
+end

spec/bandwidth-iris/lnp_checker_spec.rb

@@ -19,6 +19,16 @@
       expect(result[:supported_rate_centers][:rate_center_group][:city]).to eql("City1")
       expect(result[:supported_rate_centers][:rate_center_group][:state]).to eql("State1")
     end
+
+    it 'should allow to use 1 number as string' do
+      number = '1111'
+      data = {:number_portability_request => {:tn_list => {:tn => number}}}
+      client.stubs.post('/v1.0/accounts/accountId/lnpchecker?fullCheck=true', client.build_xml(data)) {|env| [200, {}, Helper.xml['lnp_check']]}
+      result = LnpChecker.check(client, number, true)
+      expect(result[:supported_rate_centers][:rate_center_group][:rate_center]).to eql("Center1")
+      expect(result[:supported_rate_centers][:rate_center_group][:city]).to eql("City1")
+      expect(result[:supported_rate_centers][:rate_center_group][:state]).to eql("State1")
+    end
   end
 
 end