Merge 62f1237 into b74c821

.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.2.3
+  - 2.2.5
   - 2.3.1
 script:
   - bundle exec rspec spec

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Include Attributor::Dumpable in Blueprint, so it renders (semi) correctly if
   rendered with just `true` specified for fields.
+* Fix bug rendering subobjects with nil values (manifested when `include_nil: true` there’s an explicit subsection of fields)
 
 ## 3.2
 

lib/praxis-blueprints/blueprint.rb

@@ -337,11 +337,11 @@ def validate(context = Attributor::DEFAULT_ROOT_CONTEXT)
         if value.respond_to?(:validating) # really, it's a thing with sub-attributes
           next if value.validating
         end
-        errors.push(*sub_attribute.validate(value, sub_context))
+        errors.concat(sub_attribute.validate(value, sub_context))
       end
       self.class.attribute.type.requirements.each do |req|
         validation_errors = req.validate(keys_with_values, context)
-        errors.push(*validation_errors) unless validation_errors.empty?
+        errors.concat(validation_errors) unless validation_errors.empty?
       end
       errors
     ensure

lib/praxis-blueprints/config_hash.rb

@@ -17,6 +17,10 @@ def to_hash
       @hash
     end
 
+    def respond_to_missing?(method_name, _include_private = false)
+      true || super # silly, but it'll appease rubocop
+    end
+
     def method_missing(name, value, *rest, &block)
       if (existing = @hash[name])
         if block

lib/praxis-blueprints/field_expander.rb

@@ -108,7 +108,7 @@ def expand_with_member_attribute(object, fields = true)
       new_fields = fields.is_a?(Array) ? fields[0] : fields
 
       result = [expand(object.member_attribute.type, new_fields)]
-      history[object][fields].push(*result)
+      history[object][fields].concat(result)
 
       result
     end

lib/praxis-blueprints/renderer.rb

@@ -79,7 +79,10 @@ def _render(object, fields, view = nil, context: Attributor::DEFAULT_ROOT_CONTEX
             raise Attributor::DumpError, context: context, name: key, type: object.class, original_exception: e
           end
 
-          next if value.nil? && !include_nil
+          if value.nil?
+            hash[key] = nil if self.include_nil
+            next
+          end
 
           if subfields == true
             hash[key] = case value

spec/praxis-blueprints/renderer_spec.rb

@@ -100,6 +100,7 @@
 
   context 'with include_nil: true' do
     let(:renderer) { Praxis::Renderer.new(include_nil: true) }
+    let(:address) { nil }
 
     it 'renders attributes with nil values' do
       output.should have_key :email
@@ -108,6 +109,11 @@
       output.should have_key :work_address
       output[:work_address].should be nil
     end
+
+    it 'renders nil directly for nil subobjects' do
+      output.should have_key :address
+      output[:address].should be nil
+    end
   end
 
   context '#render_collection' do