tiltout 1.3.0 → 1.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tiltout (1.2.0)
+    tiltout (1.4.0)
       tilt (~> 1.3)
 
 GEM

data/lib/tiltout.rb

@@ -27,8 +27,10 @@ require "tiltout/version"
 require "tiltout/partials"
 
 class Tiltout
+  attr_reader :paths
+
   def initialize(template_root, opt = {})
-    @template_root = template_root
+    @paths = Array(template_root)
     @cache = {} if !opt.key?(:cache) || opt[:cache]
     @layout = opt[:layout]
     @default_type = opt[:default_type] || "erb"
@@ -70,9 +72,13 @@ class Tiltout
 
   def find_file(name)
     return name[:file] if name.is_a?(Hash)
-    full_name = File.join(@template_root, name.to_s)
-    return full_name if cached?(full_name) || File.exists?(full_name)
-    File.join(@template_root, "#{name}.#{@default_type}")
+    paths.each do |path|
+      full_name = File.join(path, name.to_s)
+      return full_name if cached?(full_name) || File.exists?(full_name)
+      full_name = File.join(path, "#{name}.#{@default_type}")
+      return full_name if cached?(full_name) || File.exists?(full_name)
+    end
+    nil
   end
 
   def cache(name, template)

data/lib/tiltout/version.rb

@@ -24,5 +24,5 @@
 #++
 
 class Tiltout
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/test/tiltout_test.rb

@@ -32,19 +32,22 @@ module ViewHelper
 end
 
 describe Tiltout do
-  before { @root = "/dolt/views" }
+  before do
+    @root = "/dolt/views"
+    File.stubs(:exists?).returns(false)
+  end
 
   def file_read
     File.respond_to?(:binread) ? :binread : :read
   end
 
   def fake_file(file, content)
-    File.stubs(:file_exists?).with(file).returns(true)
+    File.stubs(:exists?).with(file).returns(true)
     File.stubs(file_read).with(file).returns(content)
   end
 
   it "reads template from file" do
-    File.expects(file_read).with("/dolt/views/file.erb").returns("")
+    fake_file("/dolt/views/file.erb", "")
     renderer = Tiltout.new("/dolt/views")
     renderer.render(:file)
   end
@@ -222,4 +225,21 @@ Say it: <%= say_it %>, <%= do_it %>
       assert_equal "Chris is partial\n", renderer.render(:file)
     end
   end
+
+  describe "multiple view paths" do
+    it "uses the first available template" do
+      fake_file("/dolt/views/file.erb", "#1")
+      fake_file("/tlod/views/file.erb", "#2")
+      renderer = Tiltout.new(["/dolt/views", "/tlod/views"])
+
+      assert_equal "#1", renderer.render(:file)
+    end
+
+    it "uses only available template" do
+      fake_file("/tlod/views/file.erb", "#2")
+      renderer = Tiltout.new(["/dolt/views", "/tlod/views"])
+
+      assert_equal "#2", renderer.render(:file)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiltout
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt