deas 0.7.0 → 0.8.0

data/Gemfile

@@ -4,3 +4,5 @@ gemspec
 
 gem 'rake'
 gem 'pry'
+gem 'multi_json'
+gem 'yajl-ruby'

data/lib/deas/runner.rb

@@ -2,7 +2,8 @@ module Deas
 
   class Runner
 
-    attr_accessor :request, :response, :params, :logger, :session
+    attr_reader :app_settings
+    attr_reader :request, :response, :params, :logger, :session
 
     def initialize(handler_class)
       @handler_class = handler_class

data/lib/deas/sinatra_runner.rb

@@ -11,7 +11,7 @@ module Deas
 
     def initialize(handler_class, sinatra_call)
       @sinatra_call  = sinatra_call
-      @handler_class = handler_class
+      @app_settings  = @sinatra_call.settings
       @logger        = @sinatra_call.settings.logger
       @params        = @sinatra_call.params
       @request       = @sinatra_call.request

data/lib/deas/test_runner.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 require 'deas/runner'
 
 module Deas
@@ -8,11 +9,12 @@ module Deas
 
     def initialize(handler_class, args = nil)
       args = (args || {}).dup
-      @logger   = args.delete(:logger) || Deas::NullLogger.new
-      @params   = args.delete(:params) || {}
-      @request  = args.delete(:request)
-      @response = args.delete(:response)
-      @session  = args.delete(:session)
+      @app_settings = OpenStruct.new(args.delete(:app_settings))
+      @logger       = args.delete(:logger) || Deas::NullLogger.new
+      @params       = args.delete(:params) || {}
+      @request      = args.delete(:request)
+      @response     = args.delete(:response)
+      @session      = args.delete(:session)
 
       super(handler_class)
       args.each{|key, value| @handler.send("#{key}=", value) }

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/deas/view_handler.rb

@@ -55,11 +55,12 @@ module Deas
       @deas_runner.render(*args, &block)
     end
 
-    def logger;   @deas_runner.logger;   end
-    def request;  @deas_runner.request;  end
-    def response; @deas_runner.response; end
-    def params;   @deas_runner.params;   end
-    def session;  @deas_runner.session;  end
+    def app_settings; @deas_runner.app_settings; end
+    def logger;       @deas_runner.logger;       end
+    def request;      @deas_runner.request;      end
+    def response;     @deas_runner.response;     end
+    def params;       @deas_runner.params;       end
+    def session;      @deas_runner.session;      end
 
     def run_callback(callback)
       (self.class.send("#{callback}_callbacks") || []).each do |callback|

data/test/support/routes.rb

@@ -8,6 +8,8 @@ class DeasTestServer
   logger TEST_LOGGER
   verbose_logging true
 
+  set :a_setting, 'something'
+
   error do |exception|
     case exception
     when Sinatra::NotFound
@@ -27,6 +29,8 @@ class DeasTestServer
   post '/session',         'SetSessionHandler'
   get  '/session',         'UseSessionHandler'
 
+  get '/handler/tests.json', 'HandlerTestsHandler'
+
 end
 
 class ShowHandler
@@ -123,3 +127,30 @@ class UseSessionHandler
   end
 
 end
+
+class HandlerTestsHandler
+  include Deas::ViewHandler
+
+  def init!
+    @data = {}
+    set_data('app_settings_a_setting'){ self.app_settings.a_setting }
+    set_data('logger_class_name'){ self.logger.class.name }
+    set_data('request_method'){ self.request.request_method.to_s }
+    set_data('response_firstheaderval'){ self.response.headers.sort.first.to_s }
+    set_data('params_a_param'){ self.params['a-param'] }
+    set_data('session_inspect'){ self.session.inspect }
+  end
+
+  def set_data(a, &block)
+    begin
+      @data[a] = block.call
+    rescue Exception => e
+    end
+  end
+
+  def run!
+    require 'multi_json'
+    [200, {}, MultiJson.encode(@data)]
+  end
+
+end

data/test/system/rack_tests.rb

@@ -94,4 +94,24 @@ module Deas
 
   end
 
+  class HandlerTests < RackTests
+    desc "handler"
+    setup do
+      get 'handler/tests.json?a-param=something'
+
+      require 'multi_json'
+      @data = MultiJson.decode(last_response.body || "")
+    end
+
+    should "be able to access sinatra call data" do
+      assert_equal 'something',    @data['app_settings_a_setting']
+      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']
+    end
+
+  end
+
 end

data/test/unit/runner_tests.rb

@@ -11,7 +11,8 @@ class Deas::Runner
     end
     subject{ @runner }
 
-    should have_instance_methods :request, :response, :params, :logger, :session
+    should have_reader  :app_settings
+    should have_readers :request, :response, :params, :logger, :session
 
     should "raise NotImplementedError with #halt" do
       assert_raises(NotImplementedError){ subject.halt }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Kelly Redding