vanity 2.0.0.beta6 → 2.0.0.beta7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vanity (2.0.0.beta6)
+    vanity (2.0.0.beta7)
       i18n
 
 GEM

data/gemfiles/rails32.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta6)
+    vanity (2.0.0.beta7)
       i18n
 
 GEM

data/gemfiles/rails4.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta6)
+    vanity (2.0.0.beta7)
       i18n
 
 GEM

data/gemfiles/rails41.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .././
   specs:
-    vanity (2.0.0.beta6)
+    vanity (2.0.0.beta7)
       i18n
 
 GEM

data/gemfiles/rails42.gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (2.0.0.beta6)
+    vanity (2.0.0.beta7)
       i18n
 
 GEM

data/lib/vanity/templates.rb

@@ -1,7 +1,7 @@
 module Vanity
   class Templates
     def initialize
-      @template_directory = load_paths.find { |dir| File.exists?(dir) }
+      @template_directory = determine_template_directory
     end
 
     # Path to template.
@@ -11,8 +11,20 @@ module Vanity
 
     private
 
-    def load_paths
-      [Vanity.playground.custom_templates_path, gem_templates_path].compact
+    def determine_template_directory
+      if custom_template_path_valid?
+        Vanity.playground.custom_templates_path
+      else
+        gem_templates_path
+      end
+    end
+
+    # Check to make sure we set a custome path, it exists, and there are non-
+    # dotfiles in the directory.
+    def custom_template_path_valid?
+      Vanity.playground.custom_templates_path &&
+        File.exists?(Vanity.playground.custom_templates_path) &&
+        !Dir[File.join(Vanity.playground.custom_templates_path, '*')].empty?
     end
 
     def gem_templates_path

data/lib/vanity/version.rb

@@ -1,5 +1,5 @@
 module Vanity
-  VERSION = "2.0.0.beta6"
+  VERSION = "2.0.0.beta7"
 
   module Version
     version = VERSION.to_s.split(".").map { |i| i.to_i }

data/test/templates_test.rb

@@ -28,5 +28,19 @@ describe Vanity::Templates do
         FileUtils.rm_rf(custom_view_path)
       end
     end
+
+    it "ignores an empty view directory" do
+      begin
+        custom_view_path = File.expand_path(File.join(Rails.root, 'app', 'views', 'vanity'))
+        FileUtils.mkpath(custom_view_path)
+
+        gem_view_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'vanity', 'templates'))
+        expected = File.join(gem_view_path, 'foo.html')
+
+        assert_equal expected, Vanity::Templates.new.path('foo.html')
+      ensure
+        FileUtils.rm_rf(custom_view_path)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanity
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta6
+  version: 2.0.0.beta7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -205,7 +205,7 @@ licenses:
 post_install_message: To get started run vanity --help
 rdoc_options:
 - --title
-- Vanity 2.0.0.beta6
+- Vanity 2.0.0.beta7
 - --main
 - README.rdoc
 - --webcvs