nm 0.3.0 → 0.4.0

data/lib/nm/source.rb

@@ -7,10 +7,17 @@ module Nm
 
     EXT = ".nm"
 
-    attr_reader :root
+    attr_reader :root, :template_class
 
-    def initialize(root)
+    def initialize(root, locals = nil)
       @root = Pathname.new(root.to_s)
+      @template_class = Class.new(Template) do
+        (locals || {}).each{ |key, value| define_method(key){ value } }
+      end
+    end
+
+    def inspect
+      "#<#{self.class}:#{'0x0%x' % (object_id << 1)} @root=#{@root.inspect}>"
     end
 
     def data(file_path)
@@ -18,7 +25,7 @@ module Nm
     end
 
     def render(file_name, locals = nil)
-      Template.new(self, source_file_path(file_name), locals || {}).__data__
+      @template_class.new(self, source_file_path(file_name), locals || {}).__data__
     end
 
     alias_method :partial, :render

data/lib/nm/template.rb

@@ -10,21 +10,29 @@ module Nm
 
       # apply any given locals to template scope as methods
       metaclass = class << self; self; end
-      (args.last.kind_of?(::Hash) ? args.pop : {}).each do |key, value|
-        metaclass.class_eval{ define_method(key){ value } }
+      metaclass.class_eval do
+        (args.last.kind_of?(::Hash) ? args.pop : {}).each do |key, value|
+          define_method(key){ value }
+        end
       end
 
       source_file = args.last.kind_of?(::String) ? args.pop : ''
       @__source__ = args.last.kind_of?(Source) ? args.pop : DefaultSource.new
 
       return if source_file.empty?
-
-      unless File.exists?(source_file)
+      if !File.exists?(source_file)
         raise ArgumentError, "source file `#{source_file}` does not exist"
       end
+
       instance_eval(@__source__.data(source_file), source_file, 1)
     end
 
+    def inspect
+      "#<Template:#{@__source__.class}:#{'0x0%x' % (@__source__.object_id << 1)}"\
+      " @__source__.root=#{@__source__.root.to_s.inspect}"\
+      " __data__=#{self.__data__.inspect}>"
+    end
+
     def __data__
       @__dstack__.last
     end

data/lib/nm/version.rb

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

data/nm.gemspec

@@ -13,11 +13,14 @@ Gem::Specification.new do |gem|
   gem.homepage    = "http://github.com/redding/nm"
   gem.license     = 'MIT'
 
-  gem.files         = `git ls-files`.split($/)
+  gem_files = `git ls-files`.split($/)
+  gem_files -= gem_files.grep(%r{^(bench)/})
+  gem_files -= gem_files.grep(%r{^(script)/})
+  gem.files         = gem_files
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.10"])
+  gem.add_development_dependency("assert", ["~> 2.12"])
 
 end

data/test/unit/source_tests.rb

@@ -1,6 +1,8 @@
 require 'assert'
 require 'nm/source'
 
+require 'nm/template'
+
 class Nm::Source
 
   class UnitTests < Assert::Context
@@ -21,13 +23,26 @@ class Nm::Source
     end
     subject{ @source }
 
-    should have_readers :root
+    should have_readers :root, :template_class
     should have_imeths :data, :render, :partial
 
     should "know its root" do
       assert_equal @root, subject.root.to_s
     end
 
+    should "know its template class" do
+      assert_true subject.template_class < Nm::Template
+    end
+
+    should "optionally take and apply default locals to its template class" do
+      local_name, local_val = [Factory.string, Factory.string]
+      source = Nm::Source.new(@root, local_name => local_val)
+      template = source.template_class.new
+
+      assert_responds_to local_name, template
+      assert_equal local_val, template.send(local_name)
+    end
+
   end
 
   class DataTests < InitTests

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nm
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-12 00:00:00 Z
+date: 2014-11-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -24,11 +24,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 2
-        - 10
-        version: "2.10"
+        - 12
+        version: "2.12"
   type: :development
   name: assert
   version_requirements: *id001
@@ -49,19 +49,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bench/_slide.nm
-- bench/logger.rb
-- bench/results/nm.txt
-- bench/results/nm_partials.txt
-- bench/results/nm_re_source.txt
-- bench/results/rabl.txt
-- bench/runner.rb
-- bench/slideshow.nm
-- bench/slideshow.rabl
-- bench/slideshow.rb
-- bench/slideshow_partials.nm
-- bench/slideshow_partials.rb
-- bench/template.rb
 - lib/nm.rb
 - lib/nm/ext.rb
 - lib/nm/source.rb
@@ -69,11 +56,6 @@ files:
 - lib/nm/version.rb
 - log/.gitkeep
 - nm.gemspec
-- script/bench_all.rb
-- script/bench_nm.rb
-- script/bench_nm_partials.rb
-- script/bench_nm_re_source.rb
-- script/bench_rabl.rb
 - test/helper.rb
 - test/support/factory.rb
 - test/support/templates/_list.nm

data/bench/_slide.nm

@@ -1,5 +0,0 @@
-node 'id',    slide.id
-node 'title', slide.title
-node 'image', slide.image_url
-node 'thumb', slide.thumb_url
-node 'url',   slide.url

data/bench/logger.rb

@@ -1,36 +0,0 @@
-require 'bench/runner'
-
-module NmBench
-
-  class Logger
-
-    def initialize(file_path)
-      @file = File.open(file_path, 'w')
-      @ios = [@file, $stdout]
-      yield self
-      @file.close
-    end
-
-    def method_missing(meth, *args, &block)
-      @ios.each do |io|
-        io.respond_to?(meth.to_s) ? io.send(meth.to_s, *args, &block) : super
-      end
-    end
-
-    def respond_to?(*args)
-      @ios.first.respond_to?(args.first.to_s) ? true : super
-    end
-
-    def run_template(runner, name, *args)
-      GC.disable
-
-      Runner.run(runner, name, self, *args)
-      self.puts
-
-      GC.enable
-      GC.start
-    end
-
-  end
-
-end

data/bench/results/nm.txt

@@ -1,30 +0,0 @@
-Nm slideshow: 1 times
----------------------
-whysoslow? ..
-
-mem @ start             41 MB                   ??
-mem @ finish            41 MB                   +   0 MB,   0%
-
-         user     system   total    real
-time     0.0 ms   0.0 ms   0.0 ms   5.086 ms
-
-Nm slideshow: 10 times
-----------------------
-whysoslow? ..
-
-mem @ start             41 MB                   ??
-mem @ finish            54 MB                   +  13 MB,  32%
-
-          user      system    total     real
-time      40.0 ms   0.0 ms    40.0 ms   39.215 ms
-
-Nm slideshow: 100 times
------------------------
-whysoslow? ..
-
-mem @ start             54 MB                   ??
-mem @ finish            212 MB                  + 158 MB, 294%
-
-           user       system     total      real
-time       320.0 ms   60.0 ms    380.0 ms   379.717 ms
-

data/bench/results/nm_partials.txt

@@ -1,30 +0,0 @@
-Nm slideshow_partials: 1 times
-------------------------------
-whysoslow? ..
-
-mem @ start             41 MB                   ??
-mem @ finish            41 MB                   +   0 MB,   0%
-
-          user      system    total     real
-time      20.0 ms   0.0 ms    20.0 ms   20.947 ms
-
-Nm slideshow_partials: 10 times
--------------------------------
-whysoslow? ..
-
-mem @ start             41 MB                   ??
-mem @ finish            74 MB                   +  33 MB,  81%
-
-           user       system     total      real
-time       170.0 ms   30.0 ms    200.0 ms   196.232 ms
-
-Nm slideshow_partials: 100 times
---------------------------------
-whysoslow? ..
-
-mem @ start             50 MB                   ??
-mem @ finish            531 MB                  + 480 MB, 952%
-
-            user        system      total       real
-time        1640.0 ms   310.0 ms    1950.0 ms   1944.464 ms
-

data/bench/results/nm_re_source.txt

@@ -1,30 +0,0 @@
-Nm slideshow: 1 times
----------------------
-whysoslow? ..
-
-mem @ start             41 MB                   ??
-mem @ finish            41 MB                   +   0 MB,   0%
-
-         user     system   total    real
-time     0.0 ms   0.0 ms   0.0 ms   6.727 ms
-
-Nm slideshow: 10 times
-----------------------
-whysoslow? ..
-
-mem @ start             41 MB                   ??
-mem @ finish            51 MB                   +  10 MB,  23%
-
-          user      system    total     real
-time      40.0 ms   10.0 ms   50.0 ms   40.104 ms
-
-Nm slideshow: 100 times
------------------------
-whysoslow? ..
-
-mem @ start             50 MB                   ??
-mem @ finish            209 MB                  + 159 MB, 320%
-
-           user       system     total      real
-time       310.0 ms   60.0 ms    370.0 ms   376.581 ms
-

data/bench/results/rabl.txt

@@ -1,30 +0,0 @@
-RABL slideshow: 1 times
------------------------
-whysoslow? ..
-
-mem @ start             40 MB                   ??
-mem @ finish            40 MB                   +   0 MB,   0%
-
-          user      system    total     real
-time      10.0 ms   0.0 ms    10.0 ms   18.029 ms
-
-RABL slideshow: 10 times
-------------------------
-whysoslow? ..
-
-mem @ start             40 MB                   ??
-mem @ finish            85 MB                   +  45 MB, 112%
-
-           user       system     total      real
-time       170.0 ms   20.0 ms    190.0 ms   193.534 ms
-
-RABL slideshow: 100 times
--------------------------
-whysoslow? ..
-
-mem @ start             69 MB                   ??
-mem @ finish            458 MB                  + 389 MB, 565%
-
-            user        system      total       real
-time        1530.0 ms   190.0 ms    1720.0 ms   1720.782 ms
-

data/bench/runner.rb

@@ -1,84 +0,0 @@
-require 'whysoslow'
-require 'rabl'
-require 'nm'
-
-require 'bench/template'
-
-module NmBench
-
-  class Runner
-
-    attr_reader :result
-
-    RUNNERS = {}
-
-    def self.run(runner, *args)
-      RUNNERS[runner].new(*args).run
-    end
-
-    def initialize(printer_io, title, num_times, &run_proc)
-      @proc = proc do
-        num_times.times do
-          run_proc.call
-        end
-      end
-
-      @printer = Whysoslow::DefaultPrinter.new(printer_io, {
-        :title => "#{title}: #{num_times} times",
-        :verbose => true
-      })
-      @runner = Whysoslow::Runner.new(@printer)
-    end
-
-    def run
-      @runner.run &@proc
-    end
-
-  end
-
-  class RablRunner < Runner
-
-    RUNNERS[:rabl] = self
-
-    def initialize(template_name, printer_io, num_times = 10)
-      template = Template.find(template_name)
-      super(printer_io, "RABL #{template.name}", num_times) do
-        out = Rabl::Renderer.new(template.name, nil, {
-          :view_path => File.expand_path('..', __FILE__),
-          :locals    => template.locals,
-          :format    => 'hash'
-        }).render
-      end
-    end
-
-  end
-
-  class NmRunner < Runner
-
-    RUNNERS[:nm] = self
-
-    def initialize(template_name, printer_io, num_times = 10)
-      template = Template.find(template_name)
-      source = Nm::Source.new(File.expand_path('..', __FILE__))
-      super(printer_io, "Nm #{template.name}", num_times) do
-        out = source.render(template.name, template.locals)
-      end
-    end
-
-  end
-
-  class NmReSourceRunner < Runner
-
-    RUNNERS[:nm_re_source] = self
-
-    def initialize(template_name, printer_io, num_times = 10)
-      template = Template.find(template_name)
-      super(printer_io, "Nm #{template.name}", num_times) do
-        source = Nm::Source.new(File.expand_path('..', __FILE__))
-        out = source.render(template.name, template.locals)
-      end
-    end
-
-  end
-
-end

data/bench/slideshow.nm

@@ -1,12 +0,0 @@
-node 'slideshow' do
-  node 'start_slide', view.start_slide
-  node 'slides' do
-    map view.slides do |slide|
-      node 'id',    slide.id
-      node 'image', slide.image_url
-      node 'thumb', slide.thumb_url
-      node 'title', slide.title
-      node 'url',   slide.url
-    end
-  end
-end

data/bench/slideshow.rabl

@@ -1,5 +0,0 @@
-object locals[:view].slideshow => :slideshow
-attributes :start_slide
-child(:slides, :object_root => false, :root => :slides){
-  attributes :id, :title, :url, :image, :thumb
-}

data/bench/slideshow.rb

@@ -1,47 +0,0 @@
-require 'assert/factory'
-require 'bench/template'
-
-module NmBench
-
-  class SlideshowTemplate < Template
-
-    TEMPLATES[:slideshow] = self
-
-    def initialize
-      @name = 'slideshow'
-      @locals = { :view => View.new }
-    end
-
-    class View
-      attr_reader :start_slide, :slides
-
-      def initialize
-        @slides = (1..100).map{ |n| Slide.new(n) }
-        @start_slide = @slides.first.id
-      end
-
-      # for RABL template syntax needs
-      def slideshow
-        self
-      end
-    end
-
-    class Slide
-      attr_reader :id, :image_url, :thumb_url, :title, :url
-
-      def initialize(n)
-        @id = Assert::Factory.integer
-        @image_url = Assert::Factory.url
-        @thumb_url = Assert::Factory.url
-        @title = "Slide #{n}"
-        @url = Assert::Factory.url
-      end
-
-      # for RABL syntax needs
-      alias_method :image, :image_url
-      alias_method :thumb, :thumb_url
-    end
-
-  end
-
-end

data/bench/slideshow_partials.nm

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

data/bench/slideshow_partials.rb

@@ -1,17 +0,0 @@
-require 'assert/factory'
-require 'bench/slideshow'
-
-module NmBench
-
-  class SlideshowPartialsTemplate < SlideshowTemplate
-
-    TEMPLATES[:slideshow_partials] = self
-
-    def initialize
-      super
-      @name = 'slideshow_partials'
-    end
-
-  end
-
-end

data/bench/template.rb

@@ -1,16 +0,0 @@
-module NmBench
-
-  class Template
-
-    attr_reader :name, :locals
-
-    TEMPLATES = {}
-    require 'bench/slideshow'
-
-    def self.find(name)
-      TEMPLATES[name].new
-    end
-
-  end
-
-end

data/script/bench_all.rb

@@ -1,6 +0,0 @@
-# $ bundle exec ruby script/bench.rb
-
-require 'script/bench_rabl'
-require 'script/bench_nm'
-require 'script/bench_nm_partials'
-require 'script/bench_nm_re_source'

data/script/bench_nm.rb

@@ -1,13 +0,0 @@
-# $ bundle exec ruby script/bench.rb
-
-# require pry for debugging (`binding.pry`)
-require 'pry'
-
-require 'bench/logger'
-require 'bench/slideshow'
-
-NmBench::Logger.new('bench/results/nm.txt') do |logger|
-  logger.run_template(:nm, :slideshow, 1)
-  logger.run_template(:nm, :slideshow, 10)
-  logger.run_template(:nm, :slideshow, 100)
-end

data/script/bench_nm_partials.rb

@@ -1,13 +0,0 @@
-# $ bundle exec ruby script/bench.rb
-
-# require pry for debugging (`binding.pry`)
-require 'pry'
-
-require 'bench/logger'
-require 'bench/slideshow_partials'
-
-NmBench::Logger.new('bench/results/nm_partials.txt') do |logger|
-  logger.run_template(:nm, :slideshow_partials, 1)
-  logger.run_template(:nm, :slideshow_partials, 10)
-  logger.run_template(:nm, :slideshow_partials, 100)
-end

data/script/bench_nm_re_source.rb

@@ -1,13 +0,0 @@
-# $ bundle exec ruby script/bench.rb
-
-# require pry for debugging (`binding.pry`)
-require 'pry'
-
-require 'bench/logger'
-require 'bench/slideshow'
-
-NmBench::Logger.new('bench/results/nm_re_source.txt') do |logger|
-  logger.run_template(:nm_re_source, :slideshow, 1)
-  logger.run_template(:nm_re_source, :slideshow, 10)
-  logger.run_template(:nm_re_source, :slideshow, 100)
-end

data/script/bench_rabl.rb

@@ -1,13 +0,0 @@
-# $ bundle exec ruby script/bench.rb
-
-# require pry for debugging (`binding.pry`)
-require 'pry'
-
-require 'bench/logger'
-require 'bench/slideshow'
-
-NmBench::Logger.new('bench/results/rabl.txt') do |logger|
-  logger.run_template(:rabl, :slideshow, 1)
-  logger.run_template(:rabl, :slideshow, 10)
-  logger.run_template(:rabl, :slideshow, 100)
-end