Add helper method for Cask fixture paths and refactor CaskLoader.

1 files changed, 7 insertions, 8 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/cask_loader.rb b/Library/Homebrew/cask/lib/hbc/cask_loader.rb
index 8fce9636a..5660992da 100644
--- a/Library/Homebrew/cask/lib/hbc/cask_loader.rb
+++ b/Library/Homebrew/cask/lib/hbc/cask_loader.rb
@@ -147,14 +147,6 @@ module Hbc
       end
     end
 
-    def self.load_from_file(path)
-      FromPathLoader.new(path).load
-    end
-
-    def self.load_from_string(content)
-      FromContentLoader.new(content).load
-    end
-
     def self.path(ref)
       self.for(ref).path
     end
@@ -164,6 +156,13 @@ module Hbc
     end
 
     def self.for(ref)
+      if ref.respond_to?(:to_str)
+        content = ref.to_str
+        if content.match?(/\A\s*cask\s+(?:"[^"]*"|'[^']*')\s+do(?:\s+.*\s+|;?\s+)end\s*\Z/)
+          return FromContentLoader.new(content)
+        end
+      end
+
       [
         FromInstanceLoader,
         FromURILoader,