outliers 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 834ef0a08d61f1df2366395da4695af04c034eb1
-  data.tar.gz: b958631f09f5e25bbc9ffa84562fda4961ce3ed5
+  metadata.gz: f647b789982e7cd060e71a05b4fc7380a6ef8340
+  data.tar.gz: 8c2d681037ca9bb6b1082ca1a6f30f6115c74990
 SHA512:
-  metadata.gz: f7786919daab3cc5062f27ef73ede084d6263164d319d9669908cf0c47581fed6d916b7f3d1f27ac3187113b457a6403a65668a3c1baa376d68e0ba3d598a09b
-  data.tar.gz: 1777fb497e933c4a3de1ca63606d5e1619e71193354cea342a40fb6325f92d4104427babc923805168102e4bf0561a596f86ea3666ffaec2b983622f31830104
+  metadata.gz: 127b3a230b8eb7202dab2d45303107bca054ad1ea6217ed5b126f914937f9b1c568ab61133738277ed4dbcab1884ec6b5dc77748104b8f4ecd2e843abf4dfc7e
+  data.tar.gz: b0fa65e503778c676f4586e97f4b3b9f9cdb605422e341e8ad44998fcaaffa07ffc0522f4ec4bac50221487c835a4458ab6176ae824142d2fc3e32de294715a3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.0
+
+* Refactored results
+
 ## 0.5.1
 
 * Added provider, colleciton and resource lookup methods

data/README.md

@@ -63,3 +63,7 @@ See [examples](http://www.getoutliers.com/documentation/examples) for a list of
 ## Documentation
 
 See more information on the Outliers DSL see the [documentation](http://www.getoutliers.com/documentation) page.
+
+## Attribution
+
+Based on [sanity](https://github.com/brettweavnet/sanity).

data/lib/outliers/cli/process.rb

@@ -33,8 +33,8 @@ module Outliers
           exit 1
         end
 
-        passing_count = @run.passing_results.count
-        failing_count = @run.failing_results.count
+        passing_count = @run.results.select {|r| r.passed? }.count
+        failing_count = @run.results.select {|r| r.failed? }.count
 
         @logger.info "Evaluations completed."
 
@@ -51,13 +51,14 @@ module Outliers
           @logger.info "OUTLIERS_KEY not set, not sending results."
         end
 
-        @run.failing_results.each do |r|
+        failed_results = @run.results.select {|r| r.failed? }
+
+        failed_results.each do |r|
           if r.name
             @logger.info "Results of '#{r.name}', verifying '#{r.verification_name}' of '#{r.provider_name}:#{r.resource_name}' via '#{r.account_name}' failed."
           else
             @logger.info "Verification '#{r.verification_name}' of '#{r.provider_name}:#{r.resource_name}' via '#{r.account_name}' failed."
           end
-          @logger.info "Failing resource IDs '#{r.failing_resources.map{|r| r.id}.join(', ')}'"
         end
 
         @logger.info "(#{failing_count} evaluations failed, #{passing_count} evaluations passed.)"

data/lib/outliers/collection.rb

@@ -4,7 +4,7 @@ module Outliers
   class Collection
 
     include Enumerable
-    include Outliers::Verifications::Shared
+    include Outliers::Verifications::Shared::Collection
 
     attr_reader :provider
     attr_accessor :targets
@@ -14,7 +14,7 @@ module Outliers
     end
 
     def self.verifications
-       Outliers::Verifications::Shared.verifications + self.resource_class.verifications 
+       Outliers::Verifications::Shared::Collection.verifications + self.resource_class.verifications 
     end
 
     def self.filters
@@ -60,7 +60,7 @@ module Outliers
       case action
       when 'include'
         logger.info "Including resources filtered by '#{name}' with value '#{value}'."
-        logger.warn "No resources match filter." unless filtered_list.any?
+        logger.warn "No resources match filter." unless (filtered_list & @list).any?
         @list = filtered_list & @list
       when 'exclude'
         logger.info "Excluding resources filtered by '#{name}' with value '#{value}'."
@@ -75,10 +75,6 @@ module Outliers
 
       name += "?" unless name =~ /^.*\?$/
 
-      unless list.any?
-        return { failing_resources: [], passing_resources: [] }
-      end
-
       set_target_resources name if targets.any?
 
       logger.debug "Target resources '#{list_by_key.join(', ')}'."
@@ -110,7 +106,7 @@ module Outliers
 
     def verification_exists?(name)
       m = resource_class.instance_methods - resource_class.class.instance_methods
-      m += Outliers::Verifications::Shared.instance_methods
+      m += Outliers::Verifications::Shared::Collection.instance_methods
       m -= [:source, :id, :method_missing]
       m.include? name.to_sym
     end
@@ -149,12 +145,15 @@ module Outliers
         logger.debug "Verification of resource '#{resource.id}' #{r ? 'passed' : 'failed'}."
         r
       end
-      { failing_resources: failing_resources, passing_resources: list - failing_resources }
+      passing_resources = list - failing_resources
+      resources = []
+      resources += passing_resources.map { |r| { id: r.id, status: 0 } }
+      resources += failing_resources.map { |r| { id: r.id, status: 1 } }
+      { resources: resources, passing: failing_resources.none? }
     end
 
     def send_collection_verification(verification, arguments)
-      failing_resources = send_verification(self, verification, arguments)
-      { failing_resources: failing_resources, passing_resources: list - failing_resources }
+      send_verification self, verification, arguments
     end
 
     def send_verification(object, verification, arguments) 

data/lib/outliers/evaluation.rb

@@ -42,9 +42,9 @@ module Outliers
       verification_result = resource_collection.verify verification_name, args_to_send
 
       result = Outliers::Result.new account_name:      @account_name,
-                                    failing_resources: verification_result.fetch(:failing_resources),
+                                    resources:         verification_result.fetch(:resources),
+                                    passing:           verification_result.fetch(:passing),
                                     name:              @name,
-                                    passing_resources: verification_result.fetch(:passing_resources),
                                     arguments:         Array(args_to_send),
                                     provider_name:     @provider_name,
                                     resource_name:     @resource_name,

data/lib/outliers/result.rb

@@ -3,8 +3,8 @@ require 'json'
 module Outliers
   class Result
 
-    attr_reader :account_name, :arguments, :failing_resources, :name, :passing_resources,
-                :provider_name, :resource_name, :verification_name
+    attr_reader :account_name, :arguments, :name, :passing,
+                :provider_name, :resources, :resource_name, :verification_name
 
     def to_json
       to_hash.to_json
@@ -14,6 +14,7 @@ module Outliers
       { 'account_name'      => account_name,
         'arguments'         => arguments,
         'name'              => name,
+        'passing'           => passing,
         'provider_name'     => provider_name,
         'resource_name'     => resource_name,
         'verification_name' => verification_name,
@@ -23,28 +24,20 @@ module Outliers
     def initialize(args)
       @account_name      = args[:account_name]
       @arguments         = args[:arguments]
-      @failing_resources = args[:failing_resources]
       @name              = args[:name] || 'unspecified'
-      @passing_resources = args[:passing_resources]
       @provider_name     = args[:provider_name]
+      @resources         = args[:resources]
       @resource_name     = args[:resource_name]
+      @passing           = args[:passing]
       @verification_name = args[:verification_name]
     end
 
     def passed?
-      !failed?
+      @passing
     end
 
     def failed?
-      @failing_resources.any?
-    end
-
-    private
-
-    def resources
-      r = passing_resources.map{|r| { 'id' => r.id, 'passing' => 1 } }
-      r += failing_resources.map{|r| { 'id' => r.id, 'passing' => 0 } }
-      r
+      !passed?
     end
 
   end

data/lib/outliers/run.rb

@@ -38,14 +38,6 @@ module Outliers
       threaded ? threads << Thread.new { evaluation.call } : evaluation.call
     end
 
-    def passing_results
-      @results.select {|r| r.passed?}
-    end
-
-    def failing_results
-      @results.reject {|r| r.passed?}
-    end
-
     private
 
     def files

data/lib/outliers/verifications.rb

@@ -1 +1 @@
-require 'outliers/verifications/shared'
+require 'outliers/verifications/shared/collection'

data/lib/outliers/verifications/collection/shared.rb

@@ -0,0 +1,23 @@
+module Outliers
+  module Verifications
+    module Collection
+      module Shared
+
+        def none_exist?
+          resources = {}
+          list.each {|r| resources.merge! id: r, status: 2}
+          { resources: resources, passing: resources.any? }
+        end
+
+        def equals?(args)
+          keys = Array(args)
+          logger.debug "Verifying '#{keys.join(',')}' equals '#{list.empty? ? 'no resources' : list_by_key.join(',')}'."
+          resources = {}
+          list.each {|r| resources.merge! id: r, status: 2}
+          { resources: resources, passing: FIXME_WITH_EQUALS_LOGIC }
+        end
+
+      end
+    end
+  end
+end

data/lib/outliers/verifications/shared/collection.rb

@@ -0,0 +1,26 @@
+module Outliers
+  module Verifications
+    module Shared
+      module Collection
+
+        def none_exist?
+          resources = list.map do |r|
+            { id: r.id, status: 2 }
+          end
+          { resources: resources, passing: resources.none? }
+        end
+
+        def equals?(args)
+          keys = Array(args)
+          logger.debug "Verifying '#{keys.join(',')}' equals '#{list.empty? ? 'no resources' : list_by_key.join(',')}'."
+          resources = list.map do |r|
+            { id: r.id, status: 2 }
+          end
+          passing = (list.map{|r| r.id} == keys)
+          { resources: resources, passing: passing }
+        end
+
+      end
+    end
+  end
+end

data/lib/outliers/version.rb

@@ -1,3 +1,3 @@
 module Outliers
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/spec/collection_spec.rb

@@ -36,6 +36,10 @@ describe Outliers::Collection do
     end
   end
 
+  context "#verifications" do
+    it "should return the shared and collection verifications"
+  end
+
   context "#filter" do
     before do
       subject.instance_variable_set(:@list, [resource1, resource2, resource3])
@@ -114,7 +118,8 @@ describe Outliers::Collection do
 
     it "should verify the given verification against the colection" do
       expect(subject.verify 'none_exist?').
-        to eq( { failing_resources: [resource1, resource2], passing_resources: [] } )
+        to eq({ resources: [{ id: "resource1", status: 2 },
+                            { id: "resource2", status: 2 }], passing: false })
     end
 
     it "should raise unkown verification if the verification does not exist" do
@@ -123,18 +128,21 @@ describe Outliers::Collection do
 
     it "should verify the given verification against the colection with options" do
       expect(subject.verify 'equals?', ['resource1', 'resource2']).
-        to eq( { failing_resources: [], passing_resources: [resource1, resource2] } )
+        to eq({ resources: [{ id: "resource1", status: 2 },
+                            { id: "resource2", status: 2 }], passing: true })
     end
 
     it "should verify the given verification against each resource in the collection" do
       [resource1, resource2].each {|r| r.define_singleton_method :valid_resource?, lambda { true } }
       expect(subject.verify 'valid_resource?').
-        to eq( { failing_resources: [], passing_resources: [resource1, resource2] } )
+        to eq({ resources: [{ id: "resource1", status: 0 },
+                            { id: "resource2", status: 0 }], passing: true })
     end
 
     it "should appaned a ? to the policy" do
       expect(subject.verify 'none_exist').
-        to eq( { failing_resources: [resource1, resource2], passing_resources: [] } )
+        to eq({ resources: [{ id: "resource1", status: 2 },
+                            { id: "resource2", status: 2 }], passing: false })
     end
 
     it "should remove all but the target resources if one is required and given" do
@@ -142,7 +150,7 @@ describe Outliers::Collection do
       resource1.should_receive(:method).with('valid_resource?').and_return(stub 'method', :arity => 0)
       resource1.should_receive(:valid_resource?).and_return false
       expect(subject.verify 'valid_resource?').
-        to eq( { failing_resources: [resource1], passing_resources: [] } )
+        to eq({ resources: [{ id: "resource1", status: 1 }], passing: false })
     end
 
     it "should raise an error if the target resources does not exist" do
@@ -161,16 +169,18 @@ describe Outliers::Collection do
         to raise_error(Outliers::Exceptions::NoArgumentRequired)
     end
 
-    it "should return empty passing and failing arrays if no resources exist in list" do
+    it "should return empty resource array if no resources exist in list" do
       subject.stub :load_all => []
-      expect(subject.verify 'valid_resource?', {}).to eq( { failing_resources: [], passing_resources: [] } )
+      expect(subject.verify 'valid_resource?', {}).
+        to eq( { resources: [], passing: true } )
     end
 
     it "should verify the given verification against each resource in the collection with options" do
       resource1.should_receive(:valid_resource?).with('test_arg' => 2).and_return true
       resource2.should_receive(:valid_resource?).with('test_arg' => 2).and_return true
       expect(subject.verify 'valid_resource?', 'test_arg' => 2).
-        to eq( { failing_resources: [], passing_resources: [resource1, resource2] } )
+        to eq( { resources: [ { id: "resource1", status: 0},
+                              { id: "resource2", status: 0}], passing: true} )
     end
   end
 

data/spec/evaluation_spec.rb

@@ -124,7 +124,7 @@ describe Outliers::Evaluation do
     context "#verify" do
       let(:result1) { stub 'result1', :passed? => true }
       let(:result2) { stub 'result2', :passed? => true }
-      let(:verification_response) { ( { passing_resources: ['1', '2'], failing_resources: ['3', '4'] } ) }
+      let(:verification_response) { ( { resources: [{ id: '3', status: 0}, { id: '4', status: 0}], passing: true } ) }
 
       before do
         resources.should_receive(:load_all).and_return ['resource1', 'resource2']
@@ -135,9 +135,9 @@ describe Outliers::Evaluation do
         resources.should_receive(:verify).with('test_verification?', nil).and_return verification_response
         Outliers::Result.should_receive(:new).with(account_name:      'test_account_1',
                                                    arguments:         [],
-                                                   failing_resources: ['3','4'],
+                                                   resources:         [{ id: '3', status: 0}, { id: '4', status: 0}],
                                                    name:              'test',
-                                                   passing_resources: ['1','2'],
+                                                   passing:           true,
                                                    provider_name:     'aws_ec2',
                                                    resource_name:     'security_group',
                                                    verification_name: 'test_verification?').and_return result1
@@ -148,9 +148,9 @@ describe Outliers::Evaluation do
         resources.should_receive(:verify).with('test_verification?', ['test123']).and_return verification_response
         Outliers::Result.should_receive(:new).with(account_name:      'test_account_1',
                                                    arguments:         ['test123'],
-                                                   failing_resources: ['3','4'],
+                                                   resources:         [{ id: '3', status: 0}, { id: '4', status: 0}],
                                                    name:              'test',
-                                                   passing_resources: ['1','2'],
+                                                   passing:           true,
                                                    provider_name:     'aws_ec2',
                                                    resource_name:     'security_group',
                                                    verification_name: 'test_verification?').and_return result1
@@ -161,9 +161,9 @@ describe Outliers::Evaluation do
         resources.should_receive(:verify).with('test_verification?', ['arg']).and_return verification_response
         Outliers::Result.should_receive(:new).with(account_name:      'test_account_1',
                                                    arguments:         ['arg'],
-                                                   failing_resources: ['3','4'],
+                                                   resources:         [{ id: '3', status: 0}, { id: '4', status: 0}],
                                                    name:              'test',
-                                                   passing_resources: ['1','2'],
+                                                   passing:           true,
                                                    provider_name:     'aws_ec2',
                                                    resource_name:     'security_group',
                                                    verification_name: 'test_verification?').and_return result1
@@ -180,17 +180,17 @@ describe Outliers::Evaluation do
         resources.should_receive(:verify).with('test_verification2?', ['arg2']).and_return verification_response
         Outliers::Result.should_receive(:new).with(account_name:      'test_account_1',
                                                    arguments:         ['arg1'],
-                                                   failing_resources: ['3','4'],
+                                                   resources:         [{ id: '3', status: 0}, { id: '4', status: 0}],
                                                    name:              'test',
-                                                   passing_resources: ['1','2'],
+                                                   passing:           true,
                                                    provider_name:     'aws_ec2',
                                                    resource_name:     'security_group',
                                                    verification_name: 'test_verification1?').and_return result1
         Outliers::Result.should_receive(:new).with(account_name:      'test_account_1',
                                                    arguments:         ['arg2'],
-                                                   failing_resources: ['3','4'],
+                                                   resources:         [{ id: '3', status: 0}, { id: '4', status: 0}],
                                                    name:              'test',
-                                                   passing_resources: ['1','2'],
+                                                   passing:           true,
                                                    provider_name:     'aws_ec2',
                                                    resource_name:     'security_group',
                                                    verification_name: 'test_verification2?').and_return result2

data/spec/info_spec.rb

@@ -42,7 +42,7 @@ describe Outliers::Info do
 
   context "#shared" do
     before do
-      @verifications = Outliers::Verifications::Shared.instance_methods.map {|m| m.to_s.chomp('?')}
+      @verifications = Outliers::Verifications::Shared::Collection.instance_methods.map {|m| m.to_s.chomp('?')}
     end
 
     it "should be able to load shared.yaml" do

data/spec/results_spec.rb

@@ -7,9 +7,10 @@ describe Outliers::Result do
   context "passing" do
     subject { Outliers::Result.new account_name:      'cnt',
                                    arguments:         ['test123'],
-                                   failing_resources: [],
                                    name:              'evalme',
-                                   passing_resources: [resource1, resource2],
+                                   resources:         [{ id: 'resource1', status: 0 },
+                                                       { id: 'resource1', status: 0 }],
+                                   passing:           true,
                                    provider_name:     'aws',
                                    resource_name:     'instance',
                                    verification_name: 'vpc' }
@@ -22,16 +23,14 @@ describe Outliers::Result do
       expect(subject.failed?).to be_false
     end
 
-    it "should return the result information" do
-      expect(subject.passing_resources).to eq([resource1, resource2])
-    end
-
-
     it "should return the result information" do
       expect(subject.account_name).to eq('cnt')
-      expect(subject.failing_resources).to eq([])
+      expect(subject.resources).to eq([{ id: 'resource1', status: 0 },
+                                       { id: 'resource1', status: 0 }])
       expect(subject.name).to eq('evalme')
-      expect(subject.passing_resources).to eq([resource1, resource2])
+      expect(subject.passing).to eq(true)
+      expect(subject.passed?).to eq(true)
+      expect(subject.failed?).to eq(false)
       expect(subject.provider_name).to eq('aws')
       expect(subject.resource_name).to eq('instance')
       expect(subject.verification_name).to eq('vpc')
@@ -47,28 +46,30 @@ describe Outliers::Result do
 
     context "#to_json" do
       it "should return the results as json" do
-        resources = [ { 'id' => 1, 'passing' => 1 }, { 'id' => 2, 'passing' => 1 } ]
         json =  { 'account_name'         => 'cnt',
                   'arguments'            => ['test123'],
                   'name'                 => 'evalme',
+                  'passing'              => true,
                   'provider_name'        => 'aws',
                   'resource_name'        => 'instance',
                   'verification_name'    => 'vpc',
-                  'resources'            => resources }.to_json
+                  'resources'            => [{ id: 'resource1', status: 0 },
+                                             { id: 'resource1', status: 0 }] }.to_json
         expect(subject.to_json).to eq(json)
       end
     end
 
     context "#to_hash" do
       it "should return the results as hash" do
-        resources = [ { 'id' => 1, 'passing' => 1 }, { 'id' => 2, 'passing' => 1 } ]
         hash =  { 'account_name'         => 'cnt',
                   'arguments'            => ['test123'],
                   'name'                 => 'evalme',
+                  'passing'              => true,
                   'provider_name'        => 'aws',
                   'resource_name'        => 'instance',
                   'verification_name'    => 'vpc',
-                  'resources'            => resources }
+                  'resources'            => [{ id: 'resource1', status: 0 },
+                                             { id: 'resource1', status: 0 }] }.to_hash
         expect(subject.to_hash).to eq(hash)
       end
     end

data/spec/run_spec.rb

@@ -93,26 +93,4 @@ describe Outliers::Run do
     end
   end
 
-  context "returning results" do
-    let(:result1) { Outliers::Result.new name: 'result1', passing_resources: [], failing_resources: [], verification_name: 'ver' }
-    let(:result2) { Outliers::Result.new name: 'result2', passing_resources: [], failing_resources: ['failed'], verification_name: 'ver' }
-
-    before do
-      subject.results << result1
-      subject.results << result2
-    end
-
-    describe "#passed" do
-      it "should return an array of all passing results" do
-        expect(subject.passing_results).to eq([result1])
-      end
-    end
-
-    describe "#failed" do
-      it "should return an array of all failing results" do
-        expect(subject.failing_results).to eq([result2])
-      end
-    end
-  end
-
 end

data/spec/verifications/shared_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Outliers::Verifications::Shared do
-  subject { Object.new.extend Outliers::Verifications::Shared }
+describe Outliers::Verifications::Shared::Collection do
+  subject { Object.new.extend Outliers::Verifications::Shared::Collection }
   let(:resource1) { stub "resource1", id: 'resource1' }
   let(:resource2) { stub "resource2", id: 'resource2' }
 
@@ -13,30 +13,35 @@ describe Outliers::Verifications::Shared do
   context "#none_exist?" do
     it "should be true if no resources returned" do
       subject.stub :list => []
-      expect(subject.none_exist?).to eq([])
+      expect(subject.none_exist?).
+        to eq({ resources: [], passing: true })
     end
 
-    it "should be false if  resources returned" do
-      subject.stub :list_by_key => ['resource1']
-      subject.stub :list => ['resource1']
-      expect(subject.none_exist?).to eq(['resource1'])
+    it "should be false if resource returned" do
+      subject.stub :list_by_key => ['resource1'], :list => [resource1]
+      expect(subject.none_exist?).
+        to eq({ resources: [{ id: 'resource1', status:2 }], passing: false })
     end
   end
 
   context "#equals?" do
-    it "should verify the list of resources equals the list of keys and return no failing reosurces" do
+    it "should return passing true if the list matches" do
       subject.stub :list_by_key => ['resource1'], :list => [resource1]
-      expect(subject.equals?(['resource1'])).to eq([])
+      expect(subject.equals?('resource1')).
+        to eq({ resources: [{ id: 'resource1', status:2 }], passing: true })
     end
 
-    it "should verify the list of resources equals the single key and return no failing resources" do
-      subject.stub :list_by_key => ['resource1'], :list => [resource1]
-      expect(subject.equals?('resource1')).to eq([])
+    it "should return passing false if the resources do match the given list" do
+      subject.stub :list_by_key => ['resource1', 'resource2'], :list => [resource1, resource2]
+      expect(subject.equals?('resource1')).
+        to eq({ resources: [{ id: 'resource1', status:2 },
+                            { id: 'resource2', status:2 }], passing: false })
     end
 
-    it "should return resources which do not match the given list" do
-      subject.stub :list_by_key => ['resource1', 'resource2'], :list => [resource1, resource2]
-      expect(subject.equals?('resource1')).to eq([resource2])
+    it "should return passing false if the list is empty" do
+      subject.stub :list_by_key => [], :list => []
+      expect(subject.equals?('resource1')).
+        to eq({ resources: [], passing: false })
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: outliers
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,8 @@ files:
 - lib/outliers/result.rb
 - lib/outliers/run.rb
 - lib/outliers/verifications.rb
-- lib/outliers/verifications/shared.rb
+- lib/outliers/verifications/collection/shared.rb
+- lib/outliers/verifications/shared/collection.rb
 - lib/outliers/version.rb
 - outliers.gemspec
 - reference.yaml

data/lib/outliers/verifications/shared.rb

@@ -1,17 +0,0 @@
-module Outliers
-  module Verifications
-    module Shared
-
-      def none_exist?
-        list
-      end
-
-      def equals?(args)
-        keys = Array(args)
-        logger.debug "Verifying '#{keys.join(',')}' equals '#{list.empty? ? 'no resources' : list_by_key.join(',')}'."
-        list.reject {|r| keys.include? r.id}
-      end
-
-    end
-  end
-end