deas 0.39.1 → 0.39.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 40c06c9abe6319b8a305e93a7bb35f7c95c19f59
-  metadata.gz: 729cdbc8fe0b139bfd9bb658973db6ce5dad3759
+  metadata.gz: a00b252a65f50835be12b3dfaa0250f7604daaa4
+  data.tar.gz: 8e0056e396f5f24f9d65f5422d8f418eb01e567c
 SHA512: 
-  data.tar.gz: d1f0fae5c0d80f44947512440190a909f48f2c76020733c15c162275b4bf39519c1742b3827d9fe5247e3ce20073dbc73da897d9c32ba79ac1aa04e665cbce67
-  metadata.gz: d81acf2bfc07224d4406852a74669ae7ae4227e38857243cc4c2fc1aa76c6e57d60926989c8ab89b5bcd1eb296d5a2c46c652e6c06230ccd57ae147da6097115
+  metadata.gz: 01bff2c3747cf37a17ab7840bc2e332889a0acf0c436b3a9c62531cbfb83f123e1ce80ca6654bec9217b35b44106469ce76040332cbde6cd34a633563847b858
+  data.tar.gz: 2465addcff960eab76c8d9a0fa71b3105574d00b84b703461fcf7b22fda388452b8f86dafc35e0406d7f6e2382c6be1988796e7964122ed9e10e993252ea51e2

data/Gemfile

@@ -2,7 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake', "~> 10.4.0"
-gem 'pry',  "~> 0.9.0"
-
-gem 'rack-test'
+gem 'pry', "~> 0.9.0"

data/deas.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version     = Deas::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.description = %q{Handler-based web framework powered by Sinatra}
   gem.summary     = %q{Handler-based web framework powered by Sinatra}
+  gem.description = %q{Handler-based web framework powered by Sinatra}
   gem.homepage    = "http://github.com/redding/deas"
   gem.license     = 'MIT'
 
@@ -18,12 +18,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency("much-plugin", ["~> 0.1"])
-  gem.add_dependency("ns-options",  ["~> 1.1", ">= 1.1.4"])
+  gem.add_development_dependency("assert",           ["~> 2.15.1"])
+  gem.add_development_dependency("assert-rack-test", ["~> 1.0.3"])
+
+  gem.add_dependency("much-plugin", ["~> 0.1.0"])
+  gem.add_dependency("ns-options",  ["~> 1.1.6"])
   gem.add_dependency("rack",        ["~> 1.1"])
   gem.add_dependency("sinatra",     ["~> 1.2"])
 
-  gem.add_development_dependency("assert", ["~> 2.15"])
-  gem.add_development_dependency("assert-rack-test")
-
 end

data/lib/deas/template_engine.rb

@@ -30,11 +30,10 @@ module Deas
   class NullTemplateEngine < TemplateEngine
 
     def render(template_name, view_handler, locals, &content)
-      template_file = self.source_path.join(template_name).to_s
-      unless File.exists?(template_file)
-        raise ArgumentError, "template file `#{template_file}` does not exist"
+      if (path = Dir.glob(self.source_path.join("#{template_name}*")).first).nil?
+        raise ArgumentError, "template file `#{path}` does not exist"
       end
-      File.read(template_file)
+      File.read(path)
     end
 
     def partial(template_name, locals, &content)

data/lib/deas/template_source.rb

@@ -19,12 +19,12 @@ module Deas
         'default_template_source' => self
       }
       @engines = Hash.new{ |h, k| Deas::NullTemplateEngine.new(@default_engine_opts) }
-      @ext_cache = Hash.new do |hash, template_name|
-        paths = Dir.glob("#{File.join(@path, template_name.to_s)}.*")
-        paths = paths.reject{ |p| !@engines.keys.include?(parse_ext(p)) }
-        if !(ext = parse_ext(paths.first.to_s)).nil?
-          hash[template_name] = ext
-        end
+      @ext_lists = Hash.new do |hash, template_name|
+        # An ext list is an array of non-template-name extensions that have engines
+        # configured.  The first ext in the list is the most precedent. Its engine
+        # is used to do the initial render from the named template file. Any
+        # further exts are used to compile rendered content from upsteam engines.
+        hash[template_name] = parse_ext_list(template_name)
       end
     end
 
@@ -41,34 +41,39 @@ module Deas
       @engines.keys.include?(ext)
     end
 
-    def engine_for_template?(template_name)
-      self.engine_for?(get_template_ext(template_name))
-    end
-
     def render(template_name, view_handler, locals, &content)
       [ view_handler.layouts,
         template_name
       ].flatten.reverse.inject(content) do |render_proc, name|
-        proc{ get_engine(name).render(name, view_handler, locals, &render_proc) }
+        proc do
+          compile(name) do |engine|
+            engine.render(name, view_handler, locals, &render_proc)
+          end
+        end
       end.call
     end
 
     def partial(template_name, locals, &content)
-      get_engine(template_name).partial(template_name, locals, &content)
+      compile(template_name) do |engine|
+        engine.partial(template_name, locals, &content)
+      end
     end
 
     private
 
-    def get_engine(template_name)
-      @engines[get_template_ext(template_name)]
-    end
-
-    def get_template_ext(template_name)
-      @ext_cache[template_name]
+    def compile(name)
+      ext_list = @ext_lists[name].dup
+      ext_list.inject(yield @engines[ext_list.shift]) do |content, ext|
+        @engines[ext].compile(name, content)
+      end
     end
 
-    def parse_ext(template_name)
-      File.extname(template_name)[1..-1]
+    def parse_ext_list(template_name)
+      no_ext_path = "#{File.join(@path, template_name.to_s)}."
+      path = Dir.glob("#{no_ext_path}*").first || ''
+      path.sub(no_ext_path, '').split('.').reverse.reject do |ext|
+        !self.engine_for?(ext)
+      end
     end
 
   end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.39.1"
+  VERSION = "0.39.2"
 end

data/test/support/template-compiled1.test.json

@@ -0,0 +1 @@
+This is a json template for use in template source/engine tests.

data/test/support/template-compiled2.json.test

@@ -0,0 +1 @@
+This is a json template for use in template source/engine tests.

data/test/unit/template_engine_tests.rb

@@ -86,25 +86,21 @@ class Deas::TemplateEngine
     end
 
     should "read and return the given path in its source path on `render`" do
-      exists_file = 'test/support/template.json'
-      exp = File.read(subject.source_path.join(exists_file).to_s)
-      assert_equal exp, subject.render(exists_file, @v, @l)
+      template = 'test/support/template'
+      exp = File.read(Dir.glob(subject.source_path.join("#{template}*")).first)
+      assert_equal exp, subject.render(template, @v, @l)
     end
 
     should "call `render` to implement its `partial` method" do
-      exists_file = 'test/support/template.json'
-      exp = subject.render(exists_file, nil, @l)
-      assert_equal exp, subject.partial(exists_file, @l)
+      template = 'test/support/template'
+      exp = subject.render(template, nil, @l)
+      assert_equal exp, subject.partial(template, @l)
     end
 
     should "complain if given a path that does not exist in its source path" do
-      no_exists_file = '/does/not/exists'
-      assert_raises ArgumentError do
-        subject.render(no_exists_file, @v, @l)
-      end
-      assert_raises ArgumentError do
-        subject.partial(no_exists_file, @l)
-      end
+      template = '/does/not/exists'
+      assert_raises(ArgumentError){ subject.render(template, @v, @l) }
+      assert_raises(ArgumentError){ subject.partial(template, @l) }
     end
 
     should "return any given content with its `compile` method" do

data/test/unit/template_source_tests.rb

@@ -26,7 +26,7 @@ class Deas::TemplateSource
     subject{ @source }
 
     should have_readers :path, :engines
-    should have_imeths :engine, :engine_for?, :engine_for_template?
+    should have_imeths :engine, :engine_for?
     should have_imeths :render, :partial
 
     should "know its path" do
@@ -90,17 +90,6 @@ class Deas::TemplateSource
       assert_kind_of Deas::NullTemplateEngine, subject.engines['rb']
     end
 
-    should "know if it has an engine registered for a given template name" do
-      assert_false subject.engine_for?(Factory.string)
-      assert_false subject.engine_for?('test')
-      assert_false subject.engine_for_template?(Factory.string)
-      assert_false subject.engine_for_template?('test_template')
-
-      subject.engine 'test', @test_engine
-      assert_true subject.engine_for?('test')
-      assert_true subject.engine_for_template?('test_template')
-    end
-
   end
 
   class RenderOrPartialTests < InitTests
@@ -123,13 +112,21 @@ class Deas::TemplateSource
       assert_equal exp, subject.render('test_template', @v, @l)
     end
 
-    should "only try rendering template files its has engines for" do
+    should "only render the first template file matching the template name" do
       # there should be 2 files called "template" in `test/support` with diff
       # extensions
-      exp = 'render-json-engine'
+      exp = "render-json-engine on template\n"
       assert_equal exp, subject.render('template', @v, @l)
     end
 
+    should "compile multiple engine outputs if template has multi-engine exts" do
+      exp = "render-json-engine on template-compiled1\ncompile-test-engine"
+      assert_equal exp, subject.render('template-compiled1', @v, @l)
+
+      exp = "render-test-engine on template-compiled2\ncompile-json-engine"
+      assert_equal exp, subject.render('template-compiled2', @v, @l)
+    end
+
     should "use the null template engine when an engine can't be found" do
       assert_raises(ArgumentError) do
         subject.render(Factory.string, @v, @l)
@@ -157,17 +154,25 @@ class Deas::TemplateSource
     desc "when partial rendering a template"
 
     should "call `partial` on the configured engine" do
-      exp = "partial-test-engine\n"
+      exp = "partial-test-engine on test_template\n"
       assert_equal exp, subject.partial('test_template', @l)
     end
 
-    should "only try rendering template files its has engines for" do
+    should "only render the first template file matching the template name" do
       # there should be 2 files called "template" in `test/support` with diff
       # extensions
-      exp = 'partial-json-engine'
+      exp = "partial-json-engine on template\n"
       assert_equal exp, subject.partial('template', @l)
     end
 
+    should "compile multiple engine outputs if template has multi-engine exts" do
+      exp = "partial-json-engine on template-compiled1\ncompile-test-engine"
+      assert_equal exp, subject.partial('template-compiled1', @l)
+
+      exp = "partial-test-engine on template-compiled2\ncompile-json-engine"
+      assert_equal exp, subject.partial('template-compiled2', @l)
+    end
+
     should "use the null template engine when an engine can't be found" do
       assert_raises(ArgumentError) do
         subject.partial(Factory.string, @l)
@@ -195,26 +200,25 @@ class Deas::TemplateSource
 
   class TestEngine < Deas::TemplateEngine
     def render(template_name, view_handler, locals, &content)
-      "render-test-engine on #{template_name}\n" +
-      (content || proc{}).call.to_s
+      "render-test-engine on #{template_name}\n" + (content || proc{}).call.to_s
     end
     def partial(template_name, locals, &content)
-      "partial-test-engine\n" + (content || proc{}).call.to_s
+      "partial-test-engine on #{template_name}\n" + (content || proc{}).call.to_s
     end
-    def capture_partial(template_name, locals, &content)
-      'capture-partial-test-engine'
+    def compile(template_name, content)
+      "#{content}compile-test-engine"
     end
   end
 
   class JsonEngine < Deas::TemplateEngine
     def render(template_name, view_handler, locals, &content)
-      'render-json-engine'
+      "render-json-engine on #{template_name}\n" + (content || proc{}).call.to_s
     end
-    def partial(template_name, locals)
-      'partial-json-engine'
+    def partial(template_name, locals, &content)
+      "partial-json-engine on #{template_name}\n" + (content || proc{}).call.to_s
     end
-    def capture_partial(template_name, locals, &content)
-      'capture-partial-json-engine'
+    def compile(template_name, content)
+      "#{content}compile-json-engine"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  version: 0.39.1
+  version: 0.39.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,71 +10,68 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-02-23 00:00:00 Z
+date: 2016-04-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: much-plugin
+  name: assert
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.1"
-  type: :runtime
+        version: 2.15.1
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ns-options
+  name: assert-rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
-      - &id003 !ruby/object:Gem::Version 
-        version: "1.1"
-    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.4
-  type: :runtime
+        version: 1.0.3
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: much-plugin
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ns-options
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
-      - *id003
+      - !ruby/object:Gem::Version 
+        version: 1.1.6
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.2"
+        version: "1.1"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: assert
+  name: sinatra
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.15"
-  type: :development
+        version: "1.2"
+  type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: assert-rack-test
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id008 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id007
 description: Handler-based web framework powered by Sinatra
 email: 
 - kelly@kellyredding.com
@@ -90,7 +87,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - deas.gemspec
 - lib/deas.rb
 - lib/deas/deas_runner.rb
@@ -128,8 +124,10 @@ files:
 - test/support/routes.rb
 - test/support/show.html
 - test/support/show.json
-- test/support/template.erb
+- test/support/template-compiled1.test.json
+- test/support/template-compiled2.json.test
 - test/support/template.json
+- test/support/template.z.erb
 - test/support/test_layout1.test
 - test/support/test_layout2.test
 - test/support/test_template.test
@@ -167,10 +165,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id008
+  - &id007 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id008
+  - *id007
 requirements: []
 
 rubyforge_project: 
@@ -190,8 +191,10 @@ test_files:
 - test/support/routes.rb
 - test/support/show.html
 - test/support/show.json
-- test/support/template.erb
+- test/support/template-compiled1.test.json
+- test/support/template-compiled2.json.test
 - test/support/template.json
+- test/support/template.z.erb
 - test/support/test_layout1.test
 - test/support/test_layout2.test
 - test/support/test_template.test

data/Rakefile

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