deas 0.29.0 → 0.30.0

data/Gemfile

@@ -4,6 +4,4 @@ gemspec
 
 gem 'rake'
 gem 'pry', "~> 0.9.0"
-gem 'multi_json'
-gem 'yajl-ruby'
 gem 'rack-test'

data/deas.gemspec

@@ -24,6 +24,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency("assert", ["~> 2.12"])
   gem.add_development_dependency("assert-rack-test")
-  gem.add_development_dependency('haml')
 
 end

data/lib/deas/deas_runner.rb

@@ -18,6 +18,22 @@ module Deas
       response_data
     end
 
+    def render(template_name, locals = nil)
+      source_render(self.template_source, template_name, locals)
+    end
+
+    def source_render(source, template_name, locals = nil)
+      source.render(template_name, self.handler, locals || {})
+    end
+
+    def partial(template_name, locals = nil)
+      source_partial(self.template_source, template_name, locals)
+    end
+
+    def source_partial(source, template_name, locals = nil)
+      source.partial(template_name, locals || {})
+    end
+
     private
 
     def run_callbacks(callbacks)

data/lib/deas/runner.rb

@@ -30,14 +30,16 @@ module Deas
       @template_source = a[:template_source] || Deas::NullTemplateSource.new
     end
 
-    def halt(*args);         raise NotImplementedError; end
-    def redirect(*args);     raise NotImplementedError; end
-    def content_type(*args); raise NotImplementedError; end
-    def status(*args);       raise NotImplementedError; end
-    def headers(*args);      raise NotImplementedError; end
-    def render(*args);       raise NotImplementedError; end
-    def partial(*args);      raise NotImplementedError; end
-    def send_file(*args);    raise NotImplementedError; end
+    def halt(*args);           raise NotImplementedError; end
+    def redirect(*args);       raise NotImplementedError; end
+    def content_type(*args);   raise NotImplementedError; end
+    def status(*args);         raise NotImplementedError; end
+    def headers(*args);        raise NotImplementedError; end
+    def render(*args);         raise NotImplementedError; end
+    def source_render(*args);  raise NotImplementedError; end
+    def partial(*args);        raise NotImplementedError; end
+    def source_partial(*args); raise NotImplementedError; end
+    def send_file(*args);      raise NotImplementedError; end
 
     class NormalizedParams
 

data/lib/deas/server.rb

@@ -7,7 +7,6 @@ require 'deas/logging'
 require 'deas/router'
 require 'deas/show_exceptions'
 require 'deas/sinatra_app'
-require 'deas/template'
 require 'deas/template_source'
 
 module Deas; end
@@ -98,12 +97,6 @@ module Deas::Server
       self.router.routes
     end
 
-    def template_scope
-      Class.new(Deas::Template::Scope).tap do |klass|
-        klass.send(:include, *self.template_helpers)
-      end
-    end
-
   end
 
   def self.included(receiver)

data/lib/deas/sinatra_app.rb

@@ -30,7 +30,6 @@ module Deas
         set :show_exceptions,  false
 
         # custom settings
-        set :deas_template_scope,  server_config.template_scope
         set :deas_error_procs,     server_config.error_procs
         set :deas_default_charset, server_config.default_charset
         set :logger,               server_config.logger

data/lib/deas/sinatra_runner.rb

@@ -1,5 +1,4 @@
 require 'deas/deas_runner'
-require 'deas/template'
 
 module Deas
 
@@ -40,29 +39,9 @@ module Deas
       @sinatra_call.headers(*args)
     end
 
-    def render(template_name, opts = nil)
+    def source_render(source, template_name, locals = nil)
       self.content_type(get_content_type(template_name)) if self.content_type.nil?
-
-      options = opts || {}
-      options[:locals] = {
-        :view => self.handler,
-        :logger => self.logger
-      }.merge(options[:locals] || {})
-      options[:layout] = self.handler_class.layouts if !options.key?(:layout)
-
-      if self.template_source.engine_for?(template_name)
-        self.template_source.render(template_name, self.handler, options[:locals])
-      else
-        Deas::Template.new(@sinatra_call, template_name, options).render
-      end
-    end
-
-    def partial(template_name, locals = nil)
-      if self.template_source.engine_for?(template_name)
-        self.template_source.partial(template_name, locals || {})
-      else
-        Deas::Template::Partial.new(@sinatra_call, template_name, locals).render
-      end
+      super
     end
 
     def send_file(*args, &block)

data/lib/deas/template_source.rb

@@ -13,12 +13,19 @@ module Deas
 
     def initialize(path, logger = nil)
       @path = path.to_s
-      @default_opts = {
-        'source_path'          => @path,
-        'logger'               => logger || Deas::NullLogger.new,
-        'deas_template_source' => self
+      @default_engine_opts = {
+        'source_path'             => @path,
+        'logger'                  => logger || Deas::NullLogger.new,
+        'default_template_source' => self
       }
-      @engines = Hash.new{ |h,k| Deas::NullTemplateEngine.new(@default_opts) }
+      @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
+      end
     end
 
     def engine(input_ext, engine_class, registered_opts = nil)
@@ -26,12 +33,16 @@ module Deas
         raise DisallowedEngineExtError, "`#{input_ext}` is disallowed as an"\
                                         " engine extension."
       end
-      engine_opts = @default_opts.merge(registered_opts || {})
+      engine_opts = @default_engine_opts.merge(registered_opts || {})
       @engines[input_ext.to_s] = engine_class.new(engine_opts)
     end
 
-    def engine_for?(template_name)
-      @engines.keys.include?(get_template_ext(template_name))
+    def engine_for?(ext)
+      @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)
@@ -53,9 +64,7 @@ module Deas
     end
 
     def get_template_ext(template_name)
-      files = Dir.glob("#{File.join(@path, template_name.to_s)}.*")
-      files = files.reject{ |p| !@engines.keys.include?(parse_ext(p)) }
-      parse_ext(files.first.to_s || '')
+      @ext_cache[template_name]
     end
 
     def parse_ext(template_name)

data/lib/deas/test_runner.rb

@@ -75,15 +75,25 @@ module Deas
     end
     HeadersArgs = Struct.new(:value)
 
-    def render(template_name, options = nil, &block)
-      RenderArgs.new(template_name, options, block)
+    def render(template_name, locals = nil)
+      RenderArgs.new(template_name, locals)
     end
-    RenderArgs = Struct.new(:template_name, :options, :block)
+    RenderArgs = Struct.new(:template_name, :locals)
+
+    def source_render(source, template_name, locals = nil)
+      SourceRenderArgs.new(source, template_name, locals)
+    end
+    SourceRenderArgs = Struct.new(:source, :template_name, :locals)
 
     def partial(template_name, locals = nil)
       PartialArgs.new(template_name, locals)
     end
-    PartialArgs = Struct.new(:template_name, :locals)
+    PartialArgs = RenderArgs
+
+    def source_partial(source, template_name, locals = nil)
+      SourcePartialArgs.new(source, template_name, locals)
+    end
+    SourcePartialArgs = SourceRenderArgs
 
     def send_file(file_path, options = nil, &block)
       SendFileArgs.new(file_path, options, block)

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.29.0"
+  VERSION = "0.30.0"
 end

data/lib/deas/view_handler.rb

@@ -56,9 +56,11 @@ module Deas
       def status(*args);       @deas_runner.status(*args);       end
       def headers(*args);      @deas_runner.headers(*args);      end
 
-      def render(*args, &block);    @deas_runner.render(*args, &block);    end
-      def partial(*args, &block);   @deas_runner.partial(*args, &block);   end
-      def send_file(*args, &block); @deas_runner.send_file(*args, &block); end
+      def render(*args, &block);         @deas_runner.render(*args, &block);         end
+      def source_render(*args, &block);  @deas_runner.source_render(*args, &block);  end
+      def partial(*args, &block);        @deas_runner.partial(*args, &block);        end
+      def source_partial(*args, &block); @deas_runner.source_partial(*args, &block); end
+      def send_file(*args, &block);      @deas_runner.send_file(*args, &block);      end
 
       def logger;   @deas_runner.logger;   end
       def router;   @deas_runner.router;   end

data/test/support/fake_sinatra_call.rb

@@ -21,7 +21,6 @@ class FakeSinatraCall
     @template_source = Deas::NullTemplateSource.new
 
     @settings = OpenStruct.new({
-      :deas_template_scope => Deas::Template::Scope,
       :deas_default_charset => 'utf-8',
       :logger => @logger,
       :router => @router,
@@ -41,16 +40,6 @@ class FakeSinatraCall
   def status(*args);       args; end
   def headers(*args);      args; end
 
-  # return the template name for each nested calls
-  def erb(template_name, opts, &block)
-    if block
-      RenderArgs.new(template_name, opts, block.call)
-    else
-      RenderArgs.new(template_name, opts, nil)
-    end
-  end
-  RenderArgs = Struct.new(:template_name, :opts, :block_call_result)
-
   def send_file(file_path, opts, &block)
     if block
       SendFileArgs.new(file_path, opts, block.call)

data/test/support/routes.rb

@@ -32,13 +32,7 @@ class DeasTestServer
   post '/session',  'SetSessionHandler'
   get  '/session',  'UseSessionHandler'
 
-  get  '/with_layout',           'WithLayoutHandler'
-  get  '/haml_with_layout',      'HamlWithLayoutHandler'
-  get  '/with_haml_layout',      'WithHamlLayoutHandler'
-  get  '/haml_with_haml_layout', 'HamlWithHamlLayoutHandler'
-  get  '/partial.html',          'PartialHandler'
-
-  get '/handler/tests.json', 'HandlerTestsHandler'
+  get '/handler/tests', 'HandlerTestsHandler'
 
   redirect '/route_redirect',   '/somewhere'
   redirect('/:prefix/redirect'){ "/#{params['prefix']}/somewhere" }
@@ -72,7 +66,7 @@ class ShowHandler
   end
 
   def run!
-    render 'show'
+    @message
   end
 
 end
@@ -96,7 +90,6 @@ class ShowLatinJsonHandler
 
   def run!
     content_type :json, :charset => 'latin1'
-    render 'show_json'
   end
 
 end
@@ -106,7 +99,7 @@ class ShowTextHandler
 
   def run!
     hdrs = {'Content-Type' => 'text/plain'}
-    halt 200, hdrs, render('show.json')
+    halt 200, hdrs, ''
   end
 
 end
@@ -139,53 +132,6 @@ class ErrorHandler
 
 end
 
-class WithLayoutHandler
-  include Deas::ViewHandler
-  layouts 'layout1', 'layout2', 'layout3'
-
-  def run!
-    render 'with_layout'
-  end
-
-end
-
-class HamlWithLayoutHandler
-  include Deas::ViewHandler
-  layouts 'layout1'
-
-  def run!
-    render 'haml_with_layout'
-  end
-
-end
-
-class WithHamlLayoutHandler
-  include Deas::ViewHandler
-  layouts 'haml_layout1'
-
-  def run!
-    render 'with_layout'
-  end
-
-end
-
-class HamlWithHamlLayoutHandler
-  include Deas::ViewHandler
-  layouts 'haml_layout1'
-
-  def run!
-    render 'haml_with_layout'
-  end
-
-end
-
-class PartialHandler
-  include Deas::ViewHandler
-
-  def run!; partial '_info', :info => 'some-info'; end
-
-end
-
 class RedirectHandler
   include Deas::ViewHandler
 
@@ -234,8 +180,7 @@ class HandlerTestsHandler
   end
 
   def run!
-    require 'multi_json'
-    [200, {}, MultiJson.encode(@data)]
+    [200, {}, @data.inspect]
   end
 
 end

data/test/support/template.erb

@@ -1 +1 @@
-ERB Template Message: <%= view.message %>
+This is an erb template for use in template source/engine tests.

data/test/support/template.json

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

data/test/support/view_handlers.rb

@@ -1,3 +1,4 @@
+require 'deas/template_source'
 require 'deas/view_handler'
 
 class EmptyViewHandler
@@ -38,7 +39,16 @@ class RenderViewHandler
   include Deas::ViewHandler
 
   def run!
-    render "my_template", :some => :option
+    render "my_template", :some => 'local'
+  end
+end
+
+class SourceRenderViewHandler
+  include Deas::ViewHandler
+
+  def run!
+    source = Deas::TemplateSource.new(Factory.path)
+    source_render source, "my_template", :some => 'local'
   end
 end
 
@@ -46,7 +56,16 @@ class PartialViewHandler
   include Deas::ViewHandler
 
   def run!
-    partial "my_partial", :some => 'locals'
+    partial "my_partial", :some => 'local'
+  end
+end
+
+class SourcePartialViewHandler
+  include Deas::ViewHandler
+
+  def run!
+    source = Deas::TemplateSource.new(Factory.path)
+    source_partial source, "my_partial", :some => 'local'
   end
 end
 

data/test/system/rack_tests.rb

@@ -19,10 +19,9 @@ module Deas
     should "return a 200 response with a GET to '/show'" do
       get '/show', 'message' => 'this is a test'
 
-      expected_body = "show page: this is a test\n" \
-                      "Stuff: Show Info\n"
-      assert_equal 200,           last_response.status
-      assert_equal expected_body, last_response.body
+      assert_equal 200, last_response.status
+      exp = "this is a test"
+      assert_equal exp, last_response.body
     end
 
     should "set the content type appropriately" do
@@ -67,37 +66,6 @@ module Deas
       assert_equal "Oops, something went wrong", last_response.body
     end
 
-    should "render erb templates using layouts" do
-      get '/with_layout'
-      expected_body = "Layout 1\nLayout 2\nLayout 3\nWith Layouts View: WithLayoutHandler\n"
-      assert_equal 200,           last_response.status
-      assert_equal expected_body, last_response.body
-    end
-
-    should "render mixed (erb and other) templates using layouts" do
-      get '/haml_with_layout'
-      expected_body = "Layout 1\n<span>HamlWithLayoutHandler</span>\n"
-      assert_equal 200,           last_response.status
-      assert_equal expected_body, last_response.body
-
-      get '/with_haml_layout'
-      expected_body = "Layout 1\nWith Layouts View: WithHamlLayoutHandler\n"
-      assert_equal 200,           last_response.status
-      assert_equal expected_body, last_response.body
-
-      get '/haml_with_haml_layout'
-      expected_body = "Layout 1\n<span>HamlWithHamlLayoutHandler</span>\n"
-      assert_equal 200,           last_response.status
-      assert_equal expected_body, last_response.body
-    end
-
-    should "render partial templates" do
-      get '/partial.html'
-      expected_body = "Stuff: some-info\n"
-      assert_equal 200,           last_response.status
-      assert_equal expected_body, last_response.body
-    end
-
     should "return a 302 redirecting to the expected locations" do
       get '/redirect'
       expected_location = 'http://google.com'
@@ -146,18 +114,20 @@ module Deas
   class HandlerTests < RackTests
     desc "handler"
     setup do
-      get 'handler/tests.json?a-param=something'
+      get 'handler/tests?a-param=something'
 
-      require 'multi_json'
-      @data = MultiJson.decode(last_response.body || "")
+      @data_inspect = last_response.body
     end
 
     should "be able to access sinatra call data" do
-      assert_equal 'Logger',       @data['logger_class_name']
-      assert_equal 'GET',          @data['request_method']
-      assert_equal 'Content-Type', @data['response_firstheaderval']
-      assert_equal 'something',    @data['params_a_param']
-      assert_equal '{}',           @data['session_inspect']
+      exp = {
+        'logger_class_name'       => 'Logger',
+        'request_method'          => 'GET',
+        'response_firstheaderval' => 'Content-Type',
+        'params_a_param'          => 'something',
+        'session_inspect'         => '{}'
+      }
+      assert_equal exp.inspect, @data_inspect
     end
 
   end