lib/deas/sinatra_runner.rb in deas-0.26.0 vs lib/deas/sinatra_runner.rb in deas-0.27.0

@@ -1,36 +1,17 @@
-require 'deas/runner'
+require 'deas/deas_runner'
 require 'deas/template'
 
 module Deas
 
-  class SinatraRunner < Runner
+  class SinatraRunner < DeasRunner
 
-    attr_reader :app_settings
-
-    def initialize(handler_class, sinatra_call)
-      @sinatra_call  = sinatra_call
-      @app_settings  = @sinatra_call.settings
-
-      @request  = @sinatra_call.request
-      @response = @sinatra_call.response
-      @params   = NormalizedParams.new(@sinatra_call.params).value
-      @logger   = @sinatra_call.settings.logger
-      @router   = @sinatra_call.settings.router
-      @session  = @sinatra_call.session
-
-      super(handler_class)
+    def initialize(handler_class, args = nil)
+      @sinatra_call = (args || {})[:sinatra_call]
+      super(handler_class, args)
     end
 
-    def run
-      run_callbacks @handler_class.before_callbacks
-      @handler.init
-      response_data = @handler.run
-      run_callbacks @handler_class.after_callbacks
-      response_data
-    end
-
     # Helpers
 
     def halt(*args)
       @sinatra_call.halt(*args)
     end
@@ -57,43 +38,32 @@
 
     def headers(*args)
       @sinatra_call.headers(*args)
     end
 
-    def render(template_name, options = nil, &block)
-      options ||= {}
+    def render(template_name, opts = nil, &block)
+      self.content_type(get_content_type(template_name)) if self.content_type.nil?
+
+      # TODO: move to DeasRunner, don't pass sinatra call to create template
+      # def render(template_name, *args, &block)
+      #   super(template_name, *args, &block)
+      options = opts || {}
       options[:locals] = {
-        :view => @handler,
-        :logger => @logger
+        :view => self.handler,
+        :logger => self.logger
       }.merge(options[:locals] || {})
-      options[:layout] ||= @handler_class.layouts
-
-      self.content_type(get_content_type(template_name)) if self.content_type.nil?
+      options[:layout] = self.handler_class.layouts if !options.key?(:layout)
       Deas::Template.new(@sinatra_call, template_name, options).render(&block)
     end
 
-    def partial(partial_name, locals = nil)
-      Deas::Template::Partial.new(@sinatra_call, partial_name, locals).render
-    end
-
     def send_file(*args, &block)
       @sinatra_call.send_file(*args, &block)
     end
 
     private
 
-    def run_callbacks(callbacks)
-      callbacks.each{|proc| @handler.instance_eval(&proc) }
-    end
-
     def get_content_type(template_name)
       File.extname(template_name)[1..-1] || 'html'
-    end
-
-    class NormalizedParams < Deas::Runner::NormalizedParams
-      def file_type?(value)
-        value.kind_of?(::Tempfile)
-      end
     end
 
   end
 end