lib/eco/data/files/directory.rb in eco-helpers-0.7.2 vs lib/eco/data/files/directory.rb in eco-helpers-0.8.1

@@ -24,12 +24,12 @@
 
         def full_path
           File.expand_path(@dir_path)
         end
 
-        def dir_files(file: nil, file_pattern: dir_pattern)
-          find = !!file ? file_pattern(file) : dir_pattern
+        def dir_files(file: nil, pattern: dir_pattern)
+          find = !!file ? file_pattern(file) : file_pattern(pattern)
           Dir.glob(find)
         end
 
         def newest_file(files_list = nil, file: nil)
           files_list = files_list || dir_files(file: file)
@@ -74,11 +74,16 @@
           false
         end
 
         private
 
-        def file_pattern(filename)
-          Files::FilePattern.new(filename).pattern(@dir_path)
+        def file_pattern(value)
+          case value
+          when Files::FilePattern
+            value
+          else
+            Files::FilePattern.new(value).pattern(@dir_path)
+          end
         end
 
         def dir_pattern
           Files::FilePattern.new.pattern(@dir_path)
         end