active_zuora 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39b6ca5135f93b322e6163a842ad9dc830220091
-  data.tar.gz: 99ce7025a870017065521a1374883f2ac6a80664
+  metadata.gz: 3f3c48bc1e363410cf7a84fca07fed5d587ba239
+  data.tar.gz: cb5ef8f0177caf1b567742d5ac6ad21b56f278bb
 SHA512:
-  metadata.gz: 73d6440dbf127d85f375ee8b1f75992d30bb238dc7594e4180498384e6700ae3290a726a85665435ecbd0dd38caada2ee7338e9a422fc4620a43aacc90e41811
-  data.tar.gz: 1e8cad6bf28d7e6dabc8797b66cac7f08236e9a979c620864aa16eda2ced5ab951bedb15394edbc72fc868d9b4853a81c27c318187a8b9f1c13b61918c37a227
+  metadata.gz: 054d3ed6fd6f6a0392f7033a582ccaa5f24842438b59270c0710c69af3aa1f422552d501eb5fba854bafd421cd939a15bd7f88702b466ab145ca60a7662a99a8
+  data.tar.gz: 069f93a4cf88d10604174212f6b6ea947f55cede6fdca257c6772b64350b5ae90b3e266a08473b9aeb5bd066833369d23f5c4a3be6b139245b23e0fed8bb2644

data/CHANGELOG.markdown

@@ -1,3 +1,4 @@
+#### v2.1.4
 #### v2.1.3
 #### v2.1.2
 #### v2.1.1

data/lib/active_zuora/base.rb

@@ -38,13 +38,24 @@ module ActiveZuora
       element_name = custom_element_name || zuora_object_name
       attributes = options.delete(:force_type) ? 
         { "xsi:type" => "#{qualifier}:#{zuora_object_name}" } : {}
+
       xml.tag!(qualifier, element_name.to_sym, attributes) do
-        xml_field_names.map { |field_name| get_field!(field_name) }.each do |field|
+        xml_field_names.map { |field_name| get_field!(field_name) }.sort(&method(:fields_order)).each do |field|
           field.build_xml(xml, soap, send(field.name), options)
         end
       end
     end
 
+    def fields_order(a, b)
+      if send(a.name) == nil
+        send(b.name) == nil ? 0 : -1
+      elsif a.name.to_sym == :id
+        send(b.name) == nil ? 1 : -1
+      else
+        (b.name.to_sym == :id || send(b.name) == nil) ? 1 : 0
+      end
+    end
+
     def add_zuora_errors(zuora_errors)
       return if zuora_errors.blank?
       zuora_errors = [zuora_errors] unless zuora_errors.is_a?(Array)

data/lib/active_zuora/version.rb

@@ -1,3 +1,3 @@
 module ActiveZuora
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

data/spec/base_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe ActiveZuora::Base do
+  class Comment
+    include ActiveZuora::ZObject
+    field :name, :string
+    field :null_field, :string
+  end
+
+  context "#fields_order" do
+    let(:comment) { Comment.new :id => 'blog1', :null_field => nil, :name => 'test' }
+    let(:field_id) { comment.get_field(:id) }
+    let(:field_null) { comment.get_field(:null_field) }
+    let(:field_name) { comment.get_field(:name) }
+    let(:sorted_fields) { [field_null, field_id, field_name] }
+
+    it 'When the value of a field is null, it should be the first' do
+      fields1 = [field_id, field_null]
+      expect(fields1.sort(&comment.method(:fields_order))).to eq([field_null, field_id])
+
+      fields2 = [field_name, field_null]
+      expect(fields2.sort(&comment.method(:fields_order))).to eq([field_null, field_name])
+
+      fields3 = [field_id, field_name, field_null]
+      expect(fields3.sort(&comment.method(:fields_order))).to eq(sorted_fields)
+    end
+
+    it 'When the field name is id, it should be after the nil value fields but before all other fields' do
+      fields1 = [field_name, field_id]
+      expect(fields1.sort(&comment.method(:fields_order))).to eq([field_id, field_name])
+
+      fields2 = [field_null, field_id]
+      expect(fields2.sort(&comment.method(:fields_order))).to eq([field_null, field_id])
+
+      fields3 = [field_name, field_id, field_null]
+      expect(fields3.sort(&comment.method(:fields_order))).to eq(sorted_fields)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_zuora
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Ed Lebert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -139,6 +139,7 @@ files:
 - lib/active_zuora/version.rb
 - lib/active_zuora/z_object.rb
 - spec/account_integration_spec.rb
+- spec/base_spec.rb
 - spec/belongs_to_associations_spec.rb
 - spec/connection_spec.rb
 - spec/has_many_integration_spec.rb
@@ -172,6 +173,7 @@ specification_version: 4
 summary: ActiveZuora - Zuora API that looks and feels like ActiveRecord.
 test_files:
 - spec/account_integration_spec.rb
+- spec/base_spec.rb
 - spec/belongs_to_associations_spec.rb
 - spec/connection_spec.rb
 - spec/has_many_integration_spec.rb