Merge pull request #122 from dan-corneanu/subclass-documentation-#121

Subclass documentation #121

Author: dblock

CHANGELOG.md

@@ -3,6 +3,7 @@
 
 * [#114](https://github.com/intridea/grape-entity/pull/114): Added 'only' option that selects which attributes should be returned - [@estevaoam](https://github.com/estevaoam).
 * [#115](https://github.com/intridea/grape-entity/pull/115): Allowing 'root' to be inherited from parent to child entities - [@guidoprincess](https://github.com/guidoprincess).
+* [#121](https://github.com/intridea/grape-entity/pull/122): Sublcassed Entity#documentation properly handles unexposed params - [@dan-corneanu](https://github.com/dan-corneanu).
 * Your contribution here.
 
 0.4.5 (2015-03-10)

lib/grape_entity/entity.rb

@@ -240,10 +240,6 @@ def self.documentation
         memo
       end
 
-      if superclass.respond_to? :documentation
-        @documentation = superclass.documentation.merge(@documentation)
-      end
-
       @documentation
     end
 

spec/grape_entity/entity_spec.rb

@@ -1149,6 +1149,46 @@ class UserEntity < Grape::Entity
 
         expect(subject.documentation).to eq(label: doc, email: doc)
       end
+
+      context 'inherited documentation' do
+        it 'returns documentation from ancestor' do
+          doc = { type: 'foo', desc: 'bar' }
+          fresh_class.expose :name, documentation: doc
+          child_class = Class.new(fresh_class)
+          child_class.expose :email, documentation: doc
+
+          expect(fresh_class.documentation).to eq(name: doc)
+          expect(child_class.documentation).to eq(name: doc, email: doc)
+        end
+
+        it 'obeys unexposed attributes in subclass' do
+          doc = { type: 'foo', desc: 'bar' }
+          fresh_class.expose :name, documentation: doc
+          fresh_class.expose :email, documentation: doc
+          child_class = Class.new(fresh_class)
+          child_class.unexpose :email
+
+          expect(fresh_class.documentation).to eq(name: doc, email: doc)
+          expect(child_class.documentation).to eq(name: doc)
+        end
+
+        it 'obeys re-exposed attributes in subclass' do
+          doc = { type: 'foo', desc: 'bar' }
+          fresh_class.expose :name, documentation: doc
+          fresh_class.expose :email, documentation: doc
+
+          child_class = Class.new(fresh_class)
+          child_class.unexpose :email
+
+          nephew_class = Class.new(child_class)
+          new_doc = { type: 'todler', descr: '???' }
+          nephew_class.expose :email, documentation: new_doc
+
+          expect(fresh_class.documentation).to eq(name: doc, email: doc)
+          expect(child_class.documentation).to eq(name: doc)
+          expect(nephew_class.documentation).to eq(name: doc, email: new_doc)
+        end
+      end
     end
 
     describe '#key_for' do