nm 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  data.tar.gz: a775f8cf829f10a9890879b5a8f227da85eca3a7
+  metadata.gz: 43d84fe3504eccd6241abaf2a1842d511410323d
+SHA512: 
+  data.tar.gz: 049217416ebbbc9e98bc3a464ceff8e35111929eb6c9a1b06655a1e1abfa90cddbb5c9d63648d80f3996539828fe93ade692f66377267f5adc899c7cc40b287d
+  metadata.gz: de20fcd9575520aec65cc71137448b32ba1fcb129399222f1086e14af899493ca6e6f454622b23c52f86be0b7e95dfe6a61fa77fffa9bd20e6b472a96f06e778

data/Gemfile

@@ -2,12 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake'
-gem 'pry'
+gem 'pry', "~> 0.9.0"
 gem "whysoslow"
-
 gem 'rabl'
-
-platform :rbx do
-  gem 'rubysl'
-end

data/README.md

@@ -125,8 +125,7 @@ This will render the same output as above.
 
 ### Markup Aliases
 
-If you find you need to use a local named `node` or `map`, these markup methods are aliased as
-`n`, `_node`, `m`, and `_map` respectively.  Any combination of aliases is valid:
+If you find you need to use a local named `node` or `map`, the markup methods are aliased as `n`, `_node`, `m`, and `_map` respectively.  Any combination of aliases is valid:
 
 ```ruby
 node 'slideshow' do

data/lib/nm.rb

@@ -1,5 +1,4 @@
 require "nm/version"
 require 'nm/source'
 
-module Nm
-end
+module Nm; end

data/lib/nm/source.rb

@@ -5,8 +5,6 @@ module Nm
 
   class Source
 
-    EXT = ".nm"
-
     attr_reader :root, :cache, :template_class
 
     def initialize(root, opts = nil)
@@ -29,22 +27,22 @@ module Nm
       end
     end
 
-    def render(file_name, locals = nil)
-      @template_class.new(self, source_file_path(file_name), locals || {}).__data__
+    def render(template_name, locals = nil)
+      @template_class.new(self, source_file_path(template_name), locals || {}).__data__
     end
 
     alias_method :partial, :render
 
     private
 
-    def source_file_path(file_name)
-      self.root.join("#{file_name}#{EXT}").to_s
+    def source_file_path(template_name)
+      Dir.glob(self.root.join("#{template_name}*")).first
     end
 
     class NullCache
-      def [](file_name);         end
-      def []=(file_name, value); end
-      def keys; [];              end
+      def [](template_name);         end
+      def []=(template_name, value); end
+      def keys; [];                  end
     end
 
   end

data/lib/nm/version.rb

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

data/nm.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version     = Nm::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.description = %q{Data templating system.}
   gem.summary     = %q{Data templating system.}
+  gem.description = %q{Data templating system.}
   gem.homepage    = "http://github.com/redding/nm"
   gem.license     = 'MIT'
 
@@ -21,6 +21,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.12"])
+  gem.add_development_dependency("assert", ["~> 2.15.1"])
 
 end

data/test/support/templates/locals_alt.inem

@@ -0,0 +1,3 @@
+node 'locals' do
+  node 'key', key
+end

data/test/unit/source_tests.rb

@@ -12,10 +12,6 @@ class Nm::Source
     end
     subject{ @source_class }
 
-    should "know its extension" do
-      assert_equal ".nm", subject::EXT
-    end
-
   end
 
   class InitTests < UnitTests
@@ -88,19 +84,19 @@ class Nm::Source
   class RenderTests < InitTests
     desc "`render` method"
     setup do
-      @file_name = "locals"
+      @template_name = ['locals', 'locals_alt'].choice
       @file_locals = { 'key' => 'a-value' }
-      @file_path = Factory.template_file("#{@file_name}#{@source_class::EXT}")
+      @file_path = Dir.glob("#{Factory.template_file(@template_name)}*").first
     end
 
-    should "render a template for the given file name and return its data" do
+    should "render a template for the given template name and return its data" do
       exp = Nm::Template.new(subject, @file_path, @file_locals).__data__
-      assert_equal exp, subject.render(@file_name, @file_locals)
+      assert_equal exp, subject.render(@template_name, @file_locals)
     end
 
     should "alias `render` as `partial`" do
-      exp = subject.render(@file_name, @file_locals)
-      assert_equal exp, subject.partial(@file_name, @file_locals)
+      exp = subject.render(@template_name, @file_locals)
+      assert_equal exp, subject.partial(@template_name, @file_locals)
     end
 
   end

data/test/unit/template_tests.rb

@@ -137,7 +137,7 @@ class Nm::Template
     setup do
       @source = Nm::Source.new(Factory.template_root)
 
-      @obj_file_name = "obj"
+      @obj_template_name = "obj"
       @obj = {
         'obj' => {
           'a' => 'Aye',
@@ -146,7 +146,7 @@ class Nm::Template
         }
       }
 
-      @list_file_name = "list"
+      @list_template_name = "list"
       @list = [
         { '1' => 1 },
         { '2' => 2 },
@@ -159,23 +159,23 @@ class Nm::Template
   class RenderMethodTests < RenderTests
     desc "`render` method"
 
-    should "render a template for the given file name and add its data" do
+    should "render a template for the given template name and add its data" do
       t = Nm::Template.new(@source)
-      assert_equal @obj, t.__render__(@obj_file_name).__data__
+      assert_equal @obj, t.__render__(@obj_template_name).__data__
     end
 
     should "be aliased as `render`, `_render` and `r`" do
       t = Nm::Template.new(@source)
-      assert_equal @obj, t.__render__(@obj_file_name).__data__
+      assert_equal @obj, t.__render__(@obj_template_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @obj, t.render(@obj_file_name).__data__
+      assert_equal @obj, t.render(@obj_template_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @obj, t._render(@obj_file_name).__data__
+      assert_equal @obj, t._render(@obj_template_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @obj, t.r(@obj_file_name).__data__
+      assert_equal @obj, t.r(@obj_template_name).__data__
     end
 
     should "merge if call returns an obj and called after a `__node__` call" do
@@ -183,14 +183,14 @@ class Nm::Template
       t.__node__('1', 'One')
 
       exp = {'1' => 'One'}.merge(@obj)
-      assert_equal exp, t.__render__(@obj_file_name).__data__
+      assert_equal exp, t.__render__(@obj_template_name).__data__
     end
 
     should "complain if call returns an obj and called after a `__map__` call" do
       t = Nm::Template.new(@source)
       t.__map__([1,2,3])
       assert_raises Nm::InvalidError do
-        t.__render__(@obj_file_name).__data__
+        t.__render__(@obj_template_name).__data__
       end
     end
 
@@ -199,7 +199,7 @@ class Nm::Template
       t.__map__([1,2,3])
 
       exp = [1,2,3].concat(@list)
-      assert_equal exp, t.__render__(@list_file_name).__data__
+      assert_equal exp, t.__render__(@list_template_name).__data__
     end
 
     should "complain if call returns a list and called after a `__node__` call" do
@@ -207,7 +207,7 @@ class Nm::Template
       t.__node__('1', 'One')
 
       assert_raises Nm::InvalidError do
-        t.__render__(@list_file_name).__data__
+        t.__render__(@list_template_name).__data__
       end
     end
 
@@ -216,33 +216,33 @@ class Nm::Template
   class PartialMethodTests < RenderTests
     desc "`partial` method"
     setup do
-      @partial_obj_file_name = "_obj"
+      @partial_obj_template_name = "_obj"
       @partial_obj = {
         'a' => 'Aye',
         'b' => 'Bee',
         'c' => 'See'
       }
-      @partial_list_file_name = "_list"
+      @partial_list_template_name = "_list"
       @partial_list = @list
     end
 
     should "render a template for the given partial name and add its data" do
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t.__partial__(@partial_obj_file_name).__data__
+      assert_equal @partial_obj, t.__partial__(@partial_obj_template_name).__data__
     end
 
     should "be aliased as `render`, `_render` and `r`" do
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t.__partial__(@partial_obj_file_name).__data__
+      assert_equal @partial_obj, t.__partial__(@partial_obj_template_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t.partial(@partial_obj_file_name).__data__
+      assert_equal @partial_obj, t.partial(@partial_obj_template_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t._partial(@partial_obj_file_name).__data__
+      assert_equal @partial_obj, t._partial(@partial_obj_template_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t.p(@partial_obj_file_name).__data__
+      assert_equal @partial_obj, t.p(@partial_obj_template_name).__data__
     end
 
     should "merge if call returns an obj and called after a `__node__` call" do
@@ -250,14 +250,14 @@ class Nm::Template
       t.__node__('1', 'One')
 
       exp = {'1' => 'One'}.merge(@partial_obj)
-      assert_equal exp, t.__partial__(@partial_obj_file_name).__data__
+      assert_equal exp, t.__partial__(@partial_obj_template_name).__data__
     end
 
     should "complain if call returns an obj and called after a `__map__` call" do
       t = Nm::Template.new(@source)
       t.__map__([1,2,3])
       assert_raises Nm::InvalidError do
-        t.__partial__(@partial_obj_file_name).__data__
+        t.__partial__(@partial_obj_template_name).__data__
       end
     end
 
@@ -266,7 +266,7 @@ class Nm::Template
       t.__map__([1,2,3])
 
       exp = [1,2,3].concat(@partial_list)
-      assert_equal exp, t.__partial__(@partial_list_file_name).__data__
+      assert_equal exp, t.__partial__(@partial_list_template_name).__data__
     end
 
     should "complain if call returns a list and called after a `__node__` call" do
@@ -274,7 +274,7 @@ class Nm::Template
       t.__node__('1', 'One')
 
       assert_raises Nm::InvalidError do
-        t.__partial__(@partial_list_file_name).__data__
+        t.__partial__(@partial_list_template_name).__data__
       end
     end
 

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nm
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,23 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-19 00:00:00 Z
+date: 2016-04-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: assert
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+        version: 2.15.1
   type: :development
-  name: assert
   version_requirements: *id001
-  prerelease: false
 description: Data templating system.
 email: 
 - kelly@kellyredding.com
@@ -46,9 +35,8 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
-- Rakefile
 - lib/nm.rb
 - lib/nm/ext.rb
 - lib/nm/source.rb
@@ -64,6 +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/obj.nm
 - test/unit/ext_tests.rb
 - test/unit/source_tests.rb
@@ -72,35 +61,28 @@ files:
 homepage: http://github.com/redding/nm
 licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - &id002 
+    - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id002
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Data templating system.
 test_files: 
 - test/helper.rb
@@ -111,6 +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/obj.nm
 - test/unit/ext_tests.rb
 - test/unit/source_tests.rb

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"