deas-nm 0.2.0 → 0.3.0

data/deas-nm.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency("assert", ["~> 2.12"])
 
-  gem.add_dependency("deas", ["~> 0.28"])
+  gem.add_dependency("deas", ["~> 0.29"])
   gem.add_dependency("nm",   ["~> 0.4"])
 
 end

data/lib/deas-nm.rb

@@ -28,21 +28,21 @@ module Deas::Nm
       @nm_serializer ||= (self.opts['serializer'] || DEFAULT_SERIALIZER)
     end
 
-    def render(template_name, view_handler, locals)
+    def render(template_name, view_handler, locals, &content)
       self.nm_serializer.call(
         self.nm_source.render(template_name, render_locals(view_handler, locals)),
         template_name
       )
     end
 
-    def partial(template_name, locals)
+    def partial(template_name, locals, &content)
       self.nm_serializer.call(
         self.nm_source.render(template_name, locals),
         template_name
       )
     end
 
-    def capture_partial(template_name, locals, &content)
+    def compile(template_name, compiled_content)
       raise NotImplementedError
     end
 

data/lib/deas-nm/version.rb

@@ -1,4 +1,4 @@
 module Deas; end
 module Deas::Nm
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/system/template_engine_tests.rb

@@ -0,0 +1,39 @@
+require 'assert'
+require 'deas-nm'
+
+class Deas::Nm::TemplateEngine
+
+  class SystemTests < Assert::Context
+    desc "Deas::Nm::TemplateEngine"
+    setup do
+      @view = OpenStruct.new({
+        :identifier => Factory.integer,
+        :name => Factory.string
+      })
+      @locals = { 'local1' => Factory.string }
+
+      @engine = Deas::Nm::TemplateEngine.new({
+        'source_path' => TEST_SUPPORT_PATH,
+        'serializer' => proc{ |obj, template_name| obj.to_s }
+      })
+    end
+    subject{ @engine }
+
+    should "render nm template files and serialize them" do
+      exp = Factory.template_json_rendered(subject, @view, @locals).to_s
+      assert_equal exp, subject.render('template.json', @view, @locals)
+    end
+
+    should "render nm partials and serialize them" do
+      exp = Factory.partial_json_rendered(subject, @locals).to_s
+      assert_equal exp, subject.partial('_partial.json', @locals)
+    end
+
+    should "render nm templates that render partials and serialize them" do
+      exp = Factory.template_partial_json_rendered(subject, @view, @locals).to_s
+      assert_equal exp, subject.render('template_partial.json', @view, @locals)
+    end
+
+  end
+
+end

data/test/unit/template_engine_tests.rb

@@ -17,7 +17,7 @@ class Deas::Nm::TemplateEngine
 
     should have_imeths :nm_source, :nm_handler_local, :nm_logger_local
     should have_imeths :nm_serializer
-    should have_imeths :render, :partial, :capture_partial
+    should have_imeths :render, :partial, :compile
 
     should "be a Deas template engine" do
       assert_kind_of Deas::TemplateEngine, subject
@@ -54,53 +54,12 @@ class Deas::Nm::TemplateEngine
       assert_equal obj, subject.nm_serializer.call(obj, Factory.string)
     end
 
-    should "render nm template files and serialize them" do
-      engine = Deas::Nm::TemplateEngine.new({
-        'source_path' => TEST_SUPPORT_PATH,
-        'serializer' => proc{ |obj, template_name| obj.to_s }
-      })
-      view_handler = OpenStruct.new({
-        :identifier => Factory.integer,
-        :name => Factory.string
-      })
-      locals = { 'local1' => Factory.string }
-      exp = Factory.template_json_rendered(engine, view_handler, locals).to_s
-
-      assert_equal exp, engine.render('template.json', view_handler, locals)
-    end
-
-    should "render nm partials and serialize them" do
-      engine = Deas::Nm::TemplateEngine.new({
-        'source_path' => TEST_SUPPORT_PATH,
-        'serializer' => proc{ |obj, template_name| obj.to_s }
-      })
-      locals = { 'local1' => Factory.string }
-      exp = Factory.partial_json_rendered(engine, locals).to_s
-
-      assert_equal exp, engine.partial('_partial.json', locals)
-    end
-
-    should "not implement the engine capture partial method" do
+    should "not implement the engine compile method" do
       assert_raises NotImplementedError do
-        subject.capture_partial('_partial.json', {})
+        subject.compile('_partial.json', Factory.text)
       end
     end
 
-    should "render nm templates that render partials and serialize them" do
-      engine = Deas::Nm::TemplateEngine.new({
-        'source_path' => TEST_SUPPORT_PATH,
-        'serializer' => proc{ |obj, template_name| obj.to_s }
-      })
-      view_handler = OpenStruct.new({
-        :identifier => Factory.integer,
-        :name => Factory.string
-      })
-      locals = { 'local1' => Factory.string }
-      exp = Factory.template_partial_json_rendered(engine, view_handler, locals).to_s
-
-      assert_equal exp, engine.render('template_partial.json', view_handler, locals)
-    end
-
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas-nm
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-25 00:00:00 Z
+date: 2015-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -39,11 +39,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
-        - 28
-        version: "0.28"
+        - 29
+        version: "0.29"
   type: :runtime
   name: deas
   version_requirements: *id002
@@ -88,6 +88,7 @@ files:
 - test/support/factory.rb
 - test/support/template.json.nm
 - test/support/template_partial.json.nm
+- test/system/template_engine_tests.rb
 - test/unit/template_engine_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/deas-nm
@@ -129,4 +130,5 @@ test_files:
 - test/support/factory.rb
 - test/support/template.json.nm
 - test/support/template_partial.json.nm
+- test/system/template_engine_tests.rb
 - test/unit/template_engine_tests.rb