deas-erubis 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 14a40f9a2156fb042ae7aefccadeb3e33f62c1b2
-  metadata.gz: 32bdec58016585f5f676dea9100fa80a30a236c5
+  metadata.gz: 05e87846e97f40eef052aca4ee79b73b030b94f6
+  data.tar.gz: e10a30275cb69eb9c806632f6c4f14a1eff92cd8
 SHA512: 
-  data.tar.gz: c03d7b4af3b4cfa33b44699bc976929274e35f537b4ac9d6fbdc0653c1022345db4d6ec019f9c53604f4e21ca79a52a9322068a870647aa4fe96605f09ff09b3
-  metadata.gz: 6943df339e7905f07f7bbe17356c4f7b5f6a3af65ad42d4754f894a5279f1a201ad09d6e936302d0106dcdcd28355ecbe63b4c8933a5060962dd370e9c2c0dc5
+  metadata.gz: 3126c4599310a15840838be33c4396349b5712fbaecbf6151ff2a81b300d5d1f677c3f873b50f5bb4c84c5f489ca0680d54b01c147acdd065052b3c9a4e578bb
+  data.tar.gz: 659d77c67276550f8942c06cfe7f6d6180f669fcaba94e635e4067f5f832813daf62eef516490d6a9a91b6b33fe5aafe0b8acd9c733127f5629344b437fe373a

data/deas-erubis.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency("assert", ["~> 2.15.1"])
 
-  gem.add_dependency("deas",        ["~> 0.39.2"])
+  gem.add_dependency("deas",        ["~> 0.40.0"])
   gem.add_dependency("erubis")
   gem.add_dependency("much-plugin", ["~> 0.1.0"])
 

data/lib/deas-erubis.rb

@@ -13,6 +13,7 @@ module Deas::Erubis
 
     def erb_source
       @erb_source ||= Source.new(self.source_path, {
+        :ext            => self.opts['ext'],
         :eruby          => self.opts['eruby'],
         :cache          => self.opts['cache'],
         :default_source => self.opts['default_template_source'],

data/lib/deas-erubis/source.rb

@@ -10,10 +10,11 @@ module Deas::Erubis
     BUFVAR_NAME   = '@_erb_buf'.freeze
     DEFAULT_ERUBY = ::Erubis::Eruby
 
-    attr_reader :root, :eruby_class, :cache, :context_class
+    attr_reader :root, :ext, :eruby_class, :cache, :context_class
 
     def initialize(root, opts)
       @root          = Pathname.new(root.to_s)
+      @ext           = opts[:ext] ? ".#{opts[:ext]}" : nil
       @eruby_class   = opts[:eruby] || DEFAULT_ERUBY
       @cache         = opts[:cache] ? Hash.new : NullCache.new
       @context_class = build_context_class(opts)
@@ -46,14 +47,20 @@ module Deas::Erubis
 
     def load(template_name)
       @cache[template_name] ||= begin
-        filename = source_file_path(template_name).to_s
-        content = File.send(File.respond_to?(:binread) ? :binread : :read, filename)
+        if (filename = source_file_path(template_name)).nil?
+          template_desc = "a template file named #{template_name.inspect}"
+          if !@ext.nil?
+            template_desc += " that ends in #{@ext.inspect}"
+          end
+          raise ArgumentError, "#{template_desc} does not exist"
+        end
+        content = File.send(File.respond_to?(:binread) ? :binread : :read, filename.to_s)
         template(filename, content)
       end
     end
 
-    def source_file_path(template_name)
-      Dir.glob(self.root.join("#{template_name}*")).first
+    def source_file_path(name)
+      Dir.glob(self.root.join(name.end_with?(@ext) ? name : "#{name}*#{@ext}")).first
     end
 
     def build_context_class(opts)

data/lib/deas-erubis/version.rb

@@ -1,4 +1,4 @@
 module Deas; end
 module Deas::Erubis
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/support/templates/view.aaa

@@ -0,0 +1,6 @@
+<%
+# This files is just to provide a conflict when rendering. If deas-nm isn't
+# passing an extension down to nm then nm will try and render this file which
+# will error.
+raise "oops - trying to render wrong template"
+%>

data/test/support/templates/with_capture_partial.erb

@@ -2,7 +2,7 @@
   <% capture_partial '_yield_partial', 'local1' => local1 do %>
     <span>some content</span>
   <% end %>
-  <% capture_partial '_partial', 'local1' => local1 %>
+  <% capture_partial '_partial1', 'local1' => local1 %>
   <% capture_partial '_partial_no_locals' %>
   <% source_capture_partial @default_source, '_partial_no_locals' %>
 </div>

data/test/support/templates/with_partial.erb

@@ -1,5 +1,5 @@
 <div>
-  <%= partial '_partial', 'local1' => local1 %>
+  <%= partial '_partial1', 'local1' => local1 %>
   <%= partial '_partial_no_locals' %>
   <%= source_partial @default_source, '_partial_no_locals' %>
 </div>

data/test/system/template_engine_tests.rb

@@ -15,7 +15,10 @@ class Deas::Erubis::TemplateEngine
       @locals  = { 'local1' => Factory.string }
       @content = Proc.new{ "<span>some content</span>" }
 
-      @engine = Deas::Erubis::TemplateEngine.new('source_path' => TEMPLATE_ROOT)
+      @engine = Deas::Erubis::TemplateEngine.new({
+        'source_path' => TEMPLATE_ROOT,
+        'ext'         => 'erb'
+      })
     end
     subject{ @engine }
 
@@ -31,7 +34,7 @@ class Deas::Erubis::TemplateEngine
 
     should "render partial templates" do
       exp = Factory.partial_erb_rendered(subject, @locals)
-      assert_equal exp, subject.partial('_partial', @locals)
+      assert_equal exp, subject.partial('_partial1', @locals)
     end
 
     should "render partial templates yielding to given content blocks" do

data/test/unit/source_tests.rb

@@ -30,13 +30,20 @@ class Deas::Erubis::Source
     end
     subject{ @source }
 
-    should have_readers :root, :eruby_class, :cache, :context_class
+    should have_readers :root, :ext, :eruby_class, :cache, :context_class
     should have_imeths :render, :compile, :template
 
     should "know its root" do
       assert_equal @root, subject.root.to_s
     end
 
+    should "know its extension for looking up source files" do
+      assert_nil subject.ext
+
+      source = @source_class.new(@root, :ext => 'erb')
+      assert_equal '.erb', source.ext
+    end
+
     should "default its eruby class" do
       assert_equal Deas::Erubis::Source::DEFAULT_ERUBY, subject.eruby_class
     end
@@ -145,6 +152,32 @@ class Deas::Erubis::Source
       assert_equal default_source, context_class.default_source
     end
 
+    should "only render templates with the matching ext if one is specified" do
+      source = @source_class.new(@root, :ext => 'erb')
+      file_path = Factory.template_file('basic.html.erb')
+      exp = Factory.basic_erb_rendered(@file_locals)
+      ['basic', 'basic.html', 'basic.html.erb'].each do |name|
+        assert_equal exp, source.render(name, @file_locals)
+      end
+
+      source = @source_class.new(@root, :ext => 'erubis')
+      file_path = Factory.template_file('basic_alt.erubis')
+      exp = Factory.basic_erb_rendered(@file_locals)
+      ['basic', 'basic_alt', 'basic_alt.erubis'].each do |name|
+        assert_equal exp, source.render(name, @file_locals)
+      end
+
+      source = @source_class.new(@root, :ext => 'erb')
+      ['basic_alt', 'basic_alt.erubis'].each do |name|
+        assert_raises(ArgumentError){ source.render(name, @file_locals) }
+      end
+
+      source = @source_class.new(@root, :ext => 'html')
+      ['basic', 'basic.html', 'basic.html.erb'].each do |name|
+        assert_raises(ArgumentError){ source.render(name, @file_locals) }
+      end
+    end
+
   end
 
   class RenderCacheTests < RenderTests

data/test/unit/template_engine_tests.rb

@@ -10,7 +10,8 @@ class Deas::Erubis::TemplateEngine
     desc "Deas::Erubis::TemplateEngine"
     setup do
       @engine = Deas::Erubis::TemplateEngine.new({
-        'source_path' => TEST_SUPPORT_PATH
+        'source_path' => TEST_SUPPORT_PATH,
+        'ext'         => 'erb'
       })
     end
     subject{ @engine }
@@ -39,6 +40,12 @@ class Deas::Erubis::TemplateEngine
       assert_kind_of Hash, engine.erb_source.cache
     end
 
+    should "pass any given ext option to its source" do
+      ext = Factory.string
+      engine = Deas::Erubis::TemplateEngine.new('ext' => ext)
+      assert_equal ".#{ext}", engine.erb_source.ext
+    end
+
     should "pass any given deas template source to its source" do
       default_source = 'a-default-source'
       source_opts = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deas-erubis
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-04-05 00:00:00 Z
+date: 2016-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -29,7 +29,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.39.2
+        version: 0.40.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -76,12 +76,13 @@ files:
 - log/.gitkeep
 - test/helper.rb
 - test/support/factory.rb
-- test/support/templates/_partial.erb
+- test/support/templates/_partial1.erb
 - test/support/templates/_partial_no_locals.erb
 - test/support/templates/_yield_partial.erb
 - test/support/templates/basic.html.erb
 - test/support/templates/basic_alt.erubis
 - test/support/templates/compile.erb
+- test/support/templates/view.aaa
 - test/support/templates/view.erb
 - test/support/templates/with_capture_partial.erb
 - test/support/templates/with_partial.erb
@@ -118,12 +119,13 @@ summary: Deas template engine for rendering erb templates using Erubis
 test_files: 
 - test/helper.rb
 - test/support/factory.rb
-- test/support/templates/_partial.erb
+- test/support/templates/_partial1.erb
 - test/support/templates/_partial_no_locals.erb
 - test/support/templates/_yield_partial.erb
 - test/support/templates/basic.html.erb
 - test/support/templates/basic_alt.erubis
 - test/support/templates/compile.erb
+- test/support/templates/view.aaa
 - test/support/templates/view.erb
 - test/support/templates/with_capture_partial.erb
 - test/support/templates/with_partial.erb