nm 0.2.0 → 0.3.0

data/README.md

@@ -89,7 +89,7 @@ node 'slideshow' do
   node 'start_slide', start_slide
   node 'slides' do
     map slides do |slide|
-      partial 'slide.json', :slide => slide
+      partial '_slide.json', :slide => slide
     end
   end
 end

data/bench/slideshow_partials.nm

@@ -2,7 +2,7 @@ node 'slideshow' do
   node 'start_slide', view.start_slide
   node 'slides' do
     map view.slides do |slide|
-      partial 'slide', :slide => slide
+      partial '_slide', :slide => slide
     end
   end
 end

data/lib/nm/source.rb

@@ -21,9 +21,7 @@ module Nm
       Template.new(self, source_file_path(file_name), locals || {}).__data__
     end
 
-    def partial(file_name, locals = nil)
-      Template.new(self, partial_file_path(file_name), locals || {}).__data__
-    end
+    alias_method :partial, :render
 
     private
 
@@ -31,11 +29,6 @@ module Nm
       self.root.join("#{file_name}#{EXT}").to_s
     end
 
-    def partial_file_path(file_name)
-      basename = File.basename(file_name.to_s)
-      source_file_path(file_name.to_s.sub(/#{basename}\Z/, "_#{basename}"))
-    end
-
   end
 
   class DefaultSource < Source

data/lib/nm/version.rb

@@ -1,3 +1,3 @@
 module Nm
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/script/bench_all.rb

@@ -2,4 +2,5 @@
 
 require 'script/bench_rabl'
 require 'script/bench_nm'
+require 'script/bench_nm_partials'
 require 'script/bench_nm_re_source'

data/test/unit/source_tests.rb

@@ -56,19 +56,8 @@ class Nm::Source
       assert_equal exp, subject.render(@file_name, @file_locals)
     end
 
-  end
-
-  class PartialTests < InitTests
-    desc "`partial` method"
-
-    setup do
-      @file_name = "locals"
-      @file_locals = { 'key' => 'a-value' }
-      @file_path = Factory.template_file("_#{@file_name}#{Nm::Source::EXT}")
-    end
-
-    should "render a template for the given file name and return its data" do
-      exp = Nm::Template.new(subject, @file_path, @file_locals).__data__
+    should "alias `render` as `partial`" do
+      exp = subject.render(@file_name, @file_locals)
       assert_equal exp, subject.partial(@file_name, @file_locals)
     end
 

data/test/unit/template_tests.rb

@@ -216,31 +216,33 @@ class Nm::Template
   class PartialMethodTests < RenderTests
     desc "`partial` method"
     setup do
+      @partial_obj_file_name = "_obj"
       @partial_obj = {
         'a' => 'Aye',
         'b' => 'Bee',
         'c' => 'See'
       }
+      @partial_list_file_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__(@obj_file_name).__data__
+      assert_equal @partial_obj, t.__partial__(@partial_obj_file_name).__data__
     end
 
     should "be aliased as `render`, `_render` and `r`" do
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t.__partial__(@obj_file_name).__data__
+      assert_equal @partial_obj, t.__partial__(@partial_obj_file_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t.partial(@obj_file_name).__data__
+      assert_equal @partial_obj, t.partial(@partial_obj_file_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t._partial(@obj_file_name).__data__
+      assert_equal @partial_obj, t._partial(@partial_obj_file_name).__data__
 
       t = Nm::Template.new(@source)
-      assert_equal @partial_obj, t.p(@obj_file_name).__data__
+      assert_equal @partial_obj, t.p(@partial_obj_file_name).__data__
     end
 
     should "merge if call returns an obj and called after a `__node__` call" do
@@ -248,14 +250,14 @@ class Nm::Template
       t.__node__('1', 'One')
 
       exp = {'1' => 'One'}.merge(@partial_obj)
-      assert_equal exp, t.__partial__(@obj_file_name).__data__
+      assert_equal exp, t.__partial__(@partial_obj_file_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__(@obj_file_name).__data__
+        t.__partial__(@partial_obj_file_name).__data__
       end
     end
 
@@ -264,7 +266,7 @@ class Nm::Template
       t.__map__([1,2,3])
 
       exp = [1,2,3].concat(@partial_list)
-      assert_equal exp, t.__partial__(@list_file_name).__data__
+      assert_equal exp, t.__partial__(@partial_list_file_name).__data__
     end
 
     should "complain if call returns a list and called after a `__node__` call" do
@@ -272,7 +274,7 @@ class Nm::Template
       t.__node__('1', 'One')
 
       assert_raises Nm::InvalidError do
-        t.__partial__(@list_file_name).__data__
+        t.__partial__(@partial_list_file_name).__data__
       end
     end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nm
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,17 +16,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-04 00:00:00 Z
+date: 2014-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 10
         version: "2.10"
   type: :development
-  version_requirements: *id001
   name: assert
+  version_requirements: *id001
   prerelease: false
 description: Data templating system.
 email: 
@@ -79,28 +90,35 @@ 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: 
-  - *id002
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Data templating system.
 test_files: 
 - test/helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA512: 
-  metadata.gz: d389b30bc53c3293e4e428b9126c64838124a270d3f535ce360ca3cf984466537f2707a2c149b8ae3d1cbcb231f685a24af6b5ed41f12f0a2b22b7d207f2db09
-  data.tar.gz: 9be9ce99e660a80fe20d6e034de82511081b9ad00cf30dbd0b879ff2ec0ebb671279f30611572ffc00e7be77bea456af5d09b1108147f63a9e2c4d7da4e4d461
-SHA1: 
-  metadata.gz: 6e4b7a81896c762b7c9dea9b642f4eb3c4137967
-  data.tar.gz: 579835a684d21fde132b8ab12bd0423381629f44