nm 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: a775f8cf829f10a9890879b5a8f227da85eca3a7
-  metadata.gz: 43d84fe3504eccd6241abaf2a1842d511410323d
+  metadata.gz: e31cf50f545fcddce9f04f39d6772210358f9873
+  data.tar.gz: 0f87cd5c7ebd8752c2a3f1d5dbb2ed8858ba9dfc
 SHA512: 
-  data.tar.gz: 049217416ebbbc9e98bc3a464ceff8e35111929eb6c9a1b06655a1e1abfa90cddbb5c9d63648d80f3996539828fe93ade692f66377267f5adc899c7cc40b287d
-  metadata.gz: de20fcd9575520aec65cc71137448b32ba1fcb129399222f1086e14af899493ca6e6f454622b23c52f86be0b7e95dfe6a61fa77fffa9bd20e6b472a96f06e778
+  metadata.gz: 925cdd2c049da6f0747999f372016e35b519572d6a0b12647f181cd6bbd8b2d5a3555e36b053d7b8f3a610c3459a65fd5bd7a950fef2e7a50934ec837627d743
+  data.tar.gz: 403c5c37f9271836fea0d3f2b0f9b2edc403336197d4e9e015812e5543214b9671468046e2f8bd846271cfce12f23ddbfba470793ee21cc293688e2fee86d7a2

data/lib/nm/source.rb

@@ -5,11 +5,12 @@ module Nm
 
   class Source
 
-    attr_reader :root, :cache, :template_class
+    attr_reader :root, :ext, :cache, :template_class
 
     def initialize(root, opts = nil)
       opts ||= {}
       @root  = Pathname.new(root.to_s)
+      @ext   = opts[:ext] ? ".#{opts[:ext]}" : nil
       @cache = opts[:cache] ? Hash.new : NullCache.new
 
       @template_class = Class.new(Template) do
@@ -28,15 +29,22 @@ module Nm
     end
 
     def render(template_name, locals = nil)
-      @template_class.new(self, source_file_path(template_name), locals || {}).__data__
+      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
+      @template_class.new(self, filename, locals || {}).__data__
     end
 
     alias_method :partial, :render
 
     private
 
-    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
 
     class NullCache

data/lib/nm/version.rb

@@ -1,3 +1,3 @@
 module Nm
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/unit/source_tests.rb

@@ -22,13 +22,21 @@ class Nm::Source
     end
     subject{ @source }
 
-    should have_readers :root, :cache, :template_class
+    should have_readers :root, :ext, :cache, :template_class
     should have_imeths :data, :render, :partial
 
     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
+
+      ext = Factory.string
+      source = @source_class.new(@root, :ext => ext)
+      assert_equal ".#{ext}", source.ext
+    end
+
     should "not cache templates by default" do
       assert_kind_of NullCache, subject.cache
     end
@@ -99,6 +107,32 @@ class Nm::Source
       assert_equal exp, subject.partial(@template_name, @file_locals)
     end
 
+    should "only render templates with the matching ext if one is specified" do
+      source = @source_class.new(@root, :ext => 'nm')
+      file_path = Factory.template_file('locals.nm')
+      exp = Nm::Template.new(source, file_path, @file_locals).__data__
+      ['locals', 'locals.nm'].each do |name|
+        assert_equal exp, source.render(name, @file_locals)
+      end
+
+      source = @source_class.new(@root, :ext => 'inem')
+      file_path = Factory.template_file('locals_alt.data.inem')
+      exp = Nm::Template.new(source, file_path, @file_locals).__data__
+      ['locals', 'locals_alt', 'locals_alt.data', 'locals_alt.data.inem'].each do |name|
+        assert_equal exp, source.render(name, @file_locals)
+      end
+
+      source = @source_class.new(@root, :ext => 'nm')
+      ['locals_alt', 'locals_alt.data', 'locals_alt.data.inem'].each do |name|
+        assert_raises(ArgumentError){ source.render(name, @file_locals) }
+      end
+
+      source = @source_class.new(@root, :ext => 'data')
+      ['locals_alt', 'locals_alt.data', 'locals_alt.data.inem'].each do |name|
+        assert_raises(ArgumentError){ source.render(name, @file_locals) }
+      end
+    end
+
   end
 
   class DefaultSource < UnitTests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nm
 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
@@ -52,7 +52,7 @@ files:
 - test/support/templates/aliases.nm
 - test/support/templates/list.nm
 - test/support/templates/locals.nm
-- test/support/templates/locals_alt.inem
+- test/support/templates/locals_alt.data.inem
 - test/support/templates/obj.nm
 - test/unit/ext_tests.rb
 - test/unit/source_tests.rb
@@ -93,7 +93,7 @@ test_files:
 - test/support/templates/aliases.nm
 - test/support/templates/list.nm
 - test/support/templates/locals.nm
-- test/support/templates/locals_alt.inem
+- test/support/templates/locals_alt.data.inem
 - test/support/templates/obj.nm
 - test/unit/ext_tests.rb
 - test/unit/source_tests.rb