Rename method and make code more efficient

Author: Kevin Paulisse

lib/octocatalog-diff/catalog.rb

@@ -190,7 +190,7 @@ def validate_references
         @options[:validate_references].each do |r|
           next unless x.key?('parameters')
           next unless x['parameters'].key?(r)
-          missing_resources = remove_existing_resources(x['parameters'][r])
+          missing_resources = resources_missing_from_catalog(x['parameters'][r])
           next unless missing_resources.any?
           missing << missing_resources.map { |missing_target| { source: x, target_type: r, target_value: missing_target } }
         end
@@ -222,20 +222,18 @@ def validate_references
 
     private
 
-    # Private method: Determine if a catalog contains resource or resources, which may
-    # have been passed in as an array or a string. Return the references to resources
-    # that are missing from the catalog. (An empty array would indicate all references
-    # are present.)
+    # Private method: Given a list of resources to check, return the references from
+    # that list that are missing from the catalog. (An empty array returned would indicate
+    # all references are present in the catalog.)
     # @param resources_to_check [String / Array] Resources to check
     # @return [Array] References that are missing from catalog
-    def remove_existing_resources(resources_to_check)
-      rtc_array = resources_to_check.is_a?(Array) ? resources_to_check : [resources_to_check]
-      rtc_array.map do |res|
+    def resources_missing_from_catalog(resources_to_check)
+      [resources_to_check].flatten.select do |res|
         unless res =~ /\A([\w:]+)\[(.+)\]\z/
           raise ArgumentError, "Resource #{res} is not in the expected format"
         end
-        resource(type: Regexp.last_match(1), title: Regexp.last_match(2)).nil? ? res : nil
-      end.compact
+        resource(type: Regexp.last_match(1), title: Regexp.last_match(2)).nil?
+      end
     end
 
     # Private method: Choose backend based on passed-in options

spec/octocatalog-diff/tests/catalog_spec.rb

@@ -410,7 +410,7 @@
 end
 
 describe OctocatalogDiff::Catalog do
-  describe '#remove_existing_resources' do
+  describe '#resources_missing_from_catalog' do
     let(:catalog) do
       opts = {
         compare_file_text: false,
@@ -422,30 +422,30 @@
 
     it 'should raise error if resource is not in expected format' do
       test_arg = ['Foo-Bar']
-      expect { catalog.send(:remove_existing_resources, test_arg) }.to raise_error(ArgumentError, /Resource Foo-Bar /)
+      expect { catalog.send(:resources_missing_from_catalog, test_arg) }.to raise_error(ArgumentError, /Resource Foo-Bar /)
     end
 
     it 'should return full array when no matches' do
       allow(catalog).to receive(:resource).with(type: 'Foo', title: 'bar').and_return(nil)
       allow(catalog).to receive(:resource).with(type: 'Baz', title: 'biff').and_return(nil)
       test_arg = ['Foo[bar]', 'Baz[biff]']
-      result = catalog.send(:remove_existing_resources, test_arg)
+      result = catalog.send(:resources_missing_from_catalog, test_arg)
       expect(result).to eq(['Foo[bar]', 'Baz[biff]'])
     end
 
     it 'should remove matching entries' do
       allow(catalog).to receive(:resource).with(type: 'Foo', title: 'bar').and_return(nil)
       allow(catalog).to receive(:resource).with(type: 'Baz', title: 'biff').and_return(true)
       test_arg = ['Foo[bar]', 'Baz[biff]']
-      result = catalog.send(:remove_existing_resources, test_arg)
+      result = catalog.send(:resources_missing_from_catalog, test_arg)
       expect(result).to eq(['Foo[bar]'])
     end
 
     it 'should return empty array with all matches' do
       allow(catalog).to receive(:resource).with(type: 'Foo', title: 'bar').and_return(true)
       allow(catalog).to receive(:resource).with(type: 'Baz', title: 'biff').and_return(true)
       test_arg = ['Foo[bar]', 'Baz[biff]']
-      result = catalog.send(:remove_existing_resources, test_arg)
+      result = catalog.send(:resources_missing_from_catalog, test_arg)
       expect(result).to eq([])
     end
   end