Check for multiple patterns in convertible? method

Author: kpaulisse

lib/octocatalog-diff/catalog-util/fileresources.rb

@@ -32,9 +32,7 @@ def self.convert_file_resources(obj, environment = 'production')
       # @return [String] File system path to referenced file
       def self.file_path(src_in, modulepaths)
         valid_sources = [src_in].flatten.select { |line| line =~ %r{\Apuppet:///modules/([^/]+)/(.+)} }
-        unless valid_sources.any?
-          raise ArgumentError, "Bad parameter source #{src_in}"
-        end
+        return unless valid_sources.any?
 
         valid_sources.each do |src|
           src =~ %r{\Apuppet:///modules/([^/]+)/(.+)}
@@ -129,9 +127,14 @@ def self.resource_convertible?(resource)
                        !resource['parameters'].nil? && \
                        resource['parameters'].key?('source') && \
                        !resource['parameters'].key?('content') && \
-                       resource['parameters']['source'] =~ %r{^puppet:///modules/([^/]+)/(.+)}
+                       valid_sources?(resource)
+
         false
       end
+
+      def self.valid_sources?(resource)
+        [resource['parameters']['source']].flatten.select { |line| line =~ %r{\Apuppet:///modules/([^/]+)/(.+)} }.any?
+      end
     end
   end
 end

spec/octocatalog-diff/tests/catalog-util/fileresources_spec.rb

@@ -14,13 +14,6 @@ def catalog_from_fixture(path)
   end
 
   describe '#file_path' do
-    it 'should raise ArgumentError for unexpected format of file name' do
-      src = 'asldfkjwoeifjslakfj'
-      expect do
-        OctocatalogDiff::CatalogUtil::FileResources.file_path(src, [])
-      end.to raise_error(ArgumentError, /Bad parameter source/)
-    end
-
     it 'should return path if file is found' do
       allow(File).to receive(:exist?).and_call_original
       allow(File).to receive(:exist?).with('/a/foo/files/bar').and_return(true)
@@ -62,18 +55,14 @@ def catalog_from_fixture(path)
       expect(result).to be_nil
     end
 
-    it 'should raise an error if the only entry is malformed' do
+    it 'should return nil if the only entry is malformed' do
       tries = 'sddfsdfsdf'
-      expect do
-        OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])
-      end.to raise_error(ArgumentError, /Bad parameter source/)
+      expect(OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])).to be_nil
     end
 
-    it 'should raise an error if the all entries are malformed' do
+    it 'should return nil if the all entries are malformed' do
       tries = %w[sddfsdfsdf asdfasfdasdf]
-      expect do
-        OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])
-      end.to raise_error(ArgumentError, /Bad parameter source/)
+      expect(OctocatalogDiff::CatalogUtil::FileResources.file_path(tries, ['/a'])).to be_nil
     end
   end