washout_builder 0.15.7 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca7a49562654c7953fd102f99312b74884291311
-  data.tar.gz: ca3c14e5bdbc4ca37b33f53c286ce011fd6f13cd
+  metadata.gz: 88b534c64a3563ba35ec771c7b97c2c63dd5b156
+  data.tar.gz: c721fb7c1109b795e493131bbba777d313f53272
 SHA512:
-  metadata.gz: d1d1eec78f55e30ed89f11bcf5b3ce9503e833bec75cd8a790e6fdeb63e7b22532c99cba3fef45284124f12ad5d6c8b23c575e845ec74c1136416bdd2df646af
-  data.tar.gz: dffb89120ce3dd8b65f2139ffc9e3067365d91c9ee4114a3a48c671716293108a742d9822eeca74a1c7c7ef49a60c4c290f390559629e4e106f37983011455f0
+  metadata.gz: b197f87137546b005140fcb642d2b4c24208119e5c38e0d49b09d1bc1a77a4039c7545ed1f746563423f750c2a99b31179a8794e69a99b92adc849dd70f6343e
+  data.tar.gz: a8f48288bf579a0104e4b1b754b38c0fca1822b90cc126047d2f6b3dc99f186f8ab38478b712229ad7d46cf0f5e7d6236dedac901c85c1ecb6d046f724832ee7

data/lib/washout_builder/version.rb

@@ -6,7 +6,7 @@ module WashoutBuilder # Returns the version of the currently loaded Rails as a <
   module VERSION
     MAJOR = 0
     MINOR = 15
-    TINY = 7
+    TINY = 8
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/lib/washout_builder_spec.rb

@@ -164,7 +164,7 @@ describe WashoutBuilder do
             render soap: { a: params[:a] }
           end
         end
-        expect(savon(:answer, a: '')[:answer_response][:a]).to eq("@xsi:type": 'xsd:string')
+        expect(savon(:answer, a: '')[:answer_response][:a][:'@xsi:type']).to eq('xsd:string')
       end
 
       it 'accept one parameter' do
@@ -301,8 +301,9 @@ describe WashoutBuilder do
           end
         end
 
-        expect(savon(:gogogo)[:gogogo_response]
-              ).to eq(zoo: 'zoo', boo: { moo: 'moo', doo: 'doo', "@xsi:type": 'tns:Boo' })
+        expect(savon(:gogogo)[:gogogo_response].deep_include?(zoo: 'zoo', boo: { moo: 'moo', doo: 'doo' })).to eq true
+
+        expect(savon(:gogogo)[:gogogo_response][:boo][:'@xsi:type']).to eq('tns:Boo')
       end
 
       it 'respond with arrays' do
@@ -334,10 +335,13 @@ describe WashoutBuilder do
           end
         end
 
-        expect(savon(:rumba)[:rumba_response]).to eq(rumbas: [
-          { zombies: 'suck1', puppies: 'rock1', "@xsi:type": 'tns:Rumbas' },
-          { zombies: 'suck2', puppies: 'rock2', "@xsi:type": 'tns:Rumbas' }
-        ])
+        expect(savon(:rumba)[:rumba_response].deep_include?(rumbas: [
+          { zombies: 'suck1', puppies: 'rock1' },
+          { zombies: 'suck2', puppies: 'rock2' }
+        ])).to eq(true)
+
+        expect(savon(:rumba)[:rumba_response][:rumbas][0][:'@xsi:type']).to eq('tns:Rumbas')
+        expect(savon(:rumba)[:rumba_response][:rumbas][1][:'@xsi:type']).to eq('tns:Rumbas')
       end
 
       it 'respond with structs in structs in arrays' do
@@ -351,22 +355,24 @@ describe WashoutBuilder do
           end
         end
 
-        expect(savon(:rumba)[:rumba_response]).to eq(value: [
+        expect(savon(:rumba)[:rumba_response].deep_include?(value: [
           {
             rumbas: {
-              zombies: '100000',
-              "@xsi:type": 'tns:Rumbas'
-            },
-            "@xsi:type": 'tns:Value'
+              zombies: '100000'
+            }
           },
           {
             rumbas: {
-              zombies: '2',
-              "@xsi:type": 'tns:Rumbas'
-            },
-            "@xsi:type": 'tns:Value'
+              zombies: '2'
+            }
           }
-        ])
+        ])).to eq(true)
+
+        expect(savon(:rumba)[:rumba_response][:value][0][:'@xsi:type']).to eq('tns:Value')
+        expect(savon(:rumba)[:rumba_response][:value][1][:'@xsi:type']).to eq('tns:Value')
+
+        expect(savon(:rumba)[:rumba_response][:value][0][:rumbas][:'@xsi:type']).to eq('tns:Rumbas')
+        expect(savon(:rumba)[:rumba_response][:value][1][:rumbas][:'@xsi:type']).to eq('tns:Rumbas')
       end
 
       context 'with arrays missing' do
@@ -403,8 +409,7 @@ describe WashoutBuilder do
             end
           end
 
-          expect(savon(:rocknroll)[:rocknroll_response][:my_value]
-                ).to eq("@xsi:type": 'tns:MyValue')
+          expect(savon(:rocknroll)[:rocknroll_response][:my_value][:'@xsi:type']).to eq('tns:MyValue')
         end
 
         it 'handles incomplete array response' do

data/spec/spec_helper.rb

@@ -116,3 +116,31 @@ def get_wash_out_param(class_name_or_structure, soap_config = OpenStruct.new(
 ))
   WashOut::Param.parse_builder_def(soap_config, class_name_or_structure)[0]
 end
+
+class Hash
+  def deep_include?(sub_hash)
+    sub_hash.keys.all? do |key|
+      if check_key_type(key, Hash)
+        sub_hash[key].is_a?(Hash) && self[key].deep_include?(sub_hash[key])
+      elsif check_key_type(key, Array)
+        sub_hash[key].is_a?(Array) && deep_include_array(key, sub_hash)
+      else
+        self[key] == sub_hash[key]
+      end
+    end
+  end
+
+  def check_key_type(key, type)
+    self.key?(key) && self[key].is_a?(type)
+  end
+
+  def deep_include_array(key, sub_hash)
+    self[key].each_with_index do |value, index|
+      if value.is_a?(Hash)
+        value.deep_include?(sub_hash[key][index])
+      else
+        value == sub_hash[key][index]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.15.8
 platform: ruby
 authors:
 - bogdanRada