liquidizer 0.4.2 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/lib/liquidizer/liquid_template.rb

@@ -10,13 +10,15 @@ module Liquidizer
       end
 
       def find_default_by_name(name)
-        file_name = File.join(Liquidizer.template_path, name) + '.liquid'
+        Liquidizer.template_paths.each do |path|
+          file_name = File.join(path, name) + '.liquid'
 
-        if File.exist?(file_name)
-          new(:name => name, :content => File.read(file_name))
-        else
-          nil
+          if File.exist?(file_name)
+            return new(:name => name, :content => File.read(file_name))
+          end
         end
+
+        nil
       end
     end
   end

data/lib/liquidizer.rb

@@ -4,7 +4,8 @@ require 'liquidizer/liquid_template'
       
 module Liquidizer
   # The path the default liquid templates are stored.
-  mattr_accessor :template_path
+  mattr_accessor :template_paths
+  self.template_paths = []
 
   # Module for drops. When instance variable is passed to a template, it's wrapped with a drop.
   # This is a module the drops are looked up. If nil, the drops are looked up in the global
@@ -12,6 +13,6 @@ module Liquidizer
   mattr_accessor :drop_module
 
   if defined?(Rails)
-    self.template_path = "#{Rails.root}/db/liquid_templates"
+    self.template_paths << "#{Rails.root}/db/liquid_templates"
   end
 end

data/liquidizer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{liquidizer}
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Cig\303\241nek"]
@@ -35,6 +35,9 @@ Gem::Specification.new do |s|
      "test/fixtures/comments/_stuff.html.erb",
      "test/fixtures/comments/index.html.erb",
      "test/fixtures/layouts/layout.html.erb",
+     "test/fixtures/path_one/template_one.liquid",
+     "test/fixtures/path_two/template_one.liquid",
+     "test/fixtures/path_two/template_two.liquid",
      "test/fixtures/posts/index.liquid",
      "test/fixtures/posts/show.html.erb",
      "test/fixtures/ratings/edit.html.erb",

data/test/fixtures/path_one/template_one.liquid

@@ -0,0 +1 @@
+Default template one in path one

data/test/fixtures/path_two/template_one.liquid

@@ -0,0 +1 @@
+Default template one in path two

data/test/fixtures/path_two/template_two.liquid

@@ -0,0 +1 @@
+Default template two in path two

data/test/liquid_template_test.rb

@@ -3,6 +3,11 @@ require File.dirname(__FILE__) + '/test_helper'
 class LiquidTemplateTest < ActiveSupport::TestCase
   def setup
     LiquidTemplate.delete_all
+    @old_template_paths = Liquidizer.template_paths
+  end
+
+  def teardown
+    Liquidizer.template_paths = @old_template_paths
   end
 
   test 'find_by_name finds template by name if it exists' do
@@ -19,6 +24,17 @@ class LiquidTemplateTest < ActiveSupport::TestCase
     assert_equal expected_content, found.content
   end
 
+  test 'find_by_name searches template in all template paths' do
+    Liquidizer.template_paths = [File.dirname(__FILE__) + '/fixtures/path_one',
+                                 File.dirname(__FILE__) + '/fixtures/path_two']
+
+    expected_one = File.read(File.dirname(__FILE__) + '/fixtures/path_one/template_one.liquid')
+    expected_two = File.read(File.dirname(__FILE__) + '/fixtures/path_two/template_two.liquid')
+
+    assert_equal expected_one, LiquidTemplate.find_by_name('template_one').content
+    assert_equal expected_two, LiquidTemplate.find_by_name('template_two').content
+  end
+
   test 'find_by_name returns nil if not even default template exists' do
     assert_nil LiquidTemplate.find_by_name('ninjas!')
   end

data/test/test_helper.rb

@@ -10,7 +10,7 @@ $: << File.dirname(__FILE__) + '/../app/models'
 require 'liquidizer'
 require 'liquid_template'
 
-Liquidizer.template_path = File.dirname(__FILE__) + '/fixtures'
+Liquidizer.template_paths = [File.dirname(__FILE__) + '/fixtures']
 
 # Establish a temporary sqlite3 db for testing.
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - "Adam Cig\xC3\xA1nek"
@@ -60,6 +60,9 @@ files:
 - test/fixtures/comments/_stuff.html.erb
 - test/fixtures/comments/index.html.erb
 - test/fixtures/layouts/layout.html.erb
+- test/fixtures/path_one/template_one.liquid
+- test/fixtures/path_two/template_one.liquid
+- test/fixtures/path_two/template_two.liquid
 - test/fixtures/posts/index.liquid
 - test/fixtures/posts/show.html.erb
 - test/fixtures/ratings/edit.html.erb