Merge pull request #203 from rngtng/fix-delete_by

Fix: return `self` instead of `nil` if no attribute was deleted

Author: dblock

CHANGELOG.md

@@ -3,6 +3,7 @@
 
 * Your contribution here.
 * [#202](https://github.com/ruby-grape/grape-entity/pull/202): Fix: Reset `@using_class` memoization on `.setup` - [@rngtng](https://github.com/rngtng).
+* [#203](https://github.com/ruby-grape/grape-entity/pull/203): Grape::Entity::Exposure::NestingExposure::NestedExposures.delete_if always returns exposures. - [@rngtng](https://github.com/rngtng).
 
 0.5.0 (2015-12-07)
 ==================

UPGRADING.md

@@ -0,0 +1,8 @@
+Upgrading Grape Entity
+===============
+
+### Upgrading to >= 0.5.1
+
+* `Grape::Entity::Exposure::NestingExposure::NestedExposures.delete_if` always
+returns exposures, regardless of delete result (used to be
+`nil` in negative case), see [#203](https://github.com/ruby-grape/grape-entity/pull/203).

lib/grape_entity/exposure/nesting_exposure/nested_exposures.rb

@@ -21,6 +21,7 @@ def <<(exposure)
           def delete_by(*attributes)
             reset_memoization!
             @exposures.reject! { |e| attributes.include? e.attribute }
+            @exposures
           end
 
           def clear

spec/grape_entity/exposure/nesting_exposure/nested_exposures_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Grape::Entity::Exposure::NestingExposure::NestedExposures do
-  subject { described_class.new([]) }
+  subject(:nested_exposures) { described_class.new([]) }
 
   describe '#deep_complex_nesting?' do
     it 'is reset when additional exposure is added' do
@@ -31,4 +31,26 @@
       expect(subject.instance_variable_get(:@deep_complex_nesting)).to be_nil
     end
   end
+
+  describe '.delete_by' do
+    subject { nested_exposures.delete_by(*attributes) }
+
+    let(:attributes) { [:id] }
+
+    before do
+      nested_exposures << Grape::Entity::Exposure.new(:id, {})
+    end
+
+    it 'deletes matching exposure' do
+      is_expected.to eq []
+    end
+
+    context "when given attribute doesn't exists" do
+      let(:attributes) { [:foo] }
+
+      it 'deletes matching exposure' do
+        is_expected.to eq(nested_exposures)
+      end
+    end
+  end
 end